diff options
Diffstat (limited to 'graphics/nvidia-texture-tools/files/patch-c++11')
-rw-r--r-- | graphics/nvidia-texture-tools/files/patch-c++11 | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/graphics/nvidia-texture-tools/files/patch-c++11 b/graphics/nvidia-texture-tools/files/patch-c++11 deleted file mode 100644 index f33c4dd03485..000000000000 --- a/graphics/nvidia-texture-tools/files/patch-c++11 +++ /dev/null @@ -1,76 +0,0 @@ -https://github.com/castano/nvidia-texture-tools/commit/65b3dfa4a6eb - -src/nvimage/ImageIO.cpp:138:10: error: cannot initialize return object of type 'nv::FloatImage *' with an rvalue of type 'bool' - return false; - ^~~~~ -src/nvimage/ImageIO.cpp:236:12: error: cannot initialize return object of type 'nv::Image *' with an rvalue of type 'bool' - return false; - ^~~~~ -src/nvimage/ImageIO.cpp:257:11: error: cannot initialize return object of type 'nv::Image *' with an rvalue of type 'bool' - return false; - ^~~~~ -src/nvimage/ImageIO.cpp:624:10: error: cannot initialize return object of type 'nv::Image *' with an rvalue of type 'bool' - return false; - ^~~~~ -src/nvimage/ImageIO.cpp:632:10: error: cannot initialize return object of type 'nv::Image *' with an rvalue of type 'bool' - return false; - ^~~~~ -src/nvimage/ImageIO.cpp:639:10: error: cannot initialize return object of type 'nv::Image *' with an rvalue of type 'bool' - return false; - ^~~~~ - ---- src/nvimage/ImageIO.cpp.orig 2010-05-15 09:12:05 UTC -+++ src/nvimage/ImageIO.cpp -@@ -135,7 +135,7 @@ FloatImage * nv::ImageIO::loadFloat(const char * fileN - 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. |