Date: Sun, 28 Oct 2018 11:26:05 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483279 - in head/graphics/freeimage: . files Message-ID: <201810281126.w9SBQ5Nt097232@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon Date: Sun Oct 28 11:26:05 2018 New Revision: 483279 URL: https://svnweb.freebsd.org/changeset/ports/483279 Log: Fix build on GCC-based architectures. PR: 232381 Submitted by: Piotr Kubaj Added: head/graphics/freeimage/files/patch-Source_FreeImage_PluginBMP.cpp (contents, props changed) Modified: head/graphics/freeimage/Makefile Modified: head/graphics/freeimage/Makefile ============================================================================== --- head/graphics/freeimage/Makefile Sun Oct 28 11:23:17 2018 (r483278) +++ head/graphics/freeimage/Makefile Sun Oct 28 11:26:05 2018 (r483279) @@ -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}" Added: head/graphics/freeimage/files/patch-Source_FreeImage_PluginBMP.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/freeimage/files/patch-Source_FreeImage_PluginBMP.cpp Sun Oct 28 11:26:05 2018 (r483279) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810281126.w9SBQ5Nt097232>