[scorched3d] It's a bad idea to use png_* for variable names
Bruno Wolff III
bruno at fedoraproject.org
Tue Nov 8 00:28:28 UTC 2011
commit f03472a86e95acee96613a079da1c50b67b4fbf0
Author: Bruno Wolff III <bruno at wolff.to>
Date: Mon Nov 7 13:02:00 2011 -0600
It's a bad idea to use png_* for variable names
scorched3d-libpng15.patch | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/scorched3d-libpng15.patch b/scorched3d-libpng15.patch
index 93f9e07..70e56f3 100644
--- a/scorched3d-libpng15.patch
+++ b/scorched3d-libpng15.patch
@@ -16,7 +16,7 @@
Uint32 Amask;
SDL_Palette *palette;
+ int num_palette = 0;
-+ png_colorp png_palette = NULL;
++ png_colorp tmp_palette = NULL;
png_bytep *volatile row_pointers;
int row, i;
volatile int ckey = -1;
@@ -61,13 +61,13 @@
- palette->colors[i].g = info_ptr->palette[i].green;
- palette->colors[i].r = info_ptr->palette[i].red;
+ } else {
-+ png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette);
++ png_get_PLTE(png_ptr, info_ptr, &tmp_palette, &num_palette);
+ if (num_palette > 0 ) {
+ palette->ncolors = num_palette;
+ for( i=0; i<num_palette; ++i ) {
-+ palette->colors[i].b = png_palette[i].blue;
-+ palette->colors[i].g = png_palette[i].green;
-+ palette->colors[i].r = png_palette[i].red;
++ palette->colors[i].b = tmp_palette[i].blue;
++ palette->colors[i].g = tmp_palette[i].green;
++ palette->colors[i].r = tmp_palette[i].red;
+ }
}
}
More information about the scm-commits
mailing list