56 lines
2.3 KiB
Diff
56 lines
2.3 KiB
Diff
Fixes BE build failure.
|
|
|
|
--- Source/FreeImage/PluginDDS.cpp
|
|
+++ Source/FreeImage/PluginDDS.cpp
|
|
@@ -356,14 +356,14 @@ SwapHeader(DDSHEADER *header) {
|
|
for(int i=0; i<11; i++) {
|
|
SwapLong(&header->surfaceDesc.dwReserved1[i]);
|
|
}
|
|
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwSize);
|
|
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwFlags);
|
|
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwFourCC);
|
|
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRGBBitCount);
|
|
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRBitMask);
|
|
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwGBitMask);
|
|
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwBBitMask);
|
|
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRGBAlphaBitMask);
|
|
+ SwapLong(&header->surfaceDesc.ddspf.dwSize);
|
|
+ SwapLong(&header->surfaceDesc.ddspf.dwFlags);
|
|
+ SwapLong(&header->surfaceDesc.ddspf.dwFourCC);
|
|
+ SwapLong(&header->surfaceDesc.ddspf.dwRGBBitCount);
|
|
+ SwapLong(&header->surfaceDesc.ddspf.dwRBitMask);
|
|
+ SwapLong(&header->surfaceDesc.ddspf.dwGBitMask);
|
|
+ SwapLong(&header->surfaceDesc.ddspf.dwBBitMask);
|
|
+ SwapLong(&header->surfaceDesc.ddspf.dwRGBAlphaBitMask);
|
|
SwapLong(&header->surfaceDesc.ddsCaps.dwCaps1);
|
|
SwapLong(&header->surfaceDesc.ddsCaps.dwCaps2);
|
|
SwapLong(&header->surfaceDesc.ddsCaps.dwReserved[0]);
|
|
--- Source/FreeImage/PluginBMP.cpp
|
|
+++ Source/FreeImage/PluginBMP.cpp
|
|
@@ -1419,7 +1419,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void
|
|
|
|
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, int page, int flags, void
|
|
}
|
|
#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, int page, int flags, void
|
|
}
|
|
}
|
|
}
|
|
- } 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);
|