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/PluginBMP.cpp | |
| parent | 62a186697df33c96dc1a6dac0f4dfc38652fb96f (diff) | |
WORD -> uint16_t
Diffstat (limited to 'libs/freeimage/src/FreeImage/PluginBMP.cpp')
| -rw-r--r-- | libs/freeimage/src/FreeImage/PluginBMP.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libs/freeimage/src/FreeImage/PluginBMP.cpp b/libs/freeimage/src/FreeImage/PluginBMP.cpp index a27760a1ea..8734c51b9b 100644 --- a/libs/freeimage/src/FreeImage/PluginBMP.cpp +++ b/libs/freeimage/src/FreeImage/PluginBMP.cpp @@ -39,10 +39,10 @@ static const uint8_t BI_ALPHABITFIELDS = 6; // compression: Bit field (this valu typedef struct tagBITMAPINFOOS2_1X_HEADER { DWORD biSize; - WORD biWidth; - WORD biHeight; - WORD biPlanes; - WORD biBitCount; + uint16_t biWidth; + uint16_t biHeight; + uint16_t biPlanes; + uint16_t biBitCount; } BITMAPINFOOS2_1X_HEADER, *PBITMAPINFOOS2_1X_HEADER; // ========================================================== @@ -136,7 +136,7 @@ LoadPixelData(FreeImageIO *io, fi_handle handle, FIBITMAP *dib, int height, unsi #ifdef FREEIMAGE_BIGENDIAN if (bit_count == 16) { for(unsigned y = 0; y < FreeImage_GetHeight(dib); y++) { - WORD *pixel = (WORD *)FreeImage_GetScanLine(dib, y); + uint16_t *pixel = (uint16_t *)FreeImage_GetScanLine(dib, y); for(unsigned x = 0; x < FreeImage_GetWidth(dib); x++) { SwapShort(pixel); pixel++; @@ -1383,15 +1383,15 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void free(buffer); #ifdef FREEIMAGE_BIGENDIAN } else if (bpp == 16) { - int padding = dst_pitch - dst_width * sizeof(WORD); - WORD pad = 0; - WORD pixel; + int padding = dst_pitch - dst_width * sizeof(uint16_t); + uint16_t pad = 0; + uint16_t pixel; for(unsigned y = 0; y < dst_height; y++) { uint8_t *line = FreeImage_GetScanLine(dib, y); for(unsigned x = 0; x < dst_width; x++) { - pixel = ((WORD *)line)[x]; + pixel = ((uint16_t *)line)[x]; SwapShort(&pixel); - if (io->write_proc(&pixel, sizeof(WORD), 1, handle) != 1) { + if (io->write_proc(&pixel, sizeof(uint16_t), 1, handle) != 1) { return FALSE; } } |