mirror of
https://github.com/openbsd/ports.git
synced 2026-06-18 07:24:23 +02:00
gkoehler
fd2de2c6ec
PluginBMP.cpp had compiler errors before I added this patch. fixed PluginBMP, PluginDDS for compilation under Big Endian OS (see FREEIMAGE_BIGENDIAN) https://sourceforge.net/p/freeimage/svn/1809/ ok tb@
44 lines
1.5 KiB
Plaintext
44 lines
1.5 KiB
Plaintext
fixed PluginBMP, PluginDDS for compilation under Big Endian OS (see
|
|
FREEIMAGE_BIGENDIAN)
|
|
https://sourceforge.net/p/freeimage/svn/1809/
|
|
|
|
Index: Source/FreeImage/PluginBMP.cpp
|
|
--- Source/FreeImage/PluginBMP.cpp.orig
|
|
+++ Source/FreeImage/PluginBMP.cpp
|
|
@@ -518,7 +518,7 @@ LoadWindowsBMP(FreeImageIO *io, fi_handle handle, int
|
|
io->read_proc(FreeImage_GetPalette(dib), used_colors * sizeof(RGBQUAD), 1, handle);
|
|
#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB
|
|
RGBQUAD *pal = FreeImage_GetPalette(dib);
|
|
- for(int i = 0; i < used_colors; i++) {
|
|
+ for(unsigned i = 0; i < used_colors; i++) {
|
|
INPLACESWAP(pal[i].rgbRed, pal[i].rgbBlue);
|
|
}
|
|
#endif
|
|
@@ -1419,7 +1419,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle,
|
|
|
|
free(buffer);
|
|
#ifdef FREEIMAGE_BIGENDIAN
|
|
- } else if (bpp == 16) {
|
|
+ } else if (dst_bpp == 16) {
|
|
int padding = dst_pitch - dst_width * sizeof(WORD);
|
|
WORD pad = 0;
|
|
WORD pixel;
|
|
@@ -1440,7 +1440,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle,
|
|
}
|
|
#endif
|
|
#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB
|
|
- } else if (bpp == 24) {
|
|
+ } else if (dst_bpp == 24) {
|
|
int padding = dst_pitch - dst_width * sizeof(FILE_BGR);
|
|
DWORD pad = 0;
|
|
FILE_BGR bgr;
|
|
@@ -1461,7 +1461,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle,
|
|
}
|
|
}
|
|
}
|
|
- } else if (bpp == 32) {
|
|
+ } else if (dst_bpp == 32) {
|
|
FILE_BGRA bgra;
|
|
for(unsigned y = 0; y < dst_height; y++) {
|
|
BYTE *line = FreeImage_GetScanLine(dib, y);
|