diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2010-10-30 20:01:16 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2010-10-30 20:01:16 +0000 |
| commit | f1f1d8ed4239898a76e421d68fdd97459b125419 (patch) | |
| tree | 1a6228d4b3f4bdab0bf98c4dee26f8944d833702 | |
| parent | 8e30c66a9245fa1e367f8bb772268721549e4987 (diff) | |
STR 2382: Fixed compile errors when HAVE_LIBJPEG was not defined
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7780 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | ide/Xcode3/config.h | 2 | ||||
| -rw-r--r-- | src/Fl_JPEG_Image.cxx | 3 |
3 files changed, 5 insertions, 2 deletions
@@ -1,5 +1,7 @@ CHANGES IN FLTK 1.3.0 + - Fixed compile errors when HAVE_LIBJPEG was not defined + (STR #2382) - Fixed special handling for ISO back-tab keycode (STR #2369) - Fixed wrong relative path (STR #2384) - Fixed static allocation in Fl_Tabs (STR #2370) diff --git a/ide/Xcode3/config.h b/ide/Xcode3/config.h index 51b5fad4c..1858c3b35 100644 --- a/ide/Xcode3/config.h +++ b/ide/Xcode3/config.h @@ -49,4 +49,4 @@ /* * End of "$Id: ide_xcode.cxx 7504 2010-04-14 20:17:44Z matt $". - */
\ No newline at end of file + */ diff --git a/src/Fl_JPEG_Image.cxx b/src/Fl_JPEG_Image.cxx index c4e450c64..054027b81 100644 --- a/src/Fl_JPEG_Image.cxx +++ b/src/Fl_JPEG_Image.cxx @@ -205,7 +205,7 @@ Fl_JPEG_Image::Fl_JPEG_Image(const char *filename) // I - File to load // JOCTET * next_output_byte; /* => next byte to write in buffer */ // size_t free_in_buffer; /* # of byte spaces remaining in buffer */ - +#ifdef HAVE_LIBJPEG typedef struct { struct jpeg_source_mgr pub; const unsigned char *data, *s; @@ -261,6 +261,7 @@ static void jpeg_mem_src(j_decompress_ptr cinfo, const unsigned char *data) src->data = data; src->s = data; } +#endif // HAVE_LIBJPEG /** |