FreeImage: initialization order of internal plugins MUST pe same order as used in FREE_IMAGE_FORMAT enum (fixed #1177)

2 files changed, 39 insertions, 37 deletions

diff --git a/libs/freeimage/src/FreeImage.h b/libs/freeimage/src/FreeImage.h
index a54871852a..980360d1ec 100644
--- a/libs/freeimage/src/FreeImage.h
+++ b/libs/freeimage/src/FreeImage.h
@@ -385,41 +385,43 @@ FI_ENUM(FREE_IMAGE_FORMAT) {
 	FIF_BMP		= 0,
 	FIF_ICO		= 1,
 	FIF_JPEG	= 2,
-	FIF_JNG		= 3,
-	FIF_KOALA	= 4,
-	FIF_LBM		= 5,
-	FIF_IFF = FIF_LBM,
-	FIF_MNG		= 6,
-	FIF_PBM		= 7,
-	FIF_PBMRAW	= 8,
-	FIF_PCD		= 9,
-	FIF_PCX		= 10,
-	FIF_PGM		= 11,
-	FIF_PGMRAW	= 12,
-	FIF_PNG		= 13,
-	FIF_PPM		= 14,
-	FIF_PPMRAW	= 15,
-	FIF_RAS		= 16,
-	FIF_TARGA	= 17,
-	FIF_TIFF	= 18,
-	FIF_WBMP	= 19,
-	FIF_PSD		= 20,
-	FIF_CUT		= 21,
-	FIF_XBM		= 22,
-	FIF_XPM		= 23,
-	FIF_DDS		= 24,
-	FIF_GIF     = 25,
-	FIF_HDR		= 26,
-	FIF_FAXG3	= 27,
-	FIF_SGI		= 28,
-	FIF_EXR		= 29,
-	FIF_J2K		= 30,
-	FIF_JP2		= 31,
-	FIF_PFM		= 32,
-	FIF_PICT	= 33,
-	FIF_RAW		= 34,
-	FIF_WEBP	= 35,
-	FIF_JXR		= 36
+	FIF_PNG		= 3,
+	FIF_GIF		= 4,
+	//FIF_JNG		= 3,
+	//FIF_KOALA		= 4,
+	//FIF_LBM		= 5,
+	//FIF_IFF		= FIF_LBM,
+	//FIF_MNG		= 6,
+	//FIF_PBM		= 7,
+	//FIF_PBMRAW	= 8,
+	//FIF_PCD		= 9,
+	//FIF_PCX		= 10,
+	//FIF_PGM		= 11,
+	//FIF_PGMRAW	= 12,
+	//FIF_PNG		= 13,
+	//FIF_PPM		= 14,
+	//FIF_PPMRAW	= 15,
+	//FIF_RAS		= 16,
+	//FIF_TARGA		= 17,
+	//FIF_TIFF		= 18,
+	//FIF_WBMP		= 19,
+	//FIF_PSD		= 20,
+	//FIF_CUT		= 21,
+	//FIF_XBM		= 22,
+	//FIF_XPM		= 23,
+	//FIF_DDS		= 24,
+	//FIF_GIF		= 25,
+	//FIF_HDR		= 26,
+	//FIF_FAXG3		= 27,
+	//FIF_SGI		= 28,
+	//FIF_EXR		= 29,
+	//FIF_J2K		= 30,
+	//FIF_JP2		= 31,
+	//FIF_PFM		= 32,
+	//FIF_PICT		= 33,
+	//FIF_RAW		= 34,
+	//FIF_WEBP		= 35,
+	//FIF_JXR		= 36
 };
 
 /** Image type used in FreeImage.
diff --git a/libs/freeimage/src/FreeImage/GetType.cpp b/libs/freeimage/src/FreeImage/GetType.cpp
index e5eff97d0b..b2991a0e49 100644
--- a/libs/freeimage/src/FreeImage/GetType.cpp
+++ b/libs/freeimage/src/FreeImage/GetType.cpp
@@ -35,13 +35,13 @@ FreeImage_GetFileTypeFromHandle(FreeImageIO *io, fi_handle handle, int size) {
 		for (int i = 0; i < fif_count; ++i) {
 			FREE_IMAGE_FORMAT fif = (FREE_IMAGE_FORMAT)i;
 			if (FreeImage_Validate(fif, io, handle)) {
-				if(fif == FIF_TIFF) {
+				/*if(fif == FIF_TIFF) {
 					// many camera raw files use a TIFF signature ...
 					// ... try to revalidate against FIF_RAW (even if it breaks the code genericity)
 					if (FreeImage_Validate(FIF_RAW, io, handle)) {
 						return FIF_RAW;
 					}
-				}
+				}*/
 				return fif;
 			}
 		}