diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-09-15 23:52:38 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-09-15 23:52:38 +0000 |
| commit | db0939a599520406e94fda2ffbec5ce1c3c40a04 (patch) | |
| tree | cca9f926cb20e371a9585f895fb4876b78d0bdd7 /src | |
| parent | aed1a916133b46285e4bad4116ddaa50a93a367b (diff) | |
Add error handlers to JPEG and PNG image classes so the corresponding
libraries don't exit the app with a bad file (STR #168)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3105 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_JPEG_Image.cxx | 17 | ||||
| -rw-r--r-- | src/Fl_PNG_Image.cxx | 11 |
2 files changed, 24 insertions, 4 deletions
diff --git a/src/Fl_JPEG_Image.cxx b/src/Fl_JPEG_Image.cxx index 2898288ef..1752b1c6e 100644 --- a/src/Fl_JPEG_Image.cxx +++ b/src/Fl_JPEG_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_JPEG_Image.cxx,v 1.1.2.7 2003/01/30 21:42:02 easysw Exp $" +// "$Id: Fl_JPEG_Image.cxx,v 1.1.2.8 2003/09/15 23:52:37 easysw Exp $" // // Fl_JPEG_Image routines. // @@ -56,6 +56,17 @@ extern "C" // +// Error handler for JPEG files... +// + +static void +jpeg_error_handler(j_common_ptr) +{ + return; +} + + +// // 'Fl_JPEG_Image::Fl_JPEG_Image()' - Load a JPEG image file. // @@ -71,6 +82,8 @@ Fl_JPEG_Image::Fl_JPEG_Image(const char *jpeg) // I - File to load if ((fp = fopen(jpeg, "rb")) == NULL) return; cinfo.err = jpeg_std_error(&jerr); + jerr.error_exit = jpeg_error_handler; + jpeg_create_decompress(&cinfo); jpeg_stdio_src(&cinfo, fp); jpeg_read_header(&cinfo, 1); @@ -107,5 +120,5 @@ Fl_JPEG_Image::Fl_JPEG_Image(const char *jpeg) // I - File to load } // -// End of "$Id: Fl_JPEG_Image.cxx,v 1.1.2.7 2003/01/30 21:42:02 easysw Exp $". +// End of "$Id: Fl_JPEG_Image.cxx,v 1.1.2.8 2003/09/15 23:52:37 easysw Exp $". // diff --git a/src/Fl_PNG_Image.cxx b/src/Fl_PNG_Image.cxx index b5de742a5..d88a5402a 100644 --- a/src/Fl_PNG_Image.cxx +++ b/src/Fl_PNG_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_PNG_Image.cxx,v 1.1.2.9 2003/01/30 21:42:23 easysw Exp $" +// "$Id: Fl_PNG_Image.cxx,v 1.1.2.10 2003/09/15 23:52:38 easysw Exp $" // // Fl_PNG_Image routines. // @@ -32,6 +32,7 @@ // Include necessary header files... // +#include <FL/Fl.H> #include <FL/Fl_PNG_Image.H> #include <config.h> #include <stdio.h> @@ -72,6 +73,12 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read pp = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); info = png_create_info_struct(pp); + if (setjmp(pp->jmpbuf)) + { + Fl::warning("PNG file \"%s\" contains errors!\n", png); + return; + } + // Initialize the PNG read "engine"... png_init_io(pp, fp); @@ -132,5 +139,5 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read // -// End of "$Id: Fl_PNG_Image.cxx,v 1.1.2.9 2003/01/30 21:42:23 easysw Exp $". +// End of "$Id: Fl_PNG_Image.cxx,v 1.1.2.10 2003/09/15 23:52:38 easysw Exp $". // |