X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FGCJ.cc;h=5c355d36850f9cfbf3819ffbb92c14b7ccad1d3a;hb=de378041d5ca2aca1a2b5a31ef15ae90a86c977f;hp=c1333e49f26fa1b75aa0f80ee2db1075f83967e3;hpb=315e4f3422651f74f312e38493b58896306de2a8;p=org.ibex.core.git diff --git a/src/org/xwt/plat/GCJ.cc b/src/org/xwt/plat/GCJ.cc index c1333e4..5c355d3 100644 --- a/src/org/xwt/plat/GCJ.cc +++ b/src/org/xwt/plat/GCJ.cc @@ -5,106 +5,151 @@ #include #include extern "C" { + +// hack for broken Solaris headers +#define _WCHAR_T + #include #include #include #include "jpeglib.h" } +#include +#include #include #include #include #include #include -#include +#include +#ifdef TRUE +#undef TRUE +#endif +#define TRUE 1 +using org::xwt::util::Log; +// builtin.xwar ///////////////////////////////////////////////////////// + +extern unsigned char builtin_bytes[]; +extern int builtin_length; + +java::io::InputStream* org::xwt::plat::GCJ::_getBuiltinInputStream() { + jbyteArray ret = JvNewByteArray(builtin_length); + memcpy(elements(ret), builtin_bytes, builtin_length); + return new java::io::ByteArrayInputStream(ret); +} -// JPEG //////////////////////////////////////////////////////////////// -#define INPUT_BUF_SIZE (1024 * 16) + +// JPEG //////////////////////////////////////////////////////////////// typedef struct { struct jpeg_source_mgr pub; - org::xwt::plat::GCJ$JPEG* myself; -} source_manager; + java::io::InputStream *is; + jbyteArray buf; +} my_source_mgr_t; -void jpeg_error_handler (j_common_ptr cinfo) { - jstring message = JvNewStringLatin1(cinfo->err->jpeg_message_table[cinfo->err->msg_code]); - throw new java::lang::RuntimeException(message); +typedef struct { + struct jpeg_error_mgr pub; + jmp_buf setjmp_buffer; +} my_error_mgr_t; + +static void error_exit (j_common_ptr cinfo) { + my_error_mgr_t *myerr = (my_error_mgr_t*) cinfo->err; + longjmp(myerr->setjmp_buffer,1); } -void term_source (j_decompress_ptr cinfo) { } -void init_source (j_decompress_ptr cinfo) { } +static void term_source (j_decompress_ptr cinfo) { } +static void init_source (j_decompress_ptr cinfo) { } boolean fill_input_buffer (j_decompress_ptr cinfo) { - source_manager* src = (source_manager*)cinfo->src; - jint nbytes = src->myself->is->read(src->myself->buffer, 0, INPUT_BUF_SIZE); - if (nbytes <= 0) { - // the JPEG library specifically suggests padding the end with EOF markers - elements(src->myself->buffer)[0] = (jbyte)0xFF; - elements(src->myself->buffer)[1] = (jbyte)JPEG_EOI; - nbytes = 2; - } - src->pub.next_input_byte = (JOCTET*)elements(src->myself->buffer); - src->pub.bytes_in_buffer = nbytes; - return 1; + my_source_mgr_t* src = (my_source_mgr_t*) cinfo->src; + JOCTET *p = (JOCTET*)elements(src->buf); + jint n; + try { + n = src->is->read(src->buf, 0, src->buf->length); + } catch(java::lang::Throwable *e) { + n = -1; + } + + src->pub.next_input_byte = p; + + if (n <= 0) { + // the JPEG library specifically suggests padding the end with EOF markers + p[0] = 0xff; + p[1] = JPEG_EOI; + src->pub.bytes_in_buffer = 2; + } else { + src->pub.bytes_in_buffer = n; + } + return 1; } void skip_input_data (j_decompress_ptr cinfo, long num_bytes) { - source_manager* src = (source_manager*)cinfo->src; - if (num_bytes > 0) { - while (num_bytes > (long) src->pub.bytes_in_buffer) { - num_bytes -= (long) src->pub.bytes_in_buffer; - (void) fill_input_buffer(cinfo); + my_source_mgr_t* src = (my_source_mgr_t*) cinfo->src; + + if (num_bytes <= 0) return; + + while (num_bytes > src->pub.bytes_in_buffer) { + num_bytes -= src->pub.bytes_in_buffer; + fill_input_buffer(cinfo); } - src->pub.next_input_byte += (size_t) num_bytes; - src->pub.bytes_in_buffer -= (size_t) num_bytes; - } + src->pub.next_input_byte += num_bytes; + src->pub.bytes_in_buffer -= num_bytes; } -void org::xwt::plat::GCJ$JPEG::nativeDecompress() { +void org::xwt::plat::GCJ::_decodeJPEG(java::io::InputStream* is, org::xwt::Picture* p) { struct jpeg_decompress_struct cinfo; - - // set up our error handler - struct jpeg_error_mgr error_handler; - cinfo.err = jpeg_std_error(&error_handler); - error_handler.error_exit = &jpeg_error_handler; + my_error_mgr_t jerr; + my_source_mgr_t src; - jpeg_create_decompress(&cinfo); - try { - source_manager src; - buffer = JvNewByteArray(INPUT_BUF_SIZE); - src.pub.init_source = init_source; - src.pub.fill_input_buffer = fill_input_buffer; - src.pub.skip_input_data = skip_input_data; - src.pub.resync_to_restart = jpeg_resync_to_restart; - src.pub.term_source = term_source; - src.myself = this; - src.pub.next_input_byte = (JOCTET*)elements(buffer); - src.pub.bytes_in_buffer = 0; - cinfo.src = (jpeg_source_mgr*)&src; - - jpeg_read_header(&cinfo, 1); - jpeg_start_decompress(&cinfo); - width = cinfo.output_width; - height = cinfo.output_height; - data = JvNewIntArray(width * height); - - while (cinfo.output_scanline < cinfo.output_height) { - JSAMPLE* dest = (JSAMPLE*)(elements(data) + cinfo.output_scanline * width); - jpeg_read_scanlines(&cinfo, &dest, 1); - } - - jpeg_finish_decompress(&cinfo); - - // fill in the alpha components - for(int i=0; ilength; i++) - elements(data)[i] |= (jint)0xff000000; - - } catch (java::lang::Throwable* t) { + src.is = is; + src.buf = JvNewByteArray(16384); + + src.pub.init_source = init_source; + src.pub.fill_input_buffer = fill_input_buffer; + src.pub.skip_input_data = skip_input_data; + src.pub.resync_to_restart = jpeg_resync_to_restart; + src.pub.term_source = term_source; + src.pub.next_input_byte = NULL; + src.pub.bytes_in_buffer = 0; + + if (setjmp(jerr.setjmp_buffer)) { + // FEATURE - we should handle errors better than this + char msgbuf[JMSG_LENGTH_MAX]; + (jerr.pub.format_message)((j_common_ptr)&cinfo, msgbuf); + Log::info(&GCJ::class$,JvNewStringLatin1(msgbuf)); jpeg_destroy_decompress(&cinfo); - throw t; + return; } + + jpeg_create_decompress(&cinfo); + + cinfo.src = &src.pub; + cinfo.err = jpeg_std_error(&jerr.pub); + jerr.pub.error_exit = error_exit; + + jpeg_read_header(&cinfo,TRUE); + jpeg_start_decompress(&cinfo); + + p->width = cinfo.output_width; + p->height = cinfo.output_height; + p->data = JvNewIntArray(p->width * p->height); + + while (cinfo.output_scanline < cinfo.output_height) { + 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;idata->length;i++) + elements(p->data)[i] |= 0xff000000; // alpha channel } +// C++ new/delete operators (JvMalloc never fails) +void* operator new(size_t size) { return JvMalloc(size); } +void* operator new[](size_t size) { return JvMalloc(size);} +void operator delete(void *p) { JvFree(p); } +void operator delete[](void *p) { JvFree(p); }