rpms
/
nvidia-texture-tools
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct FTBFS in rawhide (#1307810)

This commit is contained in:
pcpa 2016-03-17 16:10:28 -03:00
parent ae2728dbcf
commit 9bc920e833
2 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
nvidia-texture-tools-bool-null.patch Normal file
View File

@ -0,0 +1,56 @@
diff -up nvidia-texture-tools/src/nvimage/ImageIO.cpp.orig nvidia-texture-tools/src/nvimage/ImageIO.cpp
--- nvidia-texture-tools/src/nvimage/ImageIO.cpp.orig 2016-03-17 16:05:57.432384322 -0300
+++ nvidia-texture-tools/src/nvimage/ImageIO.cpp 2016-03-17 16:07:43.769388394 -0300
@@ -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.

9
nvidia-texture-tools.spec
View File

@ -2,7 +2,7 @@
Name: nvidia-texture-tools
Version: 2.0.8
Release: 12%{?dist}
Release: 13%{?dist}
Summary: Collection of image processing and texture manipulation tools
Group: System Environment/Libraries
License: MIT
@ -31,6 +31,9 @@ Patch4: %{name}-%{version}-libdir.patch
Patch5: %{name}-arm.patch
# add aarch64 support
Patch6: %{name}-aarch64.patch
# Return NULL not false on pointer returning functions
Patch7: %{name}-bool-null.patch
%description
The NVIDIA Texture Tools is a collection of image processing and texture
manipulation tools, designed to be integrated in game tools and asset
@ -60,6 +63,7 @@ Headers and libraries for development with %{name}.
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%build
mkdir -p build
@ -101,6 +105,9 @@ make -C build filtertest
%{_libdir}/lib*.so
%changelog
* Thu Mar 17 2016 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 2.0.8-13
- Correct FTBFS in rawhide (#1307810)
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild