diff options
| author | George Hazan <ghazan@miranda.im> | 2021-12-26 17:06:04 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2021-12-26 17:06:04 +0300 |
| commit | 1039b2829a264280493ba0fa979214fe024dc70c (patch) | |
| tree | 8fa6a60eb46627582c372b56a4a1d4754d6732c3 /libs/freeimage/src/FreeImage/Conversion.cpp | |
| parent | 62a186697df33c96dc1a6dac0f4dfc38652fb96f (diff) | |
WORD -> uint16_t
Diffstat (limited to 'libs/freeimage/src/FreeImage/Conversion.cpp')
| -rw-r--r-- | libs/freeimage/src/FreeImage/Conversion.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/freeimage/src/FreeImage/Conversion.cpp b/libs/freeimage/src/FreeImage/Conversion.cpp index 7a700b2e48..e9481c5401 100644 --- a/libs/freeimage/src/FreeImage/Conversion.cpp +++ b/libs/freeimage/src/FreeImage/Conversion.cpp @@ -87,7 +87,7 @@ BOOL SwapRedBlue32(FIBITMAP* dib) { // ---------------------------------------------------------- static inline void -assignRGB(WORD r, WORD g, WORD b, WORD* out) { +assignRGB(uint16_t r, uint16_t g, uint16_t b, uint16_t* out) { out[0] = r; out[1] = g; out[2] = b; @@ -162,7 +162,7 @@ ConvertCMYKtoRGBA(FIBITMAP* dib) { unsigned channelSize = 1; if (image_type == FIT_RGBA16 || image_type == FIT_RGB16) { - channelSize = sizeof(WORD); + channelSize = sizeof(uint16_t); } else if (!(image_type == FIT_BITMAP && (bytesperpixel > 2))) { return FALSE; } @@ -174,8 +174,8 @@ ConvertCMYKtoRGBA(FIBITMAP* dib) { unsigned samplesperpixel = FreeImage_GetLine(dib) / width / channelSize; - if(channelSize == sizeof(WORD)) { - _convertCMYKtoRGBA<WORD>(width, height, line_start, pitch, samplesperpixel); + if(channelSize == sizeof(uint16_t)) { + _convertCMYKtoRGBA<uint16_t>(width, height, line_start, pitch, samplesperpixel); } else { _convertCMYKtoRGBA<uint8_t>(width, height, line_start, pitch, samplesperpixel); } @@ -311,7 +311,7 @@ ConvertLABtoRGB(FIBITMAP* dib) { unsigned channelSize = 1; if (image_type == FIT_RGBA16 || image_type == FIT_RGB16) { - channelSize = sizeof(WORD); + channelSize = sizeof(uint16_t); } else if (!(image_type == FIT_BITMAP && (bytesperpixel > 2))) { return FALSE; } @@ -327,7 +327,7 @@ ConvertLABtoRGB(FIBITMAP* dib) { _convertLABtoRGB<uint8_t>(width, height, line_start, pitch, samplesperpixel); } else { - _convertLABtoRGB<WORD>(width, height, line_start, pitch, samplesperpixel); + _convertLABtoRGB<uint16_t>(width, height, line_start, pitch, samplesperpixel); } return TRUE; |