harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r929889 - in /harmony/enhanced/java/trunk/classlib/modules: awt/src/main/native/gl/shared/pngdecoder.c imageio/src/main/native/pngencoder/shared/pngencoder.c
Date Thu, 01 Apr 2010 08:59:36 GMT
Author: hindessm
Date: Thu Apr  1 08:59:36 2010
New Revision: 929889

URL: http://svn.apache.org/viewvc?rev=929889&view=rev
Log:
Applying patches from "[#HARMONY-6491] Harmony won't compile with libpng
1.4".

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

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/shared/pngdecoder.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/shared/pngdecoder.c?rev=929889&r1=929888&r2=929889&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/shared/pngdecoder.c
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/shared/pngdecoder.c
Thu Apr  1 08:59:36 2010
@@ -309,7 +309,7 @@ png_decoder_info_ptr initPng() {
   decoderInfo->info_ptr = png_create_info_struct(decoderInfo->png_ptr);
 
   if (!decoderInfo->info_ptr) {
-    png_destroy_read_struct(&decoderInfo->png_ptr, png_infopp_NULL, png_infopp_NULL);
+    png_destroy_read_struct(&decoderInfo->png_ptr, NULL, NULL);
     return NULL;
   }
 

Modified: harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/shared/pngencoder.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/shared/pngencoder.c?rev=929889&r1=929888&r2=929889&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/shared/pngencoder.c
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/shared/pngencoder.c
Thu Apr  1 08:59:36 2010
@@ -264,7 +264,7 @@ png_encoder_info_ptr initPng() {
   encoderInfo->info_ptr = png_create_info_struct(encoderInfo->png_ptr);
 
   if (!encoderInfo->info_ptr) {
-    png_destroy_write_struct(&encoderInfo->png_ptr, png_infopp_NULL);
+    png_destroy_write_struct(&encoderInfo->png_ptr, NULL);
     return NULL;
   }
 



Mime
View raw message