Move file format to a separate header in order to better obfuscate the image loaders within the io library.

IO/config/ImageLoader.h.in

@@ -1,11 +1,7 @@
 #ifndef _IMAGE_LOADER_H_
 #define _IMAGE_LOADER_H_
 
-enum EImageFileFormat {
+#include "ImageFileFormat.h"
-  eFileFormat_PNG,
-
-  kNumImageFileFormats
-};
 
 class ImageLoader {
 

IO/include/ImageFile.h

@@ -1,7 +1,7 @@
 #ifndef _IMAGE_FILE_H_ 
 #define _IMAGE_FILE_H_ 
 
-#include "ImageLoader.h"
+#include "ImageFileFormat.h"
 
 class ImageFile {
 

IO/include/ImageFileFormat.h

@@ -0,0 +1,10 @@
+#ifndef _IMAGE_FILE_FORMAT_H_
+#define _IMAGE_FILE_FORMAT_H_
+
+enum EImageFileFormat {
+  eFileFormat_PNG,
+
+  kNumImageFileFormats
+};
+
+#endif // _IMAGE_FILE_FORMAT_H_

IO/src/ImageFile.cpp

@@ -5,6 +5,7 @@
 #include <assert.h>
 
 #include "ImageFile.h"
+#include "ImageLoader.h"
 
 #ifdef PNG_FOUND
 #  include "ImageLoaderPNG.h"
@@ -150,6 +151,9 @@ EImageFileFormat ImageFile::DetectFileFormat(const char *filename) {
     return kNumImageFileFormats;
   }
   
+  // consume the last character...
+  dotPos++;
+
   const char *ext = &filename[dotPos];
 
   if(strcmp(ext, ".png") == 0) {