harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r423405 - in /incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native: gl/linux/ gl/shared/ gl/shared/JPEGEncoder/ gl/windows/ jpegdecoder/linux/ jpegdecoder/shared/ jpegdecoder/windows/ lcmm/linux/ lcmm/shared/ lcmm/windows/ ...
Date Wed, 19 Jul 2006 08:51:30 GMT
Author: hindessm
Date: Wed Jul 19 01:51:27 2006
New Revision: 423405

URL: http://svn.apache.org/viewvc?rev=423405&view=rev
Log:
Change awt natives to use exception functions from luni common library.

Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/Exceptions.c
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/Exceptions.h
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/Exceptions.c
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/Exceptions.h
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/Exceptions.cpp
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/Exceptions.h
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile
    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/gl/shared/pngdecoder.c
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.h
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/JPEGDecoder.h
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/JpegDecoder.c
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeCMM.c
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeImageFormat.c
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/cmmerror.c
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/cmmerror.h
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/LinuxNativeFont.c
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/winFont.cpp

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile?rev=423405&r1=423404&r2=423405&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile
Wed Jul 19 01:51:27 2006
@@ -17,9 +17,7 @@
 
 PNG_DIR=$(HY_HDK)/../depends/libs/build/png
 
-CFLAGS += -fpic -I$(SHARED)common -I$(SHAREDSUB)/include -I$(PNG_DIR) \
-	  -I../../lcmm/shared
-# TOFIX move Exceptions to common?
+CFLAGS += -fpic -I$(SHARED)common -I$(SHAREDSUB)/include -I$(PNG_DIR)
 
 BUILDFILES = \
   $(SHAREDSUB)/blitter.o \
@@ -27,7 +25,6 @@
   $(SHAREDSUB)/LUTTables.o \
   $(SHAREDSUB)/pngdecoder.o \
   $(SHAREDSUB)/SurfaceDataStructure.o \
-  ../../lcmm/shared/Exceptions.o \
   libpng.a
 
 MDLLIBFILES = \

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=423405&r1=423404&r2=423405&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
Wed Jul 19 01:51:27 2006
@@ -27,7 +27,7 @@
 #include "jpegint.h"
 #include "setjmp.h"
 
-#include "Exceptions.h"
+#include "exceptions.h"
 
 #define MAX_BUFFER 32768
 
@@ -197,7 +197,7 @@
     //-- create compress struct
     cinfo = malloc(sizeof(struct jpeg_compress_struct));
     if (!cinfo) {
-        newExceptionByName(env, "java/lang/OutOfMemoryError", "Unable to allocate memory
for IJG structures");
+        throwNewOutOfMemoryError("Unable to allocate memory for IJG structures");
         return 0;
     }
 
@@ -205,7 +205,7 @@
     err_mgr = malloc(sizeof(enc_error_mgr));
     if (!err_mgr) {
         free(cinfo);
-        newExceptionByName(env, "java/lang/OutOfMemoryError", "Unable to allocate memory
for IJG structures");
+        throwNewOutOfMemoryError("Unable to allocate memory for IJG structures");
         return 0;
     }
     
@@ -221,7 +221,7 @@
     if (!dest_mgr) {
         free(cinfo);
         free(err_mgr);
-        newExceptionByName(env, "java/lang/OutOfMemoryError", "Unable to allocate memory
for IJG structures");
+        throwNewOutOfMemoryError("Unable to allocate memory for IJG structures");
         return 0;
     }
     cinfo->dest = dest_mgr;
@@ -232,7 +232,7 @@
         free(cinfo);
         free(err_mgr);
         free(dest_mgr);
-        newExceptionByName(env, "java/lang/OutOfMemoryError", "Unable to allocate memory
for IJG structures");
+        throwNewOutOfMemoryError("Unable to allocate memory for IJG structures");
         return 0;
     }
     cinfo->client_data = client_data;
@@ -243,7 +243,7 @@
         free(err_mgr);
         free(dest_mgr);
         free(client_data);
-        newExceptionByName(env, "java/lang/OutOfMemoryError", "Unable to allocate memory
for IJG structures");
+        throwNewOutOfMemoryError("Unable to allocate memory for IJG structures");
         return 0;
     }
     dest_mgr->next_output_byte = client_data->jpeg_buffer;
@@ -327,7 +327,7 @@
     }
     cdata->ios = (*env)->NewGlobalRef(env, iosObj);
     if (cdata->ios == NULL) {
-        newExceptionByName(env, "java/lang/OutOfMemoryError", "Unable to allocate memory
for IJG structures");
+        throwNewOutOfMemoryError("Unable to allocate memory for IJG structures");
         return;
     }
     cinfo->dest->next_output_byte = cdata->jpeg_buffer;
@@ -360,7 +360,7 @@
     row_pointer = (JSAMPROW) malloc(width * numBands);
 
     if (!row_pointer) {
-        newExceptionByName(env, "java/lang/OutOfMemoryError", "Unable to allocate memory
for IJG structures");
+        throwNewOutOfMemoryError("Unable to allocate memory for IJG structures");
         return FALSE;
     }
 
@@ -372,7 +372,8 @@
         if (!(*env)->ExceptionOccurred(env)) {
             char msg_buffer[JMSG_LENGTH_MAX];
             cinfo->err->format_message(cinfo, msg_buffer);
-            newExceptionByName(env, "javax/imageio/IIOException", msg_buffer);
+            throwNewExceptionByName(env, "javax/imageio/IIOException",
+                                    msg_buffer);
         }
         if (row_pointer) {
             free(row_pointer);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.c?rev=423405&r1=423404&r2=423405&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.c
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.c
Wed Jul 19 01:51:27 2006
@@ -53,7 +53,8 @@
   // Init decoder if needed
   if(!decoderInfo) {
     if(!(decoderInfo = initPng())) {
-      newExceptionByName(env, "java/lang/RuntimeException", "Can't create native PNG decoder");
+      throwNewExceptionByName(env, "java/lang/RuntimeException",
+                              "Can't create native PNG decoder");
       return 0; // NULL
     }
   }
@@ -125,7 +126,8 @@
 
 void gl_error_fn(png_structp png_ptr, png_const_charp error_msg) {
   png_decoder_info_ptr decoderInfo = png_get_error_ptr(png_ptr);
-  newExceptionByName(decoderInfo->env, "java/lang/RuntimeException", error_msg);
+  throwNewExceptionByName(decoderInfo->env, "java/lang/RuntimeException",
+                          error_msg);
   
   if(decoderInfo) { // Else there's no way to terminate correctly
     longjmp(decoderInfo->jmpBuf, 1);
@@ -338,4 +340,4 @@
   }
   (*env)->SetIntField(env, obj, img_PNG_updateFromScanlineID, decoderInfo->updateFromScanline);
   (*env)->SetIntField(env, obj, img_PNG_numScanlinesID, decoderInfo->numScanlines);
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.h?rev=423405&r1=423404&r2=423405&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.h
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.h
Wed Jul 19 01:51:27 2006
@@ -27,7 +27,7 @@
 
 #include "png.h"
 #include "org_apache_harmony_awt_gl_image_PngDecoder.h"
-#include "Exceptions.h"
+#include "exceptions.h"
 
 // Define "boolean" as int if not defined 
 #ifndef __RPCNDR_H__    // don't redefine if rpcndr.h already defined it 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile?rev=423405&r1=423404&r2=423405&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile
Wed Jul 19 01:51:27 2006
@@ -24,14 +24,14 @@
 # TOFIX: fix warning so we can use default HYCFLAGS
 # That is:
 # HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)include /I$(SHAREDSUB) \
-#            /I$(PNG_DIR) /I..\..\lcmm\shared /Iinclude
+#            /I$(PNG_DIR) /Iinclude
 # Need WINVER=0x0500 to get HMONITOR defined.
 HYCFLAGS = \
   -Ogityb1 -W3 -GF -Gs -MD -Zi -Zm400 \
   -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ -DWINVER=0x0500 \
   $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I. \
   /I$(SHAREDSUB)include /I$(SHAREDSUB) \
-  /I$(PNG_DIR) /I..\..\lcmm\shared /Iinclude
+  /I$(PNG_DIR) /Iinclude
 
 BUILDFILES = \
   BitmapSurface.obj \
@@ -44,7 +44,6 @@
   $(SHAREDSUB)LUTTables.obj \
   $(SHAREDSUB)pngdecoder.obj \
   $(SHAREDSUB)SurfaceDataStructure.obj \
-  ..\..\lcmm\shared\Exceptions.obj
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib \

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile?rev=423405&r1=423404&r2=423405&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile
Wed Jul 19 01:51:27 2006
@@ -17,13 +17,10 @@
 
 JPEG_DIR=$(HY_HDK)/../depends/libs/build/jpeg/
 
-CFLAGS += -fpic -I$(SHARED)common -I$(SHAREDSUB)/include -I$(JPEG_DIR) \
-	  -I../../lcmm/shared
-# TOFIX move Exceptions to common?
+CFLAGS += -fpic -I$(SHARED)common -I$(SHAREDSUB)/include -I$(JPEG_DIR)
 
 BUILDFILES = \
   $(SHAREDSUB)/JpegDecoder.o \
-  ../../lcmm/shared/Exceptions.o \
   libjpeg.a
 
 MDLLIBFILES = \

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=423405&r1=423404&r2=423405&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
Wed Jul 19 01:51:27 2006
@@ -31,7 +31,7 @@
 #include "jpegint.h"
 #include "setjmp.h"
 
-#include "Exceptions.h"
+#include "exceptions.h"
 
 #define MAX_BUFFER 32768
 
@@ -43,4 +43,4 @@
 jfieldID img_JPEG_currScanlineID;
 jfieldID img_JPEG_hNativeDecoderID;
 
-#endif
\ No newline at end of file
+#endif

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/JpegDecoder.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/JpegDecoder.c?rev=423405&r1=423404&r2=423405&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/JpegDecoder.c
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/JpegDecoder.c
Wed Jul 19 01:51:27 2006
@@ -158,7 +158,7 @@
   (*env)->SetIntField(env, obj, img_JPEG_bytesConsumedID, -1);
     (*env)->SetLongField(env, obj, img_JPEG_hNativeDecoderID, 0);
 
-  newExceptionByName(env, "java/lang/OutOfMemoryError", "Out of memory");
+  throwNewExceptionByName(env, "java/lang/OutOfMemoryError", "Out of memory");
 }
 
 GLOBAL(void) gl_decompress_struct_init(gl_decompress_struct** glDecompressPtr) {
@@ -222,37 +222,37 @@
 (JNIEnv *env, jclass cls) {  
     img_JPEG_imageWidthID = (*env)->GetFieldID(env, cls, "imageWidth", "I");
     if(img_JPEG_imageWidthID == NULL) {
-        newNullPointerException(env, "Unable to get field ID");
+        throwNPException(env, "Unable to get field ID");
     }
 
     img_JPEG_imageHeightID = (*env)->GetFieldID(env, cls, "imageHeight", "I");
     if(img_JPEG_imageHeightID == NULL) {
-        newNullPointerException(env, "Unable to get field ID");
+        throwNPException(env, "Unable to get field ID");
     }
 
     img_JPEG_progressiveID = (*env)->GetFieldID(env, cls, "progressive", "Z");
     if(img_JPEG_progressiveID == NULL) {
-        newNullPointerException(env, "Unable to get field ID");
+        throwNPException(env, "Unable to get field ID");
     }
 
     img_JPEG_jpegColorSpaceID = (*env)->GetFieldID(env, cls, "jpegColorSpace", "I");
     if(img_JPEG_jpegColorSpaceID == NULL) {
-        newNullPointerException(env, "Unable to get field ID");
+        throwNPException(env, "Unable to get field ID");
     }
 
     img_JPEG_bytesConsumedID = (*env)->GetFieldID(env, cls, "bytesConsumed", "I");
     if(img_JPEG_bytesConsumedID == NULL) {
-        newNullPointerException(env, "Unable to get field ID");
+        throwNPException(env, "Unable to get field ID");
     }
 
     img_JPEG_currScanlineID = (*env)->GetFieldID(env, cls, "currScanline", "I");
     if(img_JPEG_currScanlineID == NULL) {
-        newNullPointerException(env, "Unable to get field ID");
+        throwNPException(env, "Unable to get field ID");
     }
 
     img_JPEG_hNativeDecoderID = (*env)->GetFieldID(env, cls, "hNativeDecoder", "J");
     if(img_JPEG_hNativeDecoderID == NULL) {
-        newNullPointerException(env, "Unable to get field ID");
+        throwNPException(env, "Unable to get field ID");
     }
 }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile?rev=423405&r1=423404&r2=423405&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
Wed Jul 19 01:51:27 2006
@@ -23,17 +23,14 @@
 
 # TOFIX: fix warning so we can use default HYCFLAGS
 # That is:
-# HYCFLAGS = $(HYCFLAGS) -I$(SHAREDSUB)\include \
-#            -I$(JPEG_DIR) -I..\..\lcmm\shared
+# HYCFLAGS = $(HYCFLAGS) -I$(SHAREDSUB)\include -I$(JPEG_DIR)
 HYCFLAGS = \
   -Ogityb1 -W3 -GF -Gs -MD -Zi -Zm400 \
   -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ -DWINVER=0x0400 \
   $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I. \
-  -I$(SHAREDSUB)\include -I$(JPEG_DIR) -I..\..\lcmm\shared
+  -I$(SHAREDSUB)\include -I$(JPEG_DIR)
 
-BUILDFILES = \
-  $(SHAREDSUB)JpegDecoder.obj \
-  ..\..\lcmm\shared\Exceptions.obj
+BUILDFILES = $(SHAREDSUB)JpegDecoder.obj
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile?rev=423405&r1=423404&r2=423405&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile
Wed Jul 19 01:51:27 2006
@@ -19,12 +19,10 @@
 
 CFLAGS += -fpic -I$(SHARED)common -I$(SHAREDSUB)/include -I$(LCMS_DIR)
 
-# TOFIX move Exceptions to common?
 BUILDFILES = \
   $(SHAREDSUB)/cmmerror.o \
   $(SHAREDSUB)/cmmio.o \
   $(SHAREDSUB)/cmmxforms.o \
-  $(SHAREDSUB)/Exceptions.o \
   $(SHAREDSUB)/NativeCMM.o \
   $(SHAREDSUB)/NativeImageFormat.o \
   liblcms.a

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeCMM.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeCMM.c?rev=423405&r1=423404&r2=423405&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeCMM.c
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeCMM.c
Wed Jul 19 01:51:27 2006
@@ -238,7 +238,7 @@
     if(xform != NULL) {
         cmsDeleteTransform(xform);
     } else
-        newNullPointerException(env, "Invalid ICC transform passed to CMM");
+        throwNPException(env, "Invalid ICC transform passed to CMM");
 }
 
 static long getScanlineStrideFromFormat(ImageFormat *fmt) {
@@ -494,4 +494,4 @@
   cmmCloseProfile(hPfGrey);
   free(pyccBuff);
 }
-*/
\ No newline at end of file
+*/

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeImageFormat.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeImageFormat.c?rev=423405&r1=423404&r2=423405&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeImageFormat.c
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeImageFormat.c
Wed Jul 19 01:51:27 2006
@@ -20,7 +20,7 @@
  */
 
 #include "NativeImageFormat.h"
-#include "Exceptions.h"
+#include "exceptions.h"
 
 /*
  * Class:     org_apache_harmony_awt_gl_color_NativeImageFormat
@@ -32,37 +32,37 @@
 
     clr_NIF_cmmFormatID = (*env)->GetFieldID(env, cls, "cmmFormat", "I");
     if(clr_NIF_cmmFormatID == NULL) {
-        newNullPointerException(env, "Unable to get field ID");
+        throwNPException(env, "Unable to get field ID");
     }
 
     clr_NIF_colsID = (*env)->GetFieldID(env, cls, "cols", "I");
     if(clr_NIF_colsID == NULL) {
-        newNullPointerException(env, "Unable to get field ID");
+        throwNPException(env, "Unable to get field ID");
     }
 
     clr_NIF_rowsID = (*env)->GetFieldID(env, cls, "rows", "I");
     if(clr_NIF_rowsID == NULL) {
-        newNullPointerException(env, "Unable to get field ID");
+        throwNPException(env, "Unable to get field ID");
     }
 
     clr_NIF_scanlineStrideID = (*env)->GetFieldID(env, cls, "scanlineStride", "I");
     if(clr_NIF_scanlineStrideID == NULL) {
-        newNullPointerException(env, "Unable to get field ID");
+        throwNPException(env, "Unable to get field ID");
     }
 
     clr_NIF_imageDataID = (*env)->GetFieldID(env, cls, "imageData", "Ljava/lang/Object;");
     if(clr_NIF_imageDataID == NULL) {
-        newNullPointerException(env, "Unable to get field ID");
+        throwNPException(env, "Unable to get field ID");
     }
 
     clr_NIF_dataOffsetID = (*env)->GetFieldID(env, cls, "dataOffset", "I");
     if(clr_NIF_dataOffsetID == NULL) {
-        newNullPointerException(env, "Unable to get field ID");
+        throwNPException(env, "Unable to get field ID");
     }
 
   clr_NIF_alphaOffsetID = (*env)->GetFieldID(env, cls, "alphaOffset", "I");
     if(clr_NIF_alphaOffsetID == NULL) {
-        newNullPointerException(env, "Unable to get field ID");
+        throwNPException(env, "Unable to get field ID");
     }
 }
 
@@ -82,7 +82,7 @@
     imft->imageData = (BYTE*) (*env)->GetPrimitiveArrayCritical(env, imft->jImageData,
0);
 
   if(imft->imageData == NULL) { // All is lost, we don't have C array
-      newNullPointerException(env, "Error while accessing java image data");
+      throwNPException(env, "Error while accessing java image data");
       // Free resources and stop further processing...
         releaseImageFormat(env, imft);
         return NULL;
@@ -100,4 +100,4 @@
 
     // Free memory
     free(imft);
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/cmmerror.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/cmmerror.c?rev=423405&r1=423404&r2=423405&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/cmmerror.c
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/cmmerror.c
Wed Jul 19 01:51:27 2006
@@ -25,5 +25,5 @@
  * Creates and throws CMMException
  */
 void newCMMException(JNIEnv *env, const char *message) {
-    newExceptionByName(env, "java/awt/color/CMMException", message);
+    throwNewExceptionByName(env, "java/awt/color/CMMException", message);
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/cmmerror.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/cmmerror.h?rev=423405&r1=423404&r2=423405&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/cmmerror.h
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/cmmerror.h
Wed Jul 19 01:51:27 2006
@@ -23,9 +23,9 @@
 #define _included_cmmerror
 
 #include "NativeCMM.h"
-#include "Exceptions.h"
+#include "exceptions.h"
 
 // Java exception
 void newCMMException(JNIEnv *env, const char *message);
 
-#endif // _included_cmmerror
\ No newline at end of file
+#endif // _included_cmmerror

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile?rev=423405&r1=423404&r2=423405&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile
Wed Jul 19 01:51:27 2006
@@ -34,7 +34,6 @@
   $(SHAREDSUB)cmmerror.obj \
   $(SHAREDSUB)cmmio.obj \
   $(SHAREDSUB)cmmxforms.obj \
-  $(SHAREDSUB)Exceptions.obj \
   $(SHAREDSUB)NativeCMM.obj \
   $(SHAREDSUB)NativeImageFormat.obj
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/LinuxNativeFont.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/LinuxNativeFont.c?rev=423405&r1=423404&r2=423405&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/LinuxNativeFont.c
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/LinuxNativeFont.c
Wed Jul 19 01:51:27 2006
@@ -86,7 +86,7 @@
     xftPattern = XftPatternCreate();
 
     if (!XftPatternAddBool (xftPattern, XFT_OUTLINE, FcTrue)){
-        newNullPointerException(env, "Outline value can't be added to XftPattern");
+        throwNPException(env, "Outline value can't be added to XftPattern");
     }
 
     /* Just need to add which fields you want to list */
@@ -101,7 +101,7 @@
     }
 
         if (!fs){
-        newNullPointerException(env, "Font list can't be created");
+        throwNPException(env, "Font list can't be created");
     } else  {
         numFamilies = fs->nfont;
         famList = (char** )malloc(numFamilies * sizeof(char *));
@@ -142,7 +142,7 @@
         }
         free(famList);
         
-        newNullPointerException(env, "Not enough memory to create families list");
+        throwNPException(env, "Not enough memory to create families list");
     }
 
     for (i = 0;i < numFamilies;i++){
@@ -301,35 +301,35 @@
     /* Xft part */
 
     if (dpy == NULL){
-        newNullPointerException(env, "Cannot connect to XServer");
+        throwNPException(env, "Cannot connect to XServer");
     }   
 
     /* Create pattern */
     pattern = XftPatternCreate();
 
     if (!XftPatternAddString (pattern, XFT_FAMILY, name)){
-        newNullPointerException(env, "Error during adding family name to XFTPattern structure");
+        throwNPException(env, "Error during adding family name to XFTPattern structure");
     }
 
     if (faceStyle && !XftPatternAddString (pattern, XFT_STYLE, faceStyle)){
-        newNullPointerException(env, "Error during adding style name to XFTPattern structure");
+        throwNPException(env, "Error during adding style name to XFTPattern structure");
     }
 
     if (!XftPatternAddInteger(pattern, XFT_SLANT, slant)){
-        newNullPointerException(env, "Error during adding font slant to XFTPattern structure");
+        throwNPException(env, "Error during adding font slant to XFTPattern structure");
     }
 
     if (!XftPatternAddInteger(pattern, XFT_WEIGHT, weight)){
-        newNullPointerException(env, "Error during adding font weight to XFTPattern structure");
+        throwNPException(env, "Error during adding font weight to XFTPattern structure");
     }
 
 /*  if (!XftPatternAddInteger(pattern, FC_WIDTH, FC_WIDTH_NORMAL)){
-        newNullPointerException(env, "Error during adding font width to XFTPattern structure");
+        throwNPException(env, "Error during adding font width to XFTPattern structure");
     }
 */
     /* We set antialias mode for simple text rendering without antialiasing */
     if (!XftPatternAddBool(pattern, XFT_ANTIALIAS, False)){
-        newNullPointerException(env, "Error during adding font antialias set to false to
XFTPattern structure");
+        throwNPException(env, "Error during adding font antialias set to false to XFTPattern
structure");
     }
 
     /* 
@@ -343,21 +343,21 @@
     fSize = (double)size / 96 * 72;
 
     if (!XftPatternAddDouble (pattern, XFT_SIZE, fSize)){
-        newNullPointerException(env, "Error during adding font size to XFTPattern structure");
+        throwNPException(env, "Error during adding font size to XFTPattern structure");
     }
 
 /*  if (!XftPatternAddBool (pattern, FC_HINTING, True)){
-        newNullPointerException(env, "Error during adding font hinting set to false to XFTPattern
structure");
+        throwNPException(env, "Error during adding font hinting set to false to XFTPattern
structure");
     }
 */
 
     if (!XftPatternAddBool (pattern, XFT_RENDER, True)){
-        newNullPointerException(env, "Error during adding font RENDER set to true to XFTPattern
structure");
+        throwNPException(env, "Error during adding font RENDER set to true to XFTPattern
structure");
     }
 
 
     if (!XftPatternAddBool (pattern, FC_AUTOHINT, True)){
-        newNullPointerException(env, "Error during adding font autohinting set to false to
XFTPattern structure");
+        throwNPException(env, "Error during adding font autohinting set to false to XFTPattern
structure");
     }
         
     if (pitch != 0){
@@ -368,7 +368,7 @@
         }
 
         if (!XftPatternAddInteger(pattern, XFT_SPACING, spacing)){
-            newNullPointerException(env, "Error during adding font spacing type to XFTPattern
structure");
+            throwNPException(env, "Error during adding font spacing type to XFTPattern structure");
         }
     }
                                                                    
@@ -486,7 +486,7 @@
     dpy = (Display *)(*env)->GetLongField(env, linuxFont, fid);
 
     if (dpy == NULL){
-        newNullPointerException(env, "Cannot connect to XServer");
+        throwNPException(env, "Cannot connect to XServer");
     }   
     
 
@@ -621,7 +621,7 @@
     char* family;   
 
         if (XftPatternGetString (xftFnt->pattern, XFT_FAMILY, 0, &family) != XftResultMatch){
-        newNullPointerException(env, "Can not get font family value");
+        throwNPException(env, "Can not get font family value");
                     
     }
 
@@ -749,7 +749,7 @@
     } else {
         err =  FT_Get_PS_Font_Info( face, &afont_info);
         if (err){
-            newNullPointerException(env, "Error in FT_Get_PS_Font_Info fucntion");
+            throwNPException(env, "Error in FT_Get_PS_Font_Info fucntion");
             XftUnlockFace(xftFnt);
             return italicAngle;
         }
@@ -798,7 +798,7 @@
     xftPattern = XftPatternCreate();
 
     if (!XftPatternAddBool (xftPattern, XFT_OUTLINE, FcTrue)){
-        newNullPointerException(env, "Outline value can't be added to XftPattern");
+        throwNPException(env, "Outline value can't be added to XftPattern");
     }
 
     /* Just need to add which fields you want to list */
@@ -813,7 +813,7 @@
     }
 
         if (!fs){
-        newNullPointerException(env, "Font list can't be created");
+        throwNPException(env, "Font list can't be created");
     } else  {
         numFonts = fs->nfont;
         fontList = (char** )malloc(numFonts * sizeof(char *));
@@ -822,7 +822,7 @@
         {
 
                 if (XftPatternGetString (fs->fonts[j], XFT_FAMILY, 0, &family) !=
XftResultMatch){
-                newNullPointerException(env, "Couldn't get font family name");
+                throwNPException(env, "Couldn't get font family name");
                                                 
             }
 
@@ -865,7 +865,7 @@
         }
         free(fontList);
         
-        newNullPointerException(env, "Not enough memory to create families list");
+        throwNPException(env, "Not enough memory to create families list");
     }
 
     for (i = 0;i < numFonts;i++){
@@ -910,7 +910,7 @@
         face = XftLockFace(xftFnt);
         units_per_EM = face->units_per_EM;
             if (units_per_EM == 0){
-            newNullPointerException(env, "Units per EM value is equals to zero");
+            throwNPException(env, "Units per EM value is equals to zero");
         }
         values[16] = units_per_EM;
         mltpl = (float)fontHeight / units_per_EM;
@@ -1174,7 +1174,7 @@
     XftFont *font = (XftFont *)fnt;
 
     if (dpy == NULL){
-        newNullPointerException(env, "Cannot connect to XServer");
+        throwNPException(env, "Cannot connect to XServer");
     }   
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile?rev=423405&r1=423404&r2=423405&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile
Wed Jul 19 01:51:27 2006
@@ -19,7 +19,7 @@
 	  -I/usr/X11R6/include -I/usr/include/freetype2 \
 	  -Iinclude # TOFIX move includes
 
-BUILDFILES = Exceptions.o LinuxNativeFont.o
+BUILDFILES = LinuxNativeFont.o
 
 MDLLIBFILES = \
 	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a
\

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile?rev=423405&r1=423404&r2=423405&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile
Wed Jul 19 01:51:27 2006
@@ -27,9 +27,7 @@
   /Iinclude /I..\..\gl\windows\include \
   -DUNICODE -D_UNICODE
 
-BUILDFILES = \
-  Exceptions.obj \
-  winFont.obj
+BUILDFILES = winFont.obj
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib gdi32.lib GdiPlus.lib advapi32.lib

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/winFont.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/winFont.cpp?rev=423405&r1=423404&r2=423405&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/winFont.cpp
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/winFont.cpp
Wed Jul 19 01:51:27 2006
@@ -30,7 +30,7 @@
 #include "winFont.h"
 #include "org_apache_harmony_awt_gl_font_NativeFont.h"
 #include "org_apache_harmony_awt_gl_font_WinGlyph.h"
-#include "Exceptions.h"
+#include "exceptions.h"
 
 static LCIDS lcidTable;
 static FontRecords fonts;           /* Cached system fonts data             */
@@ -364,7 +364,7 @@
     res = enumFamilies();
 
     if (res = FONTLIB_ERROR){
-        newNullPointerException(env, "Not enough memory to enumerate font family names list.");
+        throwNPException(env, "Not enough memory to enumerate font family names list.");
         return NULL;
     }
 
@@ -402,19 +402,19 @@
     res = enumFonts();
 
     if (res = FONTLIB_ERROR){
-        newNullPointerException(env, "Not enough memory to enumerate font names list.");
+        throwNPException(env, "Not enough memory to enumerate font names list.");
         return;
     }
 
     cls= env->FindClass("org/apache/harmony/awt/gl/font/NativeFont");
     if (cls == 0) {
-        newNullPointerException(env, "Can't find class NativeFont");
+        throwNPException(env, "Can't find class NativeFont");
         return;
     }
 
     mid=env->GetStaticMethodID(cls, "setArrays", "([I[I[I[Ljava/lang/String;)V");
     if (mid == 0) {
-        newNullPointerException(env, "Can't find method sendArrayResults");
+        throwNPException(env, "Can't find method sendArrayResults");
         return;
     }
 
@@ -434,7 +434,7 @@
 
 
     if ((indArr == NULL) || (typesArr == NULL) || (stylesArr == NULL)){
-        newNullPointerException(env, "Not enough memory to create font data arrays.");
+        throwNPException(env, "Not enough memory to create font data arrays.");
         return;
     }
 
@@ -596,7 +596,7 @@
     // Get number of unicode range pairs' bounds values 
     arrSize = GetUnicodeRanges(res, &pRanges);
     if (arrSize == -1){
-        newNullPointerException(env, "Error occured during getting an array of unicode ranges");
+        throwNPException(env, "Error occured during getting an array of unicode ranges");
 
         return (jlong)NULL;
     }
@@ -638,7 +638,7 @@
 
     size = GetGlyphIndices(hDC, sample, 1, gi, GGI_MARK_NONEXISTING_GLYPHS);
     if (size == GDI_ERROR){
-        newNullPointerException(env, "Error occured during getting char data in native code.");
+        throwNPException(env, "Error occured during getting char data in native code.");
         SelectObject(hDC, hOld);
         DeleteDC(hDC);
         return FALSE;
@@ -672,7 +672,7 @@
     size = GetOutlineTextMetrics(hDC, sizeof(outm), outm);
 
     if (size == 0 ){
-        newNullPointerException(env, "Error occured during getting text metrics in native
code.");
+        throwNPException(env, "Error occured during getting text metrics in native code.");
         SelectObject(hDC, hOld);
         DeleteDC(hDC);
         return NULL;
@@ -780,7 +780,7 @@
 
     size = GetOutlineTextMetrics(hDC, sizeof(outm), outm);
     if (size == 0 ){
-        newNullPointerException(env, "Error occured during getting text outline metrics in
native code.");
+        throwNPException(env, "Error occured during getting text outline metrics in native
code.");
         SelectObject(hDC, hOld);
         DeleteDC(hDC);
         return 0;
@@ -813,7 +813,7 @@
 
     size = GetTextMetrics(hDC, &tm);
     if (size == 0 ){
-        newNullPointerException(env, "Error occured during getting text metrics in native
code.");
+        throwNPException(env, "Error occured during getting text metrics in native code.");
         SelectObject(hDC, hOld);
         DeleteDC(hDC);
         return 0;
@@ -937,7 +937,7 @@
     // Getting current size of Font
     size = GetOutlineTextMetrics(hDC, sizeof(outm), outm);
     if (size == 0 ){
-        newNullPointerException(env, "Error occured during getting text outline metrics in
native code.");
+        throwNPException(env, "Error occured during getting text outline metrics in native
code.");
         SelectObject(hDC, hOld);
         DeleteDC(hDC);
         return NULL;
@@ -973,7 +973,7 @@
 
     size = GetOutlineTextMetrics(hDC, sizeof(outm), outm);
     if (size == 0 ){
-        newNullPointerException(env, "Error occured during getting text outline metrics in
native code.");
+        throwNPException(env, "Error occured during getting text outline metrics in native
code.");
 
         SelectObject(hDC, hOld);
         DeleteObject(hFontEM);
@@ -1040,7 +1040,7 @@
     // Getting current height of given Font
     size = GetOutlineTextMetrics(hDC, sizeof(outm), outm);
     if (size == 0 ){
-        newNullPointerException(env, "Error occured during getting text outline metrics in
native code.");
+        throwNPException(env, "Error occured during getting text outline metrics in native
code.");
         SelectObject(hDC, hOld);
         DeleteDC(hDC);
         return NULL;
@@ -1056,7 +1056,7 @@
 
     res = GetCharABCWidths(hDC, chr, chr, abcWidth);
     if (res == 0 ){
-        newNullPointerException(env, "Error occured during getting char widths in native
code.");
+        throwNPException(env, "Error occured during getting char widths in native code.");
         SelectObject(hDC, hOld);
         DeleteDC(hDC);
         return NULL;
@@ -1068,7 +1068,7 @@
 
     res = GetGlyphOutline(hDC, chr, GGO_METRICS, & g_metrics, 0, NULL, & mat2);
     if (res == GDI_ERROR ){
-        newNullPointerException(env, "Error occured during getting glyph outline in native
code.");
+        throwNPException(env, "Error occured during getting glyph outline in native code.");
         SelectObject(hDC, hOld);
         DeleteDC(hDC);
         return NULL;
@@ -1088,7 +1088,7 @@
 
     size = GetGlyphOutline(hDC, chr, GGO_METRICS, & g_metrics, 0, NULL, & mat2);
     if (size==GDI_ERROR){
-        newNullPointerException(env, "Error occured during getting glyph outline metrics
in native code.");
+        throwNPException(env, "Error occured during getting glyph outline metrics in native
code.");
         SelectObject(hDC, hOld);
         DeleteObject(hFontEM);
         DeleteDC(hDC);
@@ -1143,7 +1143,7 @@
 
     size = GetGlyphOutline(hDC, chr, GGO_METRICS, & g_metrics, 0, NULL, & mat2);
     if (size==GDI_ERROR){
-        newNullPointerException(env, "Error occured during getting glyph outline in native
code.");
+        throwNPException(env, "Error occured during getting glyph outline in native code.");
         SelectObject(hDC, hOld);
         DeleteDC(hDC);
         return NULL;
@@ -1194,7 +1194,7 @@
 
     size = GetGlyphIndices(hDC, chars, leng, gi, 0);//GGI_MARK_NONEXISTING_GLYPHS);
     if (size == GDI_ERROR){
-        newNullPointerException(env, "Error occured during getting glyph indices in native
code.");
+        throwNPException(env, "Error occured during getting glyph indices in native code.");
         free(gi);
         SelectObject(hDC, hOld);
         DeleteDC(hDC);
@@ -1282,7 +1282,7 @@
     bitsSize = GetGlyphOutline(hDC, uChar, GGO_BITMAP, & gMetrics, 0, NULL, &mat2);
 
     if (bitsSize==GDI_ERROR){
-        newNullPointerException(env, "Error occured during getting glyph outline in native
code.");
+        throwNPException(env, "Error occured during getting glyph outline in native code.");
         SelectObject(hDC, hOld);
         DeleteDC(hDC);
         return NULL;
@@ -1295,7 +1295,7 @@
     bitsSize = GetGlyphOutline(hDC, uChar, GGO_BITMAP, & gMetrics, bitsSize, pBits, &mat2);
 
     if ( bitsSize==GDI_ERROR){
-        newNullPointerException(env, "Error occured during getting glyph outline in native
code.");
+        throwNPException(env, "Error occured during getting glyph outline in native code.");
         SelectObject(hDC, hOld);
         DeleteDC(hDC);
         free(pBits);
@@ -1339,7 +1339,7 @@
 
     size = GetGlyphIndices(hDC, uChr, 1, gi, 0);//GGI_MARK_NONEXISTING_GLYPHS);
     if (size==GDI_ERROR){
-        newNullPointerException(env, "Error occured during getting glyph indices in native
code.");
+        throwNPException(env, "Error occured during getting glyph indices in native code.");
         SelectObject(hDC, hOld);
         DeleteDC(hDC);
         return 0;
@@ -1382,7 +1382,7 @@
     DeleteDC(hDC);
     
     if (size==GDI_ERROR){
-        newNullPointerException(env, "GDI :: GetGlyphOutline Error.");
+        throwNPException(env, "GDI :: GetGlyphOutline Error.");
         return 0;
     }
     return size;



Mime
View raw message