--- FreeImage/Source/FreeImage.h Sun Mar 25 18:42:20 2018 +++ FreeImage/Source/FreeImage_.h Thu May 26 20:53:53 2022 @@ -155,8 +155,8 @@ typedef uint16_t WORD; typedef uint32_t DWORD; typedef int32_t LONG; -typedef int64_t INT64; -typedef uint64_t UINT64; +//typedef int64_t INT64; +//typedef uint64_t UINT64; #else // MS is not C99 ISO compliant typedef long BOOL; @@ -410,7 +410,7 @@ FIF_DDS = 24, FIF_GIF = 25, FIF_HDR = 26, - FIF_FAXG3 = 27, + //FIF_FAXG3 = 27, FIF_SGI = 28, FIF_EXR = 29, FIF_J2K = 30, @@ -476,16 +476,16 @@ /** Lossless JPEG transformations Constants used in FreeImage_JPEGTransform */ -FI_ENUM(FREE_IMAGE_JPEG_OPERATION) { - FIJPEG_OP_NONE = 0, //! no transformation - FIJPEG_OP_FLIP_H = 1, //! horizontal flip - FIJPEG_OP_FLIP_V = 2, //! vertical flip - FIJPEG_OP_TRANSPOSE = 3, //! transpose across UL-to-LR axis - FIJPEG_OP_TRANSVERSE = 4, //! transpose across UR-to-LL axis - FIJPEG_OP_ROTATE_90 = 5, //! 90-degree clockwise rotation - FIJPEG_OP_ROTATE_180 = 6, //! 180-degree rotation - FIJPEG_OP_ROTATE_270 = 7 //! 270-degree clockwise (or 90 ccw) -}; +//FI_ENUM(FREE_IMAGE_JPEG_OPERATION) { +// FIJPEG_OP_NONE = 0, //! no transformation +// FIJPEG_OP_FLIP_H = 1, //! horizontal flip +// FIJPEG_OP_FLIP_V = 2, //! vertical flip +// FIJPEG_OP_TRANSPOSE = 3, //! transpose across UL-to-LR axis +// FIJPEG_OP_TRANSVERSE = 4, //! transpose across UR-to-LL axis +// FIJPEG_OP_ROTATE_90 = 5, //! 90-degree clockwise rotation +// FIJPEG_OP_ROTATE_180 = 6, //! 180-degree rotation +// FIJPEG_OP_ROTATE_270 = 7 //! 270-degree clockwise (or 90 ccw) +//}; /** Tone mapping operators. Constants used in FreeImage_ToneMapping. @@ -1089,14 +1089,14 @@ // JPEG lossless transformation routines // -------------------------------------------------------------------------- -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)); -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)); -DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCrop(const char *src_file, const char *dst_file, int left, int top, int right, int bottom); -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); -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)); -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)); -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)); -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)); +//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)); +//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)); +//DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCrop(const char *src_file, const char *dst_file, int left, int top, int right, int bottom); +//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); +//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)); +//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)); +//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)); +//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)); // --------------------------------------------------------------------------