Initialize longjmp target before calling jpeg_create_decompress

[libs/gui.git] / source / graphics / jpeg / jpegloader.cpp

diff --git a/source/graphics/jpeg/jpegloader.cpp b/source/graphics/jpeg/jpegloader.cpp
index 415e79f95927959c6d667233e7734e5ed657d226..39866c18aaabaee7351f6fb2f419e8e3d4ab47ed 100644 (file)
--- a/source/graphics/jpeg/jpegloader.cpp
+++ b/source/graphics/jpeg/jpegloader.cpp
@@ -40,12 +40,12 @@ void init_source(j_decompress_ptr jpeg)
        src->bytes_in_buffer = 0;
 }
 
-int fill_input_buffer(j_decompress_ptr jpeg)
+boolean fill_input_buffer(j_decompress_ptr jpeg)
 {
        SourceManager *src = reinterpret_cast<SourceManager *>(jpeg->src);
        src->next_input_byte = src->buffer;
        src->bytes_in_buffer = src->io->read(reinterpret_cast<char *>(src->buffer), sizeof(src->buffer));
-       return true;
+       return TRUE;
 }
 
 void skip_input_data(j_decompress_ptr jpeg, long count)
@@ -61,7 +61,7 @@ void skip_input_data(j_decompress_ptr jpeg, long count)
        }
        else
        {
-               src->io->seek(count, Msp::IO::S_CUR);
+               src->io->seek(count-src->bytes_in_buffer, Msp::IO::S_CUR);
                src->bytes_in_buffer = 0;
        }
 }
@@ -84,8 +84,6 @@ struct JpegLoader::Private
 };
 
 
-ImageLoader::Register<JpegLoader> JpegLoader::reg;
-
 JpegLoader::JpegLoader(IO::Seekable &io):
        priv(new Private)
 {
@@ -93,6 +91,9 @@ JpegLoader::JpegLoader(IO::Seekable &io):
        priv->err_mgr.error_exit = &error_exit;
        priv->err_mgr.emit_message = &emit_message;
 
+       if(setjmp(priv->err_mgr.jmp))
+               throw runtime_error("error creating jpeg decompressor: "+priv->err_mgr.message);
+
        jpeg_create_decompress(&priv->jpeg);
 
        priv->jpeg.src = &priv->src_mgr;
@@ -123,7 +124,7 @@ void JpegLoader::load(Image::Data &data)
        if(setjmp(priv->err_mgr.jmp))
                throw bad_image_data(priv->err_mgr.message);
 
-       jpeg_read_header(&priv->jpeg, true);
+       jpeg_read_header(&priv->jpeg, TRUE);
        priv->jpeg.out_color_space = JCS_RGB;
        jpeg_start_decompress(&priv->jpeg);