harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r529572 - in /harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared: pngdecoder.c pngdecoder.h
Date Tue, 17 Apr 2007 11:56:46 GMT
Author: ayza
Date: Tue Apr 17 04:56:45 2007
New Revision: 529572

URL: http://svn.apache.org/viewvc?view=rev&rev=529572
Log:
Applying updated patch for HARMONY-3570. The type of numScanline is changed to png_uint_32.


Modified:
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.c
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.h

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=529572&r1=529571&r2=529572
==============================================================================
--- 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 Tue
Apr 17 04:56:45 2007
@@ -225,6 +225,7 @@
   env = decoderInfo->env;
   obj = decoderInfo->obj;
 
+  // images that have width or height > 2^31 aren't supported :)
   (*env)->SetIntField(env, obj, img_PNG_imageWidthID, decoderInfo->width);
   (*env)->SetIntField(env, obj, img_PNG_imageHeightID, decoderInfo->height);
   (*env)->SetIntField(env, obj, img_PNG_bitDepthID, decoderInfo->bitDepth);

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.h?view=diff&rev=529572&r1=529571&r2=529572
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.h (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.h Tue
Apr 17 04:56:45 2007
@@ -59,9 +59,9 @@
   png_infop info_ptr;
   unsigned char *inputBuffer;  
 
-  size_t rowbytes; // Bytes for one row of data
-  int width;
-  int height;
+  png_uint_32 rowbytes; // Bytes for one row of data
+  png_uint_32 width;
+  png_uint_32 height;
 
   int channels;
   int bitDepth;
@@ -72,7 +72,7 @@
   boolean doneDecoding;
 
   int updateFromScanline; // Current row
-  int numScanlines; // How much we decoded during this call of processData
+  png_uint_32 numScanlines; // How much we decoded during this call of processData
 
   // JNI-related vars
   JNIEnv *env;



Mime
View raw message