diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-05-30 17:27:49 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-05-30 17:27:49 +0000 |
| commit | 88708cffa15662dcd2755fce699112d24a10a087 (patch) | |
| tree | 55d362220b42a52b52eaef2254f894c9a61fb4fd /plugins/FreeImage/Source/FreeImage.h | |
| parent | 7fa5563a954339f3feeb156285ef56bfde7cbec8 (diff) | |
update for zlib & FreeImage
git-svn-id: http://svn.miranda-ng.org/main/trunk@238 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/FreeImage/Source/FreeImage.h')
| -rw-r--r-- | plugins/FreeImage/Source/FreeImage.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/plugins/FreeImage/Source/FreeImage.h b/plugins/FreeImage/Source/FreeImage.h index 651d3c46bb..a7090adf59 100644 --- a/plugins/FreeImage/Source/FreeImage.h +++ b/plugins/FreeImage/Source/FreeImage.h @@ -30,7 +30,7 @@ #define FREEIMAGE_MAJOR_VERSION 3
#define FREEIMAGE_MINOR_VERSION 15
-#define FREEIMAGE_RELEASE_SERIAL 1
+#define FREEIMAGE_RELEASE_SERIAL 3
// Compiler options ---------------------------------------------------------
@@ -141,6 +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;
#else
// MS is not C99 ISO compliant
typedef long BOOL;
@@ -148,6 +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;
#endif // _MSC_VER
#if (defined(_WIN32) || defined(__WIN32__))
@@ -525,7 +529,10 @@ FI_ENUM(FREE_IMAGE_MDTYPE) { FIDT_FLOAT = 11, // 32-bit IEEE floating point
FIDT_DOUBLE = 12, // 64-bit IEEE floating point
FIDT_IFD = 13, // 32-bit unsigned integer (offset)
- FIDT_PALETTE = 14 // 32-bit RGBQUAD
+ FIDT_PALETTE = 14, // 32-bit RGBQUAD
+ FIDT_LONG8 = 16, // 64-bit unsigned integer
+ FIDT_SLONG8 = 17, // 64-bit signed integer
+ FIDT_IFD8 = 18 // 64-bit unsigned integer (offset)
};
/**
|