X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FOpenGL_Windows.cpp;h=7fbeb494e423053f40bb92037ef9eae2f931f84e;hb=fcc16085eb812a778eed023f4ad5c0b0bc158827;hp=9affb71359f7c2401d00640ccf4555d2b00cad0a;hpb=8866bcf90dba64f2fd6cecd6839b9b80988e46a6;p=lugaru.git diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp index 9affb71..7fbeb49 100644 --- a/Source/OpenGL_Windows.cpp +++ b/Source/OpenGL_Windows.cpp @@ -2679,7 +2679,7 @@ static bool load_png(const char *file_name, TGAImageRec &tex) png_init_io(png_ptr, fp); png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_STRIP_16 | PNG_TRANSFORM_PACKING, - png_voidp_NULL); + NULL); png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL); @@ -2729,7 +2729,7 @@ static bool load_png(const char *file_name, TGAImageRec &tex) retval = true; png_done: - png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); if (fp) fclose(fp); return (retval);