From owner-svn-ports-all@freebsd.org Sun Oct 28 11:26:06 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6BBFF108729E; Sun, 28 Oct 2018 11:26:06 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 221917D88C; Sun, 28 Oct 2018 11:26:06 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 043C31EBB4; Sun, 28 Oct 2018 11:26:06 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9SBQ5Zx097233; Sun, 28 Oct 2018 11:26:05 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9SBQ5Nt097232; Sun, 28 Oct 2018 11:26:05 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201810281126.w9SBQ5Nt097232@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Sun, 28 Oct 2018 11:26:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483279 - in head/graphics/freeimage: . files X-SVN-Group: ports-head X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: in head/graphics/freeimage: . files X-SVN-Commit-Revision: 483279 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2018 11:26:06 -0000 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);