diff -Nur 0ad-0.0.20-alpha/libraries/source/nvtt/src/src/nvimage/ImageIO.cpp new/libraries/source/nvtt/src/src/nvimage/ImageIO.cpp
old
|
new
|
|
621 | 621 | png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); |
622 | 622 | if (png_ptr == NULL) { |
623 | 623 | // nvDebug( "*** LoadPNG: Error allocating read buffer in file '%s'.\n", name ); |
624 | | return false; |
| 624 | return NULL; |
625 | 625 | } |
626 | 626 | |
627 | 627 | // Allocate/initialize a memory block for the image information |
… |
… |
|
629 | 629 | if (info_ptr == NULL) { |
630 | 630 | png_destroy_read_struct(&png_ptr, NULL, NULL); |
631 | 631 | // nvDebug( "*** LoadPNG: Error allocating image information for '%s'.\n", name ); |
632 | | return false; |
| 632 | return NULL; |
633 | 633 | } |
634 | 634 | |
635 | 635 | // Set up the error handling |
636 | 636 | if (setjmp(png_jmpbuf(png_ptr))) { |
637 | 637 | png_destroy_read_struct(&png_ptr, &info_ptr, NULL); |
638 | 638 | // nvDebug( "*** LoadPNG: Error reading png file '%s'.\n", name ); |
639 | | return false; |
| 639 | return NULL; |
640 | 640 | } |
641 | 641 | |
642 | 642 | // Set up the I/O functions. |