harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r429270 - in /incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native: gl/shared/JPEGEncoder/JpegEncoder.c jpegdecoder/shared/JPEGDecoder.h
Date Mon, 07 Aug 2006 08:22:18 GMT
Author: hindessm
Date: Mon Aug  7 01:22:16 2006
New Revision: 429270

URL: http://svn.apache.org/viewvc?rev=429270&view=rev
Log:
Applied patch from "[#HARMONY-1046] Remove jpegint.h from awt native sources".

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/JPEGEncoder/JpegEncoder.c
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/JPEGDecoder.h

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/JPEGEncoder/JpegEncoder.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/JPEGEncoder/JpegEncoder.c?rev=429270&r1=429269&r2=429270&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/JPEGEncoder/JpegEncoder.c
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/JPEGEncoder/JpegEncoder.c
Mon Aug  7 01:22:16 2006
@@ -24,7 +24,6 @@
 
 #include "org_apache_harmony_x_imageio_plugins_jpeg_JPEGImageWriter.h"
 #include "jpeglib.h"
-#include "jpegint.h"
 #include "setjmp.h"
 
 #include "exceptions.h"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/JPEGDecoder.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/JPEGDecoder.h?rev=429270&r1=429269&r2=429270&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/JPEGDecoder.h
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/JPEGDecoder.h
Mon Aug  7 01:22:16 2006
@@ -28,7 +28,6 @@
 
 #include "org_apache_harmony_awt_gl_image_JpegDecoder.h"
 #include "jpeglib.h"
-#include "jpegint.h"
 #include "setjmp.h"
 
 #include "exceptions.h"
@@ -42,5 +41,13 @@
 jfieldID img_JPEG_bytesConsumedID;
 jfieldID img_JPEG_currScanlineID;
 jfieldID img_JPEG_hNativeDecoderID;
+
+/* MIN(a, b) macro */
+#undef MIN
+#define MIN(a, b) ((a) < (b))?(a):(b)
+
+/* MAX(a, b) macro */
+#undef MAX
+#define MAX(a, b) ((a) > (b))?(a):(b)
 
 #endif



Mime
View raw message