Hello community,
here is the log from the commit of package nvidia-texture-tools for
openSUSE:Factory checked in at 2016-07-05 09:52:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nvidia-texture-tools (Old)
and /work/SRC/openSUSE:Factory/.nvidia-texture-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nvidia-texture-tools"
Changes:
--------
---
/work/SRC/openSUSE:Factory/nvidia-texture-tools/nvidia-texture-tools.changes
2015-03-11 09:57:16.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.nvidia-texture-tools.new/nvidia-texture-tools.changes
2016-07-05 09:52:02.000000000 +0200
@@ -1,0 +2,6 @@
+Sat Jul 2 19:23:58 UTC 2016 - meiss...@suse.com
+
+- nvidia-texture-tools-gcc6.patch: replace some "return false;" by
+ "return NULL;" to have a pointer return.
+
+-------------------------------------------------------------------
New:
----
nvidia-texture-tools-gcc6.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nvidia-texture-tools.spec ++++++
--- /var/tmp/diff_new_pack.tvFtV1/_old 2016-07-05 09:52:03.000000000 +0200
+++ /var/tmp/diff_new_pack.tvFtV1/_new 2016-07-05 09:52:03.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package nvidia-texture-tools
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,6 +35,7 @@
Patch0: nvidia-texture-tools-gcc47.patch
# patch libpng15 is upstreamed yet
(http://code.google.com/p/nvidia-texture-tools/source/detail)
Patch1: nvidia-texture-tools-libpng15.patch
+Patch2: nvidia-texture-tools-gcc6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc
@@ -59,6 +60,7 @@
%setup -q -n %name
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -fPIC"
++++++ nvidia-texture-tools-gcc6.patch ++++++
Index: nvidia-texture-tools/src/nvimage/ImageIO.cpp
===================================================================
--- nvidia-texture-tools.orig/src/nvimage/ImageIO.cpp
+++ nvidia-texture-tools/src/nvimage/ImageIO.cpp
@@ -135,7 +135,7 @@ FloatImage * nv::ImageIO::loadFloat(cons
StdInputStream stream(fileName);
if (stream.isError()) {
- return false;
+ return NULL;
}
return loadFloat(fileName, stream);
@@ -233,7 +233,7 @@ Image * nv::ImageIO::loadTGA(Stream & s)
case TGA_TYPE_INDEXED:
if( tga.colormap_type!=1 || tga.colormap_size!=24 ||
tga.colormap_length>256 ) {
nvDebug( "*** ImageIO::loadTGA: Error, only
24bit paletted images are supported.\n" );
- return false;
+ return NULL;
}
pal = true;
break;
@@ -254,7 +254,7 @@ Image * nv::ImageIO::loadTGA(Stream & s)
default:
nvDebug( "*** ImageIO::loadTGA: Error, unsupported
image type.\n" );
- return false;
+ return NULL;
}
const uint pixel_size = (tga.pixel_size/8);
@@ -621,7 +621,7 @@ Image * nv::ImageIO::loadPNG(Stream & s)
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL,
NULL);
if (png_ptr == NULL) {
// nvDebug( "*** LoadPNG: Error allocating read buffer in file
'%s'.\n", name );
- return false;
+ return NULL;
}
// Allocate/initialize a memory block for the image information
@@ -629,14 +629,14 @@ Image * nv::ImageIO::loadPNG(Stream & s)
if (info_ptr == NULL) {
png_destroy_read_struct(&png_ptr, NULL, NULL);
// nvDebug( "*** LoadPNG: Error allocating image information for
'%s'.\n", name );
- return false;
+ return NULL;
}
// Set up the error handling
if (setjmp(png_jmpbuf(png_ptr))) {
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
// nvDebug( "*** LoadPNG: Error reading png file '%s'.\n", name );
- return false;
+ return NULL;
}
// Set up the I/O functions.
