diff options
author | aunsane <aunsane@gmail.com> | 2018-03-09 16:27:13 +0300 |
---|---|---|
committer | aunsane <aunsane@gmail.com> | 2018-03-09 16:27:34 +0300 |
commit | 36fb9aa89dc136bfb225f8eee661b9d1c9e47210 (patch) | |
tree | 0c2939edb7a28533a69129159a13f27651734710 /libs/freeimage/src/FreeImage.h | |
parent | e53a47a7756e45ca8ea5802d6b0955ad82873e32 (diff) |
FreeImage: initialization order of internal plugins MUST pe same order as used in FREE_IMAGE_FORMAT enum (fixed #1177)
Diffstat (limited to 'libs/freeimage/src/FreeImage.h')
-rw-r--r-- | libs/freeimage/src/FreeImage.h | 72 |
1 files changed, 37 insertions, 35 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. |