Attachment #198298 for bug #232381

Lines 26-32 Link Here

(-)Makefile (-1 / +3 lines)
26	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
27	DOS2UNIX_FILES= Source/LibOpenJPEG/opj_malloc.h \	27	DOS2UNIX_FILES= Source/LibOpenJPEG/opj_malloc.h \
28	Source/LibRawLite/dcraw/dcraw.c \	28	Source/LibRawLite/dcraw/dcraw.c \
29	Source/LibRawLite/internal/dcraw_common.cpp	29	Source/LibRawLite/internal/dcraw_common.cpp \
		30	Source/FreeImage/PluginBMP.cpp \
		31	Source/FreeImage/PluginDDS.cpp
30		32
31	WRKSRC= ${WRKDIR}/FreeImage	33	WRKSRC= ${WRKDIR}/FreeImage
32	MAKE_ARGS= CC="${CC}" CPP="${CPP}" CXX="${CXX}"	34	MAKE_ARGS= CC="${CC}" CPP="${CPP}" CXX="${CXX}"




--- Source/FreeImage/PluginBMP.cpp.orig	2018-10-18 12:56:26 UTC
+++ Source/FreeImage/PluginBMP.cpp
@@ -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);

Return to bug 232381

Line 0 Link Here

(-)files/patch-Source_FreeImage_PluginBMP.cpp (+29 lines)
	1	--- Source/FreeImage/PluginBMP.cpp.orig 2018-10-18 12:56:26 UTC
	2	+++ Source/FreeImage/PluginBMP.cpp
	3	@@ -1419,7 +1419,7 @@ Save(FreeImageIO io, FIBITMAP dib, fi_handle handle,
	4
	5	free(buffer);
	6	#ifdef FREEIMAGE_BIGENDIAN
	7	- } else if (bpp == 16) {
	8	+ } else if (dst_bpp == 16) {
	9	int padding = dst_pitch - dst_width * sizeof(WORD);
	10	WORD pad = 0;
	11	WORD pixel;
	12	@@ -1440,7 +1440,7 @@ Save(FreeImageIO io, FIBITMAP dib, fi_handle handle,
	13	}
	14	#endif
	15	#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB
	16	- } else if (bpp == 24) {
	17	+ } else if (dst_bpp == 24) {
	18	int padding = dst_pitch - dst_width * sizeof(FILE_BGR);
	19	DWORD pad = 0;
	20	FILE_BGR bgr;
	21	@@ -1461,7 +1461,7 @@ Save(FreeImageIO io, FIBITMAP dib, fi_handle handle,
	22	}
	23	}
	24	}
	25	- } else if (bpp == 32) {
	26	+ } else if (dst_bpp == 32) {
	27	FILE_BGRA bgra;
	28	for(unsigned y = 0; y < dst_height; y++) {
	29	BYTE *line = FreeImage_GetScanLine(dib, y);