Changeset 257

Timestamp:

Feb 14, 2011, 11:13:16 PM (15 years ago)

Author:

dmik

Message:

jdk: Fixed exports in mlibimg.dll that caused java.awt.image.ImagingOpException in many applications (closes #58).

Location:

trunk/openjdk/jdk

Files:

• make/sun/image/generic/Makefile (modified) (2 diffs)
• src/share/native/sun/awt/medialib/mlib_image_proto.h (modified) (1 diff)

trunk/openjdk/jdk/make/sun/image/generic/Makefile

@@ -53 +53 @@
 include FILES_c.gmk
 
+ifeq ($(PLATFORM), os2)
+
+# exports live in .def file
+DEF_FILE = $(OBJDIR)/$(LIBRARY).def
+$(DEF_FILE): $(MAKEFILE_LIST)
+        @$(ECHO) "LIBRARY $(LIBRARY) INITINSTANCE TERMINSTANCE" > $@
+        @$(ECHO) 'EXPORTS \n \
+  j2d_mlib_ImageConvMxN = _j2d_mlib_ImageConvMxN \n \
+  j2d_mlib_ImageConvKernelConvert = _j2d_mlib_ImageConvKernelConvert \n \
+  j2d_mlib_ImageCreateStruct = _j2d_mlib_ImageCreateStruct \n \
+  j2d_mlib_ImageCreate = _j2d_mlib_ImageCreate \n \
+  j2d_mlib_ImageDelete = _j2d_mlib_ImageDelete \n \
+  j2d_mlib_ImageAffine = _j2d_mlib_ImageAffine \n \
+  j2d_mlib_ImageLookUp = _j2d_mlib_ImageLookUp \n \
+' >> $@
+
+clean::
+        -$(RM) $(DEF_FILE)
+
+endif
+
 #
 # Rules
@@ -74 +95 @@
 OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES
 OTHER_LDLIBS = $(LIBM) -ldl
-

trunk/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_image_proto.h

@@ -43 +43 @@
 #endif // __USE_J2D_NAMES
 
-#if defined ( _MSC_VER )
+#if defined ( _MSC_VER ) || defined ( __WIN32OS2__ )
 #define J2D_MLIB_PUBLIC __declspec(dllexport)
 #else