OSDN Git Service
(root)
/
android-x86
/
development.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a8ba4a0
)
Fix compilation error by declaring stride before the first goto
author
Xavier Ducrohet
<xav@android.com>
Mon, 11 Jan 2010 20:00:41 +0000
(12:00 -0800)
committer
Xavier Ducrohet
<xav@android.com>
Mon, 11 Jan 2010 20:03:02 +0000
(12:03 -0800)
Change-Id: I242601038dc7290eac0e4745abaa1ec35d859c09
tools/etc1tool/etc1tool.cpp
patch
|
blob
|
history
diff --git
a/tools/etc1tool/etc1tool.cpp
b/tools/etc1tool/etc1tool.cpp
index
34bcbec
..
ecf96ec
100644
(file)
--- a/
tools/etc1tool/etc1tool.cpp
+++ b/
tools/etc1tool/etc1tool.cpp
@@
-144,6
+144,7
@@
int read_PNG_File(const char* pInput, etc1_byte** ppImageData,
png_uint_32 height = 0;
int result = -1;
etc1_byte* pSourceImage = 0;
+ png_uint_32 stride = 0;
if ((pIn = fopen(pInput, "rb")) == NULL) {
fprintf(stderr, "Could not open input file %s for reading: %d\n",
@@
-196,7
+197,7
@@
int read_PNG_File(const char* pInput, etc1_byte** ppImageData,
&color_type, NULL, NULL, NULL);
}
-
png_uint_32
stride = 3 * width;
+ stride = 3 * width;
pSourceImage = new etc1_byte[stride * height];
if (! pSourceImage) {