Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 7 Sep 2018 17:14:41 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r479200 - in head/graphics/freeimage: . files
Message-ID:  <201809071714.w87HEfHc045517@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809071714.w87HEfHc045517>