From 46e31eb07bf4bcfe000a1cebe2e3f2f4449f5d37 Mon Sep 17 00:00:00 2001 From: Harley Laue Date: Tue, 11 May 2010 18:57:59 -0500 Subject: [PATCH] Renamed old Makefile, updated .hgignore, and made changes to png functions to remove references to old defines --- .hgignore | 3 +++ Source/OpenGL_Windows.cpp | 4 ++-- makefile => makefile.orig | 0 3 files changed, 5 insertions(+), 2 deletions(-) rename makefile => makefile.orig (100%) diff --git a/.hgignore b/.hgignore index 4165d64..4c53c52 100644 --- a/.hgignore +++ b/.hgignore @@ -4,3 +4,6 @@ run Xcode/build Xcode/*.xcodeproj/*.mode1v3 Xcode/*.xcodeproj/*.pbxuser +build +*~ +.*.swp 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); diff --git a/makefile b/makefile.orig similarity index 100% rename from makefile rename to makefile.orig -- 2.39.2