2004/01/12 06:38:31

[org.ibex.core.git] / src / org / xwt / plat / GCJ.cc

diff --git a/src/org/xwt/plat/GCJ.cc b/src/org/xwt/plat/GCJ.cc
index a70c952..b140c60 100644 (file)
--- a/src/org/xwt/plat/GCJ.cc
+++ b/src/org/xwt/plat/GCJ.cc
@@ -118,7 +118,7 @@ void org::xwt::plat::GCJ::_decodeJPEG(java::io::InputStream* is, org::xwt::Pictu
         // FEATURE - we should handle errors better than this
         char msgbuf[JMSG_LENGTH_MAX];
         (jerr.pub.format_message)((j_common_ptr)&cinfo, msgbuf);
-        Log::log(&GCJ::class$,JvNewStringLatin1(msgbuf));
+        Log::info(&GCJ::class$,JvNewStringLatin1(msgbuf));
         jpeg_destroy_decompress(&cinfo);
         return;
     }
@@ -134,17 +134,17 @@ void org::xwt::plat::GCJ::_decodeJPEG(java::io::InputStream* is, org::xwt::Pictu
     
     p->width = cinfo.output_width;
     p->height = cinfo.output_height;
-    p->data = JvNewIntArray(width * height);
+    p->data = JvNewIntArray(p->width * p->height);
     
     while (cinfo.output_scanline < cinfo.output_height) {
-        JSAMPLE *dest = (JSAMPLE*) (elements(data) + cinfo.output_scanline * width);
+        JSAMPLE *dest = (JSAMPLE*) (elements(p->data) + cinfo.output_scanline * p->width);
         jpeg_read_scanlines(&cinfo,&dest,1);
     }
     jpeg_finish_decompress(&cinfo);
     jpeg_destroy_decompress(&cinfo);
     
-    for(int i=0;i<data->length;i++)
-        elements(data)[i] |= 0xff000000; // alpha channel
+    for(int i=0;i<p->data->length;i++)
+        elements(p->data)[i] |= 0xff000000; // alpha channel
 }
 
 // C++ new/delete operators (JvMalloc never fails)