Permalink
Browse files

updated FreeImage version, fixes #1028

  • Loading branch information...
1 parent 8b2e7d5 commit fa53cfa5ca9db55ce5d9a98aa6cc54781933e3e2 @elliotwoods elliotwoods committed Jul 4, 2012
View
BIN export/vs2010/FreeImage.dll
Binary file not shown.
View
45 libs/FreeImage/include/FreeImage.h
@@ -29,8 +29,8 @@
// Version information ------------------------------------------------------
#define FREEIMAGE_MAJOR_VERSION 3
-#define FREEIMAGE_MINOR_VERSION 14
-#define FREEIMAGE_RELEASE_SERIAL 1
+#define FREEIMAGE_MINOR_VERSION 15
+#define FREEIMAGE_RELEASE_SERIAL 3
// Compiler options ---------------------------------------------------------
@@ -136,18 +136,22 @@ FI_STRUCT (FIMULTIBITMAP) { void *data; };
#ifndef _MSC_VER
// define portable types for 32-bit / 64-bit OS
#include <inttypes.h>
-#define BOOL int32_t
-#define BYTE uint8_t
-#define WORD uint16_t
-#define DWORD uint32_t
-#define LONG int32_t
+typedef int32_t BOOL;
+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
-#define BOOL long
-#define BYTE unsigned char
-#define WORD unsigned short
-#define DWORD unsigned long
-#define LONG long
+typedef long BOOL;
+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)
};
/**
@@ -682,6 +689,7 @@ typedef void (DLL_CALLCONV *FI_InitProc)(Plugin *plugin, int format_id);
#define JPEG_SUBSAMPLING_422 0x8000 // save with low 2x1 chroma subsampling (4:2:2)
#define JPEG_SUBSAMPLING_444 0x10000 // save with no chroma subsampling (4:4:4)
#define JPEG_OPTIMIZE 0x20000 // on saving, compute optimal Huffman coding tables (can reduce a few percent of file size)
+#define JPEG_BASELINE 0x40000 // save basic JPEG, without metadata or any markers
#define KOALA_DEFAULT 0
#define LBM_DEFAULT 0
#define MNG_DEFAULT 0
@@ -709,6 +717,7 @@ typedef void (DLL_CALLCONV *FI_InitProc)(Plugin *plugin, int format_id);
#define RAW_DEFAULT 0 // load the file as linear RGB 48-bit
#define RAW_PREVIEW 1 // try to load the embedded JPEG preview with included Exif Data or default to RGB 24-bit
#define RAW_DISPLAY 2 // load the file as RGB 24-bit
+#define RAW_HALFSIZE 4 // output a half-size color image
#define SGI_DEFAULT 0
#define TARGA_DEFAULT 0
#define TARGA_LOAD_RGB888 1 // If set the loader converts RGB555 and ARGB8888 -> RGB888.
@@ -896,6 +905,8 @@ DLL_API BOOL DLL_CALLCONV FreeImage_HasBackgroundColor(FIBITMAP *dib);
DLL_API BOOL DLL_CALLCONV FreeImage_GetBackgroundColor(FIBITMAP *dib, RGBQUAD *bkcolor);
DLL_API BOOL DLL_CALLCONV FreeImage_SetBackgroundColor(FIBITMAP *dib, RGBQUAD *bkcolor);
+DLL_API FIBITMAP *DLL_CALLCONV FreeImage_GetThumbnail(FIBITMAP *dib);
+DLL_API BOOL DLL_CALLCONV FreeImage_SetThumbnail(FIBITMAP *dib, FIBITMAP *thumbnail);
// ICC profile routines -----------------------------------------------------
@@ -961,6 +972,8 @@ DLL_API void DLL_CALLCONV FreeImage_ConvertToRawBits(BYTE *bits, FIBITMAP *dib,
DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToFloat(FIBITMAP *dib);
DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToRGBF(FIBITMAP *dib);
+DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToUINT16(FIBITMAP *dib);
+DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToRGB16(FIBITMAP *dib);
DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToStandardType(FIBITMAP *src, BOOL scale_linear FI_DEFAULT(TRUE));
DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToType(FIBITMAP *src, FREE_IMAGE_TYPE dst_type, BOOL scale_linear FI_DEFAULT(TRUE));
@@ -1087,10 +1100,4 @@ DLL_API FIBITMAP *DLL_CALLCONV FreeImage_MultigridPoissonSolver(FIBITMAP *Laplac
}
#endif
-#undef BOOL
-#undef BYTE
-#undef WORD
-#undef DWORD
-#undef LONG
-
#endif // FREEIMAGE_H
View
BIN libs/FreeImage/lib/vs2010/FreeImage.lib
Binary file not shown.

0 comments on commit fa53cfa

Please sign in to comment.