freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build on GCC-based architectures.

Browse Source 
PR:		232381
Submitted by:	Piotr Kubaj
This commit is contained in:
Mark Linimon
2018-10-28 11:26:05 +00:00
parent 06157c086f
commit 92ef57ed47
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/freeimage/Makefile
View File

@@ -26,7 +26,9 @@ USES= dos2unix gmake zip
USE_LDCONFIG= yes
DOS2UNIX_FILES= Source/LibOpenJPEG/opj_malloc.h \
Source/LibRawLite/dcraw/dcraw.c \
Source/LibRawLite/internal/dcraw_common.cpp
Source/LibRawLite/internal/dcraw_common.cpp \
Source/FreeImage/PluginBMP.cpp \
Source/FreeImage/PluginDDS.cpp
WRKSRC= ${WRKDIR}/FreeImage
MAKE_ARGS= CC="${CC}" CPP="${CPP}" CXX="${CXX}"

29
graphics/freeimage/files/patch-Source_FreeImage_PluginBMP.cpp Normal file
View File

@@ -0,0 +1,29 @@
--- 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);