/[packages]/cauldron/java-1.8.0-openjdk/current/SOURCES/system-libjpeg.patch
ViewVC logotype

Diff of /cauldron/java-1.8.0-openjdk/current/SOURCES/system-libjpeg.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 623671 by dmorgan, Sun Aug 4 21:32:45 2013 UTC revision 623672 by dmorgan, Sun May 18 20:25:02 2014 UTC
# Line 1  Line 1 
1  diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4  diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
2  --- jdk8/common/autoconf/libraries.m4  --- jdk8/common/autoconf/libraries.m4   2013-10-31 19:24:33.000000000 -0400
3  +++ jdk8/common/autoconf/libraries.m4  +++ jdk8/common/autoconf/libraries.m4   2013-11-14 21:55:20.249903347 -0500
4  @@ -487,11 +487,40 @@  @@ -601,12 +601,42 @@
5   # Check for the jpeg library     #
6   #  
7       USE_EXTERNAL_LIBJPEG=true
8  -USE_EXTERNAL_LIBJPEG=true  -  AC_CHECK_LIB(jpeg, main, [],
9  -AC_CHECK_LIB(jpeg, main, [],  -      [ USE_EXTERNAL_LIBJPEG=false
10  -             [ USE_EXTERNAL_LIBJPEG=false  -      AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source])
11  -               AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source])  -  ])
12  -             ])  +  AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg],
13  +AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg],  +      [use libjpeg from build system or OpenJDK sources (system, bundled) @<:@bundled@:>@])])
14  +    [use libjpeg from build system or OpenJDK sources (system, bundled) @<:@bundled@:>@])])  +
15  +  +  AC_CHECK_LIB(jpeg, jpeg_destroy_compress,
16  +AC_CHECK_LIB(jpeg, jpeg_destroy_compress,  +               [ LIBJPEG_FOUND=yes ],
17  +             [ LIBJPEG_FOUND=yes ],  +               [ LIBJPEG_FOUND=no ])
18  +             [ LIBJPEG_FOUND=no ])  +
19  +  +  AC_MSG_CHECKING([for which libjpeg to use])
20  +AC_MSG_CHECKING([for which libjpeg to use])  +
21  +  +  # default is bundled
22  +# default is bundled  +  DEFAULT_LIBJPEG=bundled
23  +DEFAULT_LIBJPEG=bundled  +
24  +  +  #
25  +#  +  # if user didn't specify, use DEFAULT_LIBJPEG
26  +# if user didn't specify, use DEFAULT_LIBJPEG  +  #
27  +#  +  if test "x${with_libjpeg}" = "x"; then
28  +if test "x${with_libjpeg}" = "x"; then  +      with_libjpeg=${DEFAULT_LIBJPEG}
29  +    with_libjpeg=${DEFAULT_LIBJPEG}  +  fi
30  +fi  +
31  +  +  if test "x${with_libjpeg}" = "xbundled"; then
32  +if test "x${with_libjpeg}" = "xbundled"; then  +      USE_EXTERNAL_LIBJPEG=false
33  +    USE_EXTERNAL_LIBJPEG=false  +      AC_MSG_RESULT([bundled])
34  +    AC_MSG_RESULT([bundled])  +  elif test "x${with_libjpeg}" = "xsystem"; then
35  +elif test "x${with_libjpeg}" = "xsystem"; then  +      if test "x${LIBJPEG_FOUND}" = "xyes"; then
36  +    if test "x${LIBJPEG_FOUND}" = "xyes"; then  +          USE_EXTERNAL_LIBJPEG=true
37  +        USE_EXTERNAL_LIBJPEG=true  +          AC_MSG_RESULT([system])
38  +        AC_MSG_RESULT([system])  +      else
39  +    else  +          AC_MSG_RESULT([system not found])
40  +        AC_MSG_RESULT([system not found])  +          AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])
41  +        AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])  +      fi
42  +    fi  +  else
43  +else  +      AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled'])
44  +    AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled'])  +  fi
45  +fi     AC_SUBST(USE_EXTERNAL_LIBJPEG)
46  +  
47   AC_SUBST(USE_EXTERNAL_LIBJPEG)  +
48               ###############################################################################
49   ###############################################################################     #
50  diff --git a/makefiles/CompileNativeLibraries.gmk b/makefiles/CompileNativeLibraries.gmk     # Check for the gif library
51  --- jdk8/jdk/makefiles/CompileNativeLibraries.gmk  diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
52  +++ jdk8/jdk/makefiles/CompileNativeLibraries.gmk  --- jdk8/jdk/make/lib/Awt2dLibraries.gmk        2013-10-31 19:44:18.000000000 -0400
53  @@ -1249,17 +1249,17 @@  +++ jdk8/jdk/make/lib/Awt2dLibraries.gmk        2013-11-14 21:56:01.020796703 -0500
54    @@ -696,17 +696,17 @@
55   ##########################################################################################   ##########################################################################################
56    
57   ifdef OPENJDK   ifdef OPENJDK
58  -    BUILD_LIBJPEG_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers  -  BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers
59  +    BUILD_LIBJAVAJPEG_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers  +  BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers
60   else   else
61  -    BUILD_LIBJPEG_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers-closed  -  BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed
62  -    BUILD_LIBJPEG_CLOSED_SRC:=$(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg  -  BUILD_LIBJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg
63  -    BUILD_LIBJPEG_CLOSED_INCLUDES:=-I$(BUILD_LIBJPEG_CLOSED_SRC)  -  BUILD_LIBJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJPEG_CLOSED_SRC)
64  +    BUILD_LIBJAVAJPEG_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers-closed  +  BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed
65  +    BUILD_LIBJAVAJPEG_CLOSED_SRC:=$(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg  +  BUILD_LIBJAVAJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg
66  +    BUILD_LIBJAVAJPEG_CLOSED_INCLUDES:=-I$(BUILD_LIBJAVAJPEG_CLOSED_SRC)  +  BUILD_LIBJAVAJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJPEG_CLOSED_SRC)
67   endif   endif
68    
69  -BUILD_LIBJPEG_REORDER:=  -BUILD_LIBJPEG_REORDER :=
70  +BUILD_LIBJAVAJPEG_REORDER:=  +BUILD_LIBJAVAJPEG_REORDER :=
71   ifeq ($(OPENJDK_TARGET_OS), solaris)   ifeq ($(OPENJDK_TARGET_OS), solaris)
72       ifneq ($(OPENJDK_TARGET_CPU), x86_64)     ifneq ($(OPENJDK_TARGET_CPU), x86_64)
73  -        BUILD_LIBJPEG_REORDER:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)  -    BUILD_LIBJPEG_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
74  +        BUILD_LIBJAVAJPEG_REORDER:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)  +    BUILD_LIBJAVAJPEG_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
75       endif     endif
76   endif   endif
77    
78  @@ -1274,37 +1274,37 @@  @@ -721,37 +721,37 @@
79   #        $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \   #      $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
80   #              \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )   #          \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
81   #    ifeq ($(CC_43_OR_NEWER),1)   #  ifeq ($(CC_43_OR_NEWER), 1)
82  -#        BUILD_LIBJPEG_CFLAGS_linux += -Wno-clobbered  -#    BUILD_LIBJPEG_CFLAGS_linux += -Wno-clobbered
83  +#        BUILD_LIBJAVAJPEG_CFLAGS_linux += -Wno-clobbered  +#    BUILD_LIBJAVAJPEG_CFLAGS_linux += -Wno-clobbered
84   #    endif   #  endif
85   #endif   #endif
86    
87  -$(eval $(call SetupNativeCompilation,BUILD_LIBJPEG,\  -$(eval $(call SetupNativeCompilation,BUILD_LIBJPEG, \
88  -                LIBRARY:=jpeg, \  -    LIBRARY := jpeg, \
89  +$(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG,\  +$(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
90  +                LIBRARY:=javajpeg, \  +    LIBRARY := javajpeg, \
91                   OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
92  -                SRC:=$(BUILD_LIBJPEG_CLOSED_SRC) \  -    SRC := $(BUILD_LIBJPEG_CLOSED_SRC) \
93  +                SRC:=$(BUILD_LIBJAVAJPEG_CLOSED_SRC) \  +    SRC := $(BUILD_LIBJAVAJPEG_CLOSED_SRC) \
94                       $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg,\           $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
95                  LANG:=C,\       LANG := C, \
96                  OPTIMIZATION:=HIGHEST, \       OPTIMIZATION := HIGHEST, \
97                  CFLAGS:=$(CFLAGS_JDKLIB) \       CFLAGS := $(CFLAGS_JDKLIB) \
98  -                       $(BUILD_LIBJPEG_CLOSED_INCLUDES) \  -        $(BUILD_LIBJPEG_CLOSED_INCLUDES) \
99  +                       $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \  +        $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \
100                          -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg,\           -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
101  -               MAPFILE:=$(BUILD_LIBJPEG_MAPFILE), \  -    MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \
102  -               LDFLAGS:=$(LDFLAGS_JDKLIB) \  -    LDFLAGS := $(LDFLAGS_JDKLIB) \
103  +               MAPFILE:=$(BUILD_LIBJAVAJPEG_MAPFILE), \  +    MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
104  +               LDFLAGS:=$(LDFLAGS_JDKLIB) -ljpeg \  +    LDFLAGS := $(LDFLAGS_JDKLIB) -ljpeg \
105                           $(call SET_SHARED_LIBRARY_ORIGIN),\           $(call SET_SHARED_LIBRARY_ORIGIN), \
106                  LDFLAGS_windows:=$(WIN_JAVA_LIB) jvm.lib,\       LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \
107                  LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\       LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
108                  VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\       VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
109                  RC_FLAGS:=$(RC_FLAGS)\       RC_FLAGS := $(RC_FLAGS) \
110  -                         -D "JDK_FNAME=jpeg.dll" \  -        -D "JDK_FNAME=jpeg.dll" \
111  -                         -D "JDK_INTERNAL_NAME=jpeg" \  -        -D "JDK_INTERNAL_NAME=jpeg" \
112  +                         -D "JDK_FNAME=javajpeg.dll" \  +        -D "JDK_FNAME=javajpeg.dll" \
113  +                         -D "JDK_INTERNAL_NAME=javajpeg" \  +        -D "JDK_INTERNAL_NAME=javajpeg" \
114                            -D "JDK_FTYPE=0x2L",\           -D "JDK_FTYPE=0x2L", \
115  -               REORDER:=$(BUILD_LIBJPEG_REORDER),\  -    REORDER := $(BUILD_LIBJPEG_REORDER), \
116  -               OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjpeg,\  -    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \
117  +               REORDER:=$(BUILD_LIBJAVAJPEG_REORDER),\  +    REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
118  +               OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjavajpeg,\  +    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavajpeg, \
119                  DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))       DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
120    
121    -$(BUILD_LIBJPEG): $(BUILD_LIBJAVA)
122    +$(BUILD_LIBJAVAJPEG): $(BUILD_LIBJAVA)
123    
 -$(BUILD_LIBJPEG) : $(BUILD_LIBJAVA)  
 -  
124  -BUILD_LIBRARIES += $(BUILD_LIBJPEG)  -BUILD_LIBRARIES += $(BUILD_LIBJPEG)
 +$(BUILD_LIBJAVAJPEG) : $(BUILD_LIBJAVA)  
 +  
125  +BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG)  +BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG)
126    
127   ##########################################################################################   ##########################################################################################
128    
129  @@ -2441,7 +2441,7 @@  @@ -1183,7 +1183,6 @@
130                                     -F/System/Library/Frameworks/JavaVM.framework/Frameworks \  
131                                    -framework JavaNativeFoundation   ifndef BUILD_HEADLESS_ONLY
132   else ifneq ($(OPENJDK_TARGET_OS), windows)     LIBSPLASHSCREEN_DIRS := \
133  -       LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread  -    $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
134  +       LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread -ljpeg       $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
135   else # OPENJDK_TARGET_OS       $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
136          LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll  
137   endif # OPENJDK_TARGET_OS  @@ -1194,6 +1193,13 @@
138  @@ -2457,7 +2457,7 @@       GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
139                  MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \     endif
140                  LDFLAGS:=$(LDFLAGS_JDKLIB) \  
141                           $(call SET_SHARED_LIBRARY_ORIGIN),\  +  ifeq ($(USE_EXTERNAL_LIBJPEG), true)
142  -               LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS),\  +    LIBJPEG_LDFLAGS := -ljpeg
143  +               LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS) -ljpeg,\  +  else
144                  LDFLAGS_SUFFIX_solaris:=-lc,\  +    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
145                  VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\  +    LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/jpeg
146                  RC_FLAGS:=$(RC_FLAGS)\  +  endif
147  diff --git a/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java  +
148  --- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java     ifneq ($(OPENJDK_TARGET_OS), macosx)
149  +++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java       LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
150       else
151    @@ -1256,11 +1262,13 @@
152           EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
153           LANG := C, \
154           OPTIMIZATION := LOW, \
155    -      CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) $(GIFLIB_CFLAGS), \
156    +      CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
157    +          $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS), \
158           MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
159           LDFLAGS := $(LDFLAGS_JDKLIB) \
160               $(call SET_SHARED_LIBRARY_ORIGIN), \
161    -      LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS), \
162    +      LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) \
163    +          $(LIBZ) $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS), \
164           LDFLAGS_SUFFIX_solaris := -lc, \
165           VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
166           RC_FLAGS := $(RC_FLAGS) \
167    diff -ruN jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
168    --- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java        2013-10-31 19:44:18.000000000 -0400
169    +++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java        2013-11-14 21:55:20.250903340 -0500
170  @@ -89,7 +89,7 @@  @@ -89,7 +89,7 @@
171           java.security.AccessController.doPrivileged(           java.security.AccessController.doPrivileged(
172               new java.security.PrivilegedAction<Void>() {               new java.security.PrivilegedAction<Void>() {
# Line 156  diff --git a/src/share/classes/com/sun/i Line 176  diff --git a/src/share/classes/com/sun/i
176                       return null;                       return null;
177                   }                   }
178               });               });
179  diff --git a/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java b/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java  diff -ruN jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
180  --- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java  --- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java        2013-10-31 19:44:18.000000000 -0400
181  +++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java  +++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java        2013-11-14 21:55:20.250903340 -0500
182  @@ -179,7 +179,7 @@  @@ -179,7 +179,7 @@
183           java.security.AccessController.doPrivileged(           java.security.AccessController.doPrivileged(
184               new java.security.PrivilegedAction<Void>() {               new java.security.PrivilegedAction<Void>() {
# Line 168  diff --git a/src/share/classes/com/sun/i Line 188  diff --git a/src/share/classes/com/sun/i
188                       return null;                       return null;
189                   }                   }
190               });               });
191  diff --git a/src/share/classes/sun/awt/image/JPEGImageDecoder.java b/src/share/classes/sun/awt/image/JPEGImageDecoder.java  diff -ruN jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java
192  --- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java  --- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java      2013-10-31 19:44:18.000000000 -0400
193  +++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java  +++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java      2013-11-14 21:55:20.251903376 -0500
194  @@ -56,7 +56,7 @@  @@ -56,7 +56,7 @@
195           java.security.AccessController.doPrivileged(           java.security.AccessController.doPrivileged(
196               new java.security.PrivilegedAction<Void>() {               new java.security.PrivilegedAction<Void>() {
# Line 180  diff --git a/src/share/classes/sun/awt/i Line 200  diff --git a/src/share/classes/sun/awt/i
200                       return null;                       return null;
201                   }                   }
202               });               });
203  diff --git a/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c b/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c  diff -ruN jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
204  --- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c  --- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c  2013-10-31 19:44:18.000000000 -0400
205  +++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c  +++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c  2013-11-14 21:55:20.251903376 -0500
206  @@ -25,7 +25,6 @@  @@ -25,7 +25,6 @@
207    
208   #include "splashscreen_impl.h"   #include "splashscreen_impl.h"
Legend:
Removed from v.623671  
changed lines
  Added in v.623672
  ViewVC Help
Powered by ViewVC 1.1.30