Author: matt
Date: 2010-10-30 13:01:16 -0700 (Sat, 30 Oct 2010)
New Revision: 7780
Log:
STR 2382: Fixed compile errors when HAVE_LIBJPEG was not defined
Modified:
branches/branch-1.3/CHANGES
branches/branch-1.3/ide/Xcode3/config.h
branches/branch-1.3/src/Fl_JPEG_Image.cxx
Modified: branches/branch-1.3/CHANGES
===================================================================
--- branches/branch-1.3/CHANGES 2010-10-30 19:56:20 UTC (rev 7779)
+++ branches/branch-1.3/CHANGES 2010-10-30 20:01:16 UTC (rev 7780)
@@ -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)
Modified: branches/branch-1.3/ide/Xcode3/config.h
===================================================================
--- branches/branch-1.3/ide/Xcode3/config.h 2010-10-30 19:56:20 UTC (rev
7779)
+++ branches/branch-1.3/ide/Xcode3/config.h 2010-10-30 20:01:16 UTC (rev
7780)
@@ -49,4 +49,4 @@
/*
* End of "$Id: ide_xcode.cxx 7504 2010-04-14 20:17:44Z matt $".
- */
\ No newline at end of file
+ */
Modified: branches/branch-1.3/src/Fl_JPEG_Image.cxx
===================================================================
--- branches/branch-1.3/src/Fl_JPEG_Image.cxx 2010-10-30 19:56:20 UTC (rev
7779)
+++ branches/branch-1.3/src/Fl_JPEG_Image.cxx 2010-10-30 20:01:16 UTC (rev
7780)
@@ -205,7 +205,7 @@
// 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 @@
src->data = data;
src->s = data;
}
+#endif // HAVE_LIBJPEG
/**
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
