From owner-svn-ports-all@freebsd.org Fri Sep 7 17:14:42 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 1F3E1FFFED3; Fri, 7 Sep 2018 17:14:42 +0000 (UTC) (envelope-from tobik@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 CA50A7157A; Fri, 7 Sep 2018 17:14:41 +0000 (UTC) (envelope-from tobik@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 C4CE31ED11; Fri, 7 Sep 2018 17:14:41 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w87HEfqA045518; Fri, 7 Sep 2018 17:14:41 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w87HEfHc045517; Fri, 7 Sep 2018 17:14:41 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201809071714.w87HEfHc045517@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 7 Sep 2018 17:14:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479200 - in head/graphics/freeimage: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/graphics/freeimage: . files X-SVN-Commit-Revision: 479200 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.27 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: Fri, 07 Sep 2018 17:14:42 -0000 Author: tobik Date: Fri Sep 7 17:14:41 2018 New Revision: 479200 URL: https://svnweb.freebsd.org/changeset/ports/479200 Log: graphics/freeimage: Amend patch introduced in r479150 While there is an additional check on 'handle' in psdParser::Save() later it should be done earlier as intended and not just commented out because of Clang/libc++ regressions. Modified: head/graphics/freeimage/Makefile head/graphics/freeimage/files/patch-Source_FreeImage_PluginPSD.cpp Modified: head/graphics/freeimage/Makefile ============================================================================== --- head/graphics/freeimage/Makefile Fri Sep 7 17:07:39 2018 (r479199) +++ head/graphics/freeimage/Makefile Fri Sep 7 17:14:41 2018 (r479200) @@ -3,6 +3,7 @@ PORTNAME= freeimage PORTVERSION= 3.18.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/Source%20Distribution/${PORTVERSION} DISTNAME= FreeImage${PORTVERSION:S/.//g} Modified: head/graphics/freeimage/files/patch-Source_FreeImage_PluginPSD.cpp ============================================================================== --- head/graphics/freeimage/files/patch-Source_FreeImage_PluginPSD.cpp Fri Sep 7 17:07:39 2018 (r479199) +++ head/graphics/freeimage/files/patch-Source_FreeImage_PluginPSD.cpp Fri Sep 7 17:14:41 2018 (r479200) @@ -1,3 +1,8 @@ +Source/FreeImage/PluginPSD.cpp:130:10: error: cannot initialize return object of type + 'BOOL' (aka 'int') with an rvalue of type 'nullptr_t' + return NULL; + ^~~~ + --- Source/FreeImage/PluginPSD.cpp.orig 2018-09-04 20:32:27 UTC +++ Source/FreeImage/PluginPSD.cpp @@ -127,7 +127,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int @@ -5,7 +10,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void *data) { if(!handle) { - return NULL; -+ //return NULL; ++ return FALSE; } try { psdParser parser;