You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ap...@apache.org on 2006/12/06 22:53:56 UTC
svn commit: r483253 - in
/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared:
SurfaceDataStructure.cpp pngdecoder.c
Author: apetrenko
Date: Wed Dec 6 13:53:55 2006
New Revision: 483253
URL: http://svn.apache.org/viewvc?view=rev&rev=483253
Log:
Optimizing compiler warnings are fixed
Modified:
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.cpp
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.c
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.cpp?view=diff&rev=483253&r1=483252&r2=483253
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.cpp (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.cpp Wed Dec 6 13:53:55 2006
@@ -485,7 +485,7 @@
for(int y = h; y > 0; y--, src += srcstride, dst += dststride){
d = dst;
- for(int x = 0; x < w; x++){
+ for(unsigned int x = 0; x < w; x++){
bitnum = x * pixelBits;
s = src + bitnum / 8;
elem = *s;
@@ -630,7 +630,7 @@
surf->scanline_stride = scanlineStride;
surf->offset = offset;
surf->has_alpha = hasAlpha;
- surf->isAlphaPre = isAlphaPre;
+ surf->isAlphaPre = isAlphaPre != 0;
surf->transparency = transparency;
if(dataType == TYPE_BYTE){
surf->scanline_stride_byte = scanlineStride;
@@ -955,7 +955,7 @@
SURFACE_STRUCTURE *surf = (SURFACE_STRUCTURE *)ptr;
jlong cachePtr = 0;
if(surf != NULL){
- updateCache(surf, env, data, (bool)alphaPre);
+ updateCache(surf, env, data, alphaPre != 0);
cachePtr = (jlong)surf->bmpData;
}
return cachePtr;
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.c?view=diff&rev=483253&r1=483252&r2=483253
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.c (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.c Wed Dec 6 13:53:55 2006
@@ -154,7 +154,6 @@
void gl_info_callback(png_structp png_ptr, png_infop info) {
JNIEnv *env;
jobject obj;
- png_color_16p imageBackground;
boolean hasTRNS = FALSE;
// Get pointer to global info