| blob | 2c809bbc7d30aa91c229c6d5236f271044991669 |
1 --- FreeImage/Source/FreeImage.h Sun Mar 25 18:42:20 2018
2 +++ FreeImage/Source/FreeImage_.h Thu May 26 20:53:53 2022
3 @@ -155,8 +155,8 @@
4 typedef uint16_t WORD;
5 typedef uint32_t DWORD;
6 typedef int32_t LONG;
7 -typedef int64_t INT64;
8 -typedef uint64_t UINT64;
9 +//typedef int64_t INT64;
10 +//typedef uint64_t UINT64;
11 #else
12 // MS is not C99 ISO compliant
13 typedef long BOOL;
14 @@ -410,7 +410,7 @@
15 FIF_DDS = 24,
16 FIF_GIF = 25,
17 FIF_HDR = 26,
18 - FIF_FAXG3 = 27,
19 + //FIF_FAXG3 = 27,
20 FIF_SGI = 28,
21 FIF_EXR = 29,
22 FIF_J2K = 30,
23 @@ -476,16 +476,16 @@
24 /** Lossless JPEG transformations
25 Constants used in FreeImage_JPEGTransform
26 */
27 -FI_ENUM(FREE_IMAGE_JPEG_OPERATION) {
28 - FIJPEG_OP_NONE = 0, //! no transformation
29 - FIJPEG_OP_FLIP_H = 1, //! horizontal flip
30 - FIJPEG_OP_FLIP_V = 2, //! vertical flip
31 - FIJPEG_OP_TRANSPOSE = 3, //! transpose across UL-to-LR axis
32 - FIJPEG_OP_TRANSVERSE = 4, //! transpose across UR-to-LL axis
33 - FIJPEG_OP_ROTATE_90 = 5, //! 90-degree clockwise rotation
34 - FIJPEG_OP_ROTATE_180 = 6, //! 180-degree rotation
35 - FIJPEG_OP_ROTATE_270 = 7 //! 270-degree clockwise (or 90 ccw)
36 -};
37 +//FI_ENUM(FREE_IMAGE_JPEG_OPERATION) {
38 +// FIJPEG_OP_NONE = 0, //! no transformation
39 +// FIJPEG_OP_FLIP_H = 1, //! horizontal flip
40 +// FIJPEG_OP_FLIP_V = 2, //! vertical flip
41 +// FIJPEG_OP_TRANSPOSE = 3, //! transpose across UL-to-LR axis
42 +// FIJPEG_OP_TRANSVERSE = 4, //! transpose across UR-to-LL axis
43 +// FIJPEG_OP_ROTATE_90 = 5, //! 90-degree clockwise rotation
44 +// FIJPEG_OP_ROTATE_180 = 6, //! 180-degree rotation
45 +// FIJPEG_OP_ROTATE_270 = 7 //! 270-degree clockwise (or 90 ccw)
46 +//};
48 /** Tone mapping operators.
49 Constants used in FreeImage_ToneMapping.
50 @@ -1089,14 +1089,14 @@
51 // JPEG lossless transformation routines
52 // --------------------------------------------------------------------------
54 -DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransform(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE));
55 -DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE));
56 -DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCrop(const char *src_file, const char *dst_file, int left, int top, int right, int bottom);
57 -DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCropU(const wchar_t *src_file, const wchar_t *dst_file, int left, int top, int right, int bottom);
58 -DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformFromHandle(FreeImageIO* src_io, fi_handle src_handle, FreeImageIO* dst_io, fi_handle dst_handle, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
59 -DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombined(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
60 -DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
61 -DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedFromMemory(FIMEMORY* src_stream, FIMEMORY* dst_stream, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
62 +//DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransform(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE));
63 +//DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE));
64 +//DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCrop(const char *src_file, const char *dst_file, int left, int top, int right, int bottom);
65 +//DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCropU(const wchar_t *src_file, const wchar_t *dst_file, int left, int top, int right, int bottom);
66 +//DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformFromHandle(FreeImageIO* src_io, fi_handle src_handle, FreeImageIO* dst_io, fi_handle dst_handle, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
67 +//DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombined(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
68 +//DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
69 +//DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedFromMemory(FIMEMORY* src_stream, FIMEMORY* dst_stream, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
72 // --------------------------------------------------------------------------