FreeImage updated to 3.15.4

removed not used formats

git-svn-id: http://svn.miranda-ng.org/main/trunk@2926 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 7 insertions, 6 deletions

diff --git a/plugins/AdvaImg/src/FreeImage.h b/plugins/AdvaImg/src/FreeImage.h
index a7090adf59..532efc88d8 100644
--- a/plugins/AdvaImg/src/FreeImage.h
+++ b/plugins/AdvaImg/src/FreeImage.h
@@ -30,7 +30,7 @@
 

 #define FREEIMAGE_MAJOR_VERSION   3

 #define FREEIMAGE_MINOR_VERSION   15

-#define FREEIMAGE_RELEASE_SERIAL  3

+#define FREEIMAGE_RELEASE_SERIAL  4

 

 // Compiler options ---------------------------------------------------------

 

@@ -141,8 +141,8 @@ typedef uint8_t BYTE;
 typedef uint16_t WORD;

 typedef uint32_t DWORD;

 typedef int32_t LONG;

-typedef int64_t FIINT64;

-typedef uint64_t FIUINT64;

+typedef int64_t INT64;

+typedef uint64_t UINT64;

 #else

 // MS is not C99 ISO compliant

 typedef long BOOL;

@@ -150,8 +150,8 @@ typedef unsigned char BYTE;
 typedef unsigned short WORD;

 typedef unsigned long DWORD;

 typedef long LONG;

-typedef signed __int64 FIINT64;

-typedef unsigned __int64 FIUINT64;

+typedef signed __int64 INT64;

+typedef unsigned __int64 UINT64;

 #endif // _MSC_VER

 

 #if (defined(_WIN32) || defined(__WIN32__))

@@ -649,7 +649,7 @@ typedef void (DLL_CALLCONV *FI_InitProc)(Plugin *plugin, int format_id);
 

 // Load / Save flag constants -----------------------------------------------

 

-#define FIF_LOAD_NOPIXELS 0x8000 // loading: load the image header only (not supported by all plugins)

+#define FIF_LOAD_NOPIXELS 0x8000 // loading: load the image header only (not supported by all plugins, default to full loading)

 

 #define BMP_DEFAULT         0

 #define BMP_SAVE_RLE        1

@@ -678,6 +678,7 @@ typedef void (DLL_CALLCONV *FI_InitProc)(Plugin *plugin, int format_id);
 #define JPEG_ACCURATE       0x0002	// load the file with the best quality, sacrificing some speed

 #define JPEG_CMYK			0x0004	// load separated CMYK "as is" (use | to combine with other load flags)

 #define JPEG_EXIFROTATE		0x0008	// load and rotate according to Exif 'Orientation' tag if available

+#define JPEG_GREYSCALE		0x0010	// load and convert to a 8-bit greyscale image

 #define JPEG_QUALITYSUPERB  0x80	// save with superb quality (100:1)

 #define JPEG_QUALITYGOOD    0x0100	// save with good quality (75:1)

 #define JPEG_QUALITYNORMAL  0x0200	// save with normal quality (50:1)