diff options
Diffstat (limited to 'include/m_freeimage.h')
| -rw-r--r-- | include/m_freeimage.h | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/include/m_freeimage.h b/include/m_freeimage.h index 17e471a820..251408aa50 100644 --- a/include/m_freeimage.h +++ b/include/m_freeimage.h @@ -60,10 +60,10 @@ #else
#if defined(_WIN32) || defined(__WIN32__)
#define DLL_CALLCONV __stdcall
- // The following ifdef block is the standard way of creating macros which make exporting
+ // The following ifdef block is the standard way of creating macros which make exporting
// from a DLL simpler. All files within this DLL are compiled with the FREEIMAGE_EXPORTS
// symbol defined on the command line. this symbol should not be defined on any project
- // that uses this DLL. This way any other project whose source files include this file see
+ // that uses this DLL. This way any other project whose source files include this file see
// DLL_API functions as being imported from a DLL, wheras this DLL sees symbols
// defined with this macro as being exported.
#ifdef FREEIMAGE_EXPORTS
@@ -71,7 +71,7 @@ #else
#define DLL_API __declspec(dllimport)
#endif // FREEIMAGE_EXPORTS
- #else
+ #else
// try the gcc visibility support (see http://gcc.gnu.org/wiki/Visibility)
#if defined(__GNUC__) && ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
#ifndef GCC_HASCLASSVISIBILITY
@@ -83,7 +83,7 @@ #define DLL_API __attribute__ ((visibility("default")))
#else
#define DLL_API
- #endif
+ #endif
#endif // WIN32 / !WIN32
#endif // FREEIMAGE_LIB
@@ -207,20 +207,20 @@ typedef struct tagRGBTRIPLE { typedef struct tagBITMAPINFOHEADER{
DWORD biSize;
- LONG biWidth;
- LONG biHeight;
- WORD biPlanes;
+ LONG biWidth;
+ LONG biHeight;
+ WORD biPlanes;
WORD biBitCount;
- DWORD biCompression;
- DWORD biSizeImage;
- LONG biXPelsPerMeter;
- LONG biYPelsPerMeter;
- DWORD biClrUsed;
+ DWORD biCompression;
+ DWORD biSizeImage;
+ LONG biXPelsPerMeter;
+ LONG biYPelsPerMeter;
+ DWORD biClrUsed;
DWORD biClrImportant;
-} BITMAPINFOHEADER, *PBITMAPINFOHEADER;
+} BITMAPINFOHEADER, *PBITMAPINFOHEADER;
-typedef struct tagBITMAPINFO {
- BITMAPINFOHEADER bmiHeader;
+typedef struct tagBITMAPINFO {
+ BITMAPINFOHEADER bmiHeader;
RGBQUAD bmiColors[1];
} BITMAPINFO, *PBITMAPINFO;
@@ -234,7 +234,7 @@ typedef struct tagBITMAPINFO { #pragma pack(1)
#endif // WIN32
-/** 48-bit RGB
+/** 48-bit RGB
*/
typedef struct tagFIRGB16 {
WORD red;
@@ -370,7 +370,7 @@ typedef struct tagFICOMPLEX { #define FIICC_DEFAULT 0x00
#define FIICC_COLOR_IS_CMYK 0x01
-FI_STRUCT (FIICCPROFILE) {
+FI_STRUCT (FIICCPROFILE) {
WORD flags; // info flag
DWORD size; // profile's size measured in bytes
void *data; // points to a block of contiguous memory containing the profile
@@ -493,7 +493,7 @@ FI_ENUM(FREE_IMAGE_TMO) { FITMO_FATTAL02 = 2 // Gradient domain high dynamic range compression (R. Fattal, 2002)
};
-/** Upsampling / downsampling filters.
+/** Upsampling / downsampling filters.
Constants used in FreeImage_Rescale.
*/
FI_ENUM(FREE_IMAGE_FILTER) {
@@ -529,21 +529,21 @@ FI_ENUM(FREE_IMAGE_COLOR_CHANNEL) { Note: RATIONALs are the ratio of two 32-bit integer values.
*/
FI_ENUM(FREE_IMAGE_MDTYPE) {
- FIDT_NOTYPE = 0, // placeholder
- FIDT_BYTE = 1, // 8-bit unsigned integer
- FIDT_ASCII = 2, // 8-bit bytes w/ last byte null
- FIDT_SHORT = 3, // 16-bit unsigned integer
- FIDT_LONG = 4, // 32-bit unsigned integer
- FIDT_RATIONAL = 5, // 64-bit unsigned fraction
- FIDT_SBYTE = 6, // 8-bit signed integer
- FIDT_UNDEFINED = 7, // 8-bit untyped data
- FIDT_SSHORT = 8, // 16-bit signed integer
- FIDT_SLONG = 9, // 32-bit signed integer
- FIDT_SRATIONAL = 10, // 64-bit signed fraction
- 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_NOTYPE = 0, // placeholder
+ FIDT_BYTE = 1, // 8-bit unsigned integer
+ FIDT_ASCII = 2, // 8-bit bytes w/ last byte null
+ FIDT_SHORT = 3, // 16-bit unsigned integer
+ FIDT_LONG = 4, // 32-bit unsigned integer
+ FIDT_RATIONAL = 5, // 64-bit unsigned fraction
+ FIDT_SBYTE = 6, // 8-bit signed integer
+ FIDT_UNDEFINED = 7, // 8-bit untyped data
+ FIDT_SSHORT = 8, // 16-bit signed integer
+ FIDT_SLONG = 9, // 32-bit signed integer
+ FIDT_SRATIONAL = 10, // 64-bit signed fraction
+ 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
};
/**
@@ -690,9 +690,9 @@ typedef void (DLL_CALLCONV *FI_InitProc)(Plugin *plugin, int format_id); #define JPEG_QUALITYAVERAGE 0x0400 // save with average quality (25:1)
#define JPEG_QUALITYBAD 0x0800 // save with bad quality (10:1)
#define JPEG_PROGRESSIVE 0x2000 // save as a progressive-JPEG (use | to combine with other save flags)
-#define JPEG_SUBSAMPLING_411 0x1000 // save with high 4x1 chroma subsampling (4:1:1)
+#define JPEG_SUBSAMPLING_411 0x1000 // save with high 4x1 chroma subsampling (4:1:1)
#define JPEG_SUBSAMPLING_420 0x4000 // save with medium 2x2 medium chroma subsampling (4:2:0) - default value
-#define JPEG_SUBSAMPLING_422 0x8000 // save with low 2x1 chroma subsampling (4:2:2)
+#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 KOALA_DEFAULT 0
#define LBM_DEFAULT 0
@@ -763,9 +763,9 @@ DLL_API const char *DLL_CALLCONV FreeImage_GetCopyrightMessage(void); // Message output functions -------------------------------------------------
typedef void (*FreeImage_OutputMessageFunction)(FREE_IMAGE_FORMAT fif, const char *msg);
-typedef void (DLL_CALLCONV *FreeImage_OutputMessageFunctionStdCall)(FREE_IMAGE_FORMAT fif, const char *msg);
+typedef void (DLL_CALLCONV *FreeImage_OutputMessageFunctionStdCall)(FREE_IMAGE_FORMAT fif, const char *msg);
-DLL_API void DLL_CALLCONV FreeImage_SetOutputMessageStdCall(FreeImage_OutputMessageFunctionStdCall omf);
+DLL_API void DLL_CALLCONV FreeImage_SetOutputMessageStdCall(FreeImage_OutputMessageFunctionStdCall omf);
DLL_API void DLL_CALLCONV FreeImage_SetOutputMessage(FreeImage_OutputMessageFunction omf);
DLL_API void DLL_CALLCONV FreeImage_OutputMessageProc(int fif, const char *fmt, ...);
|