| |
Author: bgbnbigben
Date: 2011-08-28 02:39:18 -0700 (Sun, 28 Aug 2011)
New Revision: 9018
Log:
Fixed a bunch of compile errors caused (most likely) by the "great shuffle"
Modified:
branches/branch-3.0/include/fltk3/all.h
branches/branch-3.0/include/fltk3/names.h
branches/branch-3.0/src/fltk3/xutf8/keysym2Ucs.c
branches/branch-3.0/src/fltk3/xutf8/utf8Input.c
branches/branch-3.0/src/fltk3/xutf8/utf8Utils.c
branches/branch-3.0/src/fltk3/xutf8/utf8Wrap.c
branches/branch-3.0/src/fltk3jpeg/jaricom.c
branches/branch-3.0/src/fltk3jpeg/jcapimin.c
branches/branch-3.0/src/fltk3jpeg/jcapistd.c
branches/branch-3.0/src/fltk3jpeg/jcarith.c
branches/branch-3.0/src/fltk3jpeg/jccoefct.c
branches/branch-3.0/src/fltk3jpeg/jccolor.c
branches/branch-3.0/src/fltk3jpeg/jcdctmgr.c
branches/branch-3.0/src/fltk3jpeg/jchuff.c
branches/branch-3.0/src/fltk3jpeg/jcinit.c
branches/branch-3.0/src/fltk3jpeg/jcmainct.c
branches/branch-3.0/src/fltk3jpeg/jcmarker.c
branches/branch-3.0/src/fltk3jpeg/jcmaster.c
branches/branch-3.0/src/fltk3jpeg/jcomapi.c
branches/branch-3.0/src/fltk3jpeg/jcparam.c
branches/branch-3.0/src/fltk3jpeg/jcprepct.c
branches/branch-3.0/src/fltk3jpeg/jcsample.c
branches/branch-3.0/src/fltk3jpeg/jctrans.c
branches/branch-3.0/src/fltk3jpeg/jdapimin.c
branches/branch-3.0/src/fltk3jpeg/jdapistd.c
branches/branch-3.0/src/fltk3jpeg/jdarith.c
branches/branch-3.0/src/fltk3jpeg/jdatadst.c
branches/branch-3.0/src/fltk3jpeg/jdatasrc.c
branches/branch-3.0/src/fltk3jpeg/jdcoefct.c
branches/branch-3.0/src/fltk3jpeg/jdcolor.c
branches/branch-3.0/src/fltk3jpeg/jddctmgr.c
branches/branch-3.0/src/fltk3jpeg/jdhuff.c
branches/branch-3.0/src/fltk3jpeg/jdinput.c
branches/branch-3.0/src/fltk3jpeg/jdmainct.c
branches/branch-3.0/src/fltk3jpeg/jdmarker.c
branches/branch-3.0/src/fltk3jpeg/jdmaster.c
branches/branch-3.0/src/fltk3jpeg/jdmerge.c
branches/branch-3.0/src/fltk3jpeg/jdpostct.c
branches/branch-3.0/src/fltk3jpeg/jdsample.c
branches/branch-3.0/src/fltk3jpeg/jdtrans.c
branches/branch-3.0/src/fltk3jpeg/jerror.c
branches/branch-3.0/src/fltk3jpeg/jfdctflt.c
branches/branch-3.0/src/fltk3jpeg/jfdctfst.c
branches/branch-3.0/src/fltk3jpeg/jfdctint.c
branches/branch-3.0/src/fltk3jpeg/jidctflt.c
branches/branch-3.0/src/fltk3jpeg/jidctfst.c
branches/branch-3.0/src/fltk3jpeg/jidctint.c
branches/branch-3.0/src/fltk3jpeg/jmemmgr.c
branches/branch-3.0/src/fltk3jpeg/jmemnobs.c
branches/branch-3.0/src/fltk3jpeg/jquant1.c
branches/branch-3.0/src/fltk3jpeg/jquant2.c
branches/branch-3.0/src/fltk3jpeg/jutils.c
branches/branch-3.0/src/fltk3png/png.c
branches/branch-3.0/src/fltk3png/pngerror.c
branches/branch-3.0/src/fltk3png/pngget.c
branches/branch-3.0/src/fltk3png/pngmem.c
branches/branch-3.0/src/fltk3png/pngpread.c
branches/branch-3.0/src/fltk3png/pngread.c
branches/branch-3.0/src/fltk3png/pngrio.c
branches/branch-3.0/src/fltk3png/pngrtran.c
branches/branch-3.0/src/fltk3png/pngrutil.c
branches/branch-3.0/src/fltk3png/pngset.c
branches/branch-3.0/src/fltk3png/pngtrans.c
branches/branch-3.0/src/fltk3png/pngwio.c
branches/branch-3.0/src/fltk3png/pngwrite.c
branches/branch-3.0/src/fltk3png/pngwtran.c
branches/branch-3.0/src/fltk3png/pngwutil.c
branches/branch-3.0/src/fltk3zlib/adler32.c
branches/branch-3.0/src/fltk3zlib/crc32.c
branches/branch-3.0/src/fltk3zlib/deflate.c
branches/branch-3.0/src/fltk3zlib/gzclose.c
branches/branch-3.0/src/fltk3zlib/gzlib.c
branches/branch-3.0/src/fltk3zlib/gzread.c
branches/branch-3.0/src/fltk3zlib/gzwrite.c
branches/branch-3.0/src/fltk3zlib/infback.c
branches/branch-3.0/src/fltk3zlib/inffast.c
branches/branch-3.0/src/fltk3zlib/inflate.c
branches/branch-3.0/src/fltk3zlib/inftrees.c
branches/branch-3.0/src/fltk3zlib/trees.c
branches/branch-3.0/src/fltk3zlib/zutil.c
Modified: branches/branch-3.0/include/fltk3/all.h
===================================================================
--- branches/branch-3.0/include/fltk3/all.h 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/include/fltk3/all.h 2011-08-28 09:39:18 UTC (rev 9018)
@@ -30,7 +30,7 @@
#include "x.h"
#include "Adjuster.h"
-#include "BMPImage.h"
+// #include "BMPImage.h"
#include "Bitmap.h"
#include "Box.h"
#include "Browser.h"
@@ -56,9 +56,9 @@
#include "FillDial.h"
#include "FillSlider.h"
#include "FloatInput.h"
-#include "GIFImage.h"
+// #include "GIFImage.h"
#include "Group.h"
-#include "HelpDialog.h"
+// #include "HelpDialog.h"
#include "HelpView.h"
#include "HoldBrowser.h"
#include "HorFillSlider.h"
@@ -70,7 +70,7 @@
#include "InputChoice.h"
#include "Input_.h"
#include "IntInput.h"
-#include "JPEGImage.h"
+// #include "JPEGImage.h"
#include "LightButton.h"
#include "LineDial.h"
#include "Menu.h"
Modified: branches/branch-3.0/include/fltk3/names.h
===================================================================
--- branches/branch-3.0/include/fltk3/names.h 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/include/fltk3/names.h 2011-08-28 09:39:18 UTC (rev 9018)
@@ -94,25 +94,27 @@
}
\endcode
*/
-const char * const fltk3::fontnames[] =
-{
- "fltk3::HELVETICA",
- "fltk3::HELVETICA_BOLD",
- "fltk3::HELVETICA_ITALIC",
- "fltk3::HELVETICA_BOLD_ITALIC",
- "fltk3::COURIER",
- "fltk3::COURIER_BOLD",
- "fltk3::COURIER_ITALIC",
- "fltk3::COURIER_BOLD_ITALIC",
- "fltk3::TIMES",
- "fltk3::TIMES_BOLD",
- "fltk3::TIMES_ITALIC",
- "fltk3::TIMES_BOLD_ITALIC",
- "fltk3::SYMBOL",
- "fltk3::SCREEN",
- "fltk3::SCREEN_BOLD",
- "fltk3::ZAPF_DINGBATS",
-};
+namespace fltk3 {
+ const char * const fontnames[] =
+ {
+ "fltk3::HELVETICA",
+ "fltk3::HELVETICA_BOLD",
+ "fltk3::HELVETICA_ITALIC",
+ "fltk3::HELVETICA_BOLD_ITALIC",
+ "fltk3::COURIER",
+ "fltk3::COURIER_BOLD",
+ "fltk3::COURIER_ITALIC",
+ "fltk3::COURIER_BOLD_ITALIC",
+ "fltk3::TIMES",
+ "fltk3::TIMES_BOLD",
+ "fltk3::TIMES_ITALIC",
+ "fltk3::TIMES_BOLD_ITALIC",
+ "fltk3::SYMBOL",
+ "fltk3::SCREEN",
+ "fltk3::SCREEN_BOLD",
+ "fltk3::ZAPF_DINGBATS",
+ };
+}
/** @} */
Modified: branches/branch-3.0/src/fltk3/xutf8/keysym2Ucs.c
===================================================================
--- branches/branch-3.0/src/fltk3/xutf8/keysym2Ucs.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3/xutf8/keysym2Ucs.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -27,7 +27,7 @@
#if !defined(WIN32) && !defined(__APPLE__)
-#include "../../include/fltk3/Xutf8.h"
+#include "fltk3/Xutf8.h"
#include "imKStoUCS.c"
long XKeysymToUcs(KeySym keysym) {
Modified: branches/branch-3.0/src/fltk3/xutf8/utf8Input.c
===================================================================
--- branches/branch-3.0/src/fltk3/xutf8/utf8Input.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3/xutf8/utf8Input.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -26,7 +26,7 @@
#if !defined(WIN32) && !defined(__APPLE__)
#include <config.h>
-#include "../../include/fltk3/Xutf8.h"
+#include "fltk3/Xutf8.h"
#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
Modified: branches/branch-3.0/src/fltk3/xutf8/utf8Utils.c
===================================================================
--- branches/branch-3.0/src/fltk3/xutf8/utf8Utils.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3/xutf8/utf8Utils.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -29,7 +29,7 @@
#if !defined(WIN32) && !defined(__APPLE__)
-#include "../../include/fltk3/Xutf8.h"
+#include "fltk3/Xutf8.h"
/*** NOTE : all functions are LIMITED to 24 bits Unicode values !!! ***/
Modified: branches/branch-3.0/src/fltk3/xutf8/utf8Wrap.c
===================================================================
--- branches/branch-3.0/src/fltk3/xutf8/utf8Wrap.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3/xutf8/utf8Wrap.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -28,7 +28,7 @@
*/
#if !defined(WIN32) && !defined(__APPLE__)
-#include "../../include/fltk3/Xutf8.h"
+#include "fltk3/Xutf8.h"
#include <X11/Xlib.h>
#include <ctype.h>
#include <stdlib.h>
Modified: branches/branch-3.0/src/fltk3jpeg/jaricom.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jaricom.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jaricom.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -14,8 +14,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* The following #define specifies the packing of the four components
* into the compact INT32 representation.
Modified: branches/branch-3.0/src/fltk3jpeg/jcapimin.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jcapimin.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jcapimin.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -18,8 +18,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/*
Modified: branches/branch-3.0/src/fltk3jpeg/jcapistd.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jcapistd.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jcapistd.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -15,8 +15,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/*
Modified: branches/branch-3.0/src/fltk3jpeg/jcarith.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jcarith.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jcarith.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -14,8 +14,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* Expanded entropy encoder object for arithmetic encoding. */
Modified: branches/branch-3.0/src/fltk3jpeg/jccoefct.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jccoefct.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jccoefct.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -11,8 +11,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* We use a full-image coefficient buffer when doing Huffman optimization,
Modified: branches/branch-3.0/src/fltk3jpeg/jccolor.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jccolor.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jccolor.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -9,8 +9,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* Private subobject */
Modified: branches/branch-3.0/src/fltk3jpeg/jcdctmgr.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jcdctmgr.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jcdctmgr.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -12,9 +12,9 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h" /* Private declarations for DCT subsystem */
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
+#include "fltk3jpeg/jdct.h" /* Private declarations for DCT subsystem */
/* Private subobject for this module */
Modified: branches/branch-3.0/src/fltk3jpeg/jchuff.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jchuff.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jchuff.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -21,8 +21,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* The legal range of a DCT coefficient is
Modified: branches/branch-3.0/src/fltk3jpeg/jcinit.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jcinit.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jcinit.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -16,8 +16,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/*
Modified: branches/branch-3.0/src/fltk3jpeg/jcmainct.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jcmainct.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jcmainct.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -11,8 +11,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* Note: currently, there is no operating mode in which a full-image buffer
Modified: branches/branch-3.0/src/fltk3jpeg/jcmarker.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jcmarker.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jcmarker.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -10,8 +10,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
typedef enum { /* JPEG marker codes */
Modified: branches/branch-3.0/src/fltk3jpeg/jcmaster.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jcmaster.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jcmaster.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -13,8 +13,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* Private state */
Modified: branches/branch-3.0/src/fltk3jpeg/jcomapi.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jcomapi.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jcomapi.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -10,8 +10,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/*
Modified: branches/branch-3.0/src/fltk3jpeg/jcparam.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jcparam.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jcparam.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -12,8 +12,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/*
Modified: branches/branch-3.0/src/fltk3jpeg/jcprepct.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jcprepct.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jcprepct.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -15,8 +15,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* At present, jcsample.c can request context rows only for smoothing.
Modified: branches/branch-3.0/src/fltk3jpeg/jcsample.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jcsample.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jcsample.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -46,8 +46,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* Pointer to routine to downsample a single component */
Modified: branches/branch-3.0/src/fltk3jpeg/jctrans.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jctrans.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jctrans.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -12,8 +12,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* Forward declarations */
Modified: branches/branch-3.0/src/fltk3jpeg/jdapimin.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jdapimin.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jdapimin.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -18,8 +18,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/*
Modified: branches/branch-3.0/src/fltk3jpeg/jdapistd.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jdapistd.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jdapistd.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -15,8 +15,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* Forward declarations */
Modified: branches/branch-3.0/src/fltk3jpeg/jdarith.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jdarith.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jdarith.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -14,8 +14,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* Expanded entropy decoder object for arithmetic decoding. */
Modified: branches/branch-3.0/src/fltk3jpeg/jdatadst.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jdatadst.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jdatadst.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -16,8 +16,8 @@
*/
/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
#include "jerror.h"
#ifndef HAVE_STDLIB_H /* <stdlib.h> should declare malloc(),free() */
Modified: branches/branch-3.0/src/fltk3jpeg/jdatasrc.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jdatasrc.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jdatasrc.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -16,8 +16,8 @@
*/
/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
#include "jerror.h"
Modified: branches/branch-3.0/src/fltk3jpeg/jdcoefct.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jdcoefct.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jdcoefct.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -15,8 +15,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* Block smoothing is only applicable for progressive JPEG, so: */
#ifndef D_PROGRESSIVE_SUPPORTED
Modified: branches/branch-3.0/src/fltk3jpeg/jdcolor.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jdcolor.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jdcolor.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -9,8 +9,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* Private subobject */
Modified: branches/branch-3.0/src/fltk3jpeg/jddctmgr.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jddctmgr.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jddctmgr.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -17,9 +17,9 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h" /* Private declarations for DCT subsystem */
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
+#include "fltk3jpeg/jdct.h" /* Private declarations for DCT subsystem */
/*
Modified: branches/branch-3.0/src/fltk3jpeg/jdhuff.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jdhuff.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jdhuff.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -17,8 +17,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* Derived data constructed for each Huffman table */
Modified: branches/branch-3.0/src/fltk3jpeg/jdinput.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jdinput.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jdinput.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -13,8 +13,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* Private state */
Modified: branches/branch-3.0/src/fltk3jpeg/jdmainct.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jdmainct.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jdmainct.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -14,8 +14,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/*
Modified: branches/branch-3.0/src/fltk3jpeg/jdmarker.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jdmarker.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jdmarker.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -14,8 +14,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
typedef enum { /* JPEG marker codes */
Modified: branches/branch-3.0/src/fltk3jpeg/jdmaster.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jdmaster.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jdmaster.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -13,8 +13,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* Private state */
Modified: branches/branch-3.0/src/fltk3jpeg/jdmerge.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jdmerge.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jdmerge.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -33,8 +33,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
#ifdef UPSAMPLE_MERGING_SUPPORTED
Modified: branches/branch-3.0/src/fltk3jpeg/jdpostct.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jdpostct.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jdpostct.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -17,8 +17,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* Private buffer controller object */
Modified: branches/branch-3.0/src/fltk3jpeg/jdsample.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jdsample.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jdsample.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -20,8 +20,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* Pointer to routine to upsample a single component */
Modified: branches/branch-3.0/src/fltk3jpeg/jdtrans.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jdtrans.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jdtrans.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -12,8 +12,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/* Forward declarations */
Modified: branches/branch-3.0/src/fltk3jpeg/jerror.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jerror.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jerror.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -19,9 +19,9 @@
*/
/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jversion.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
+#include "fltk3jpeg/jversion.h"
#include "jerror.h"
#ifdef USE_WINDOWS_MESSAGEBOX
Modified: branches/branch-3.0/src/fltk3jpeg/jfdctflt.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jfdctflt.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jfdctflt.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -36,9 +36,9 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h" /* Private declarations for DCT subsystem */
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
+#include "fltk3jpeg/jdct.h" /* Private declarations for DCT subsystem */
#ifdef DCT_FLOAT_SUPPORTED
Modified: branches/branch-3.0/src/fltk3jpeg/jfdctfst.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jfdctfst.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jfdctfst.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -32,9 +32,9 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h" /* Private declarations for DCT subsystem */
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
+#include "fltk3jpeg/jdct.h" /* Private declarations for DCT subsystem */
#ifdef DCT_IFAST_SUPPORTED
Modified: branches/branch-3.0/src/fltk3jpeg/jfdctint.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jfdctint.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jfdctint.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -42,9 +42,9 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h" /* Private declarations for DCT subsystem */
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
+#include "fltk3jpeg/jdct.h" /* Private declarations for DCT subsystem */
#ifdef DCT_ISLOW_SUPPORTED
Modified: branches/branch-3.0/src/fltk3jpeg/jidctflt.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jidctflt.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jidctflt.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -38,9 +38,9 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h" /* Private declarations for DCT subsystem */
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
+#include "fltk3jpeg/jdct.h" /* Private declarations for DCT subsystem */
#ifdef DCT_FLOAT_SUPPORTED
Modified: branches/branch-3.0/src/fltk3jpeg/jidctfst.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jidctfst.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jidctfst.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -33,9 +33,9 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h" /* Private declarations for DCT subsystem */
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
+#include "fltk3jpeg/jdct.h" /* Private declarations for DCT subsystem */
#ifdef DCT_IFAST_SUPPORTED
Modified: branches/branch-3.0/src/fltk3jpeg/jidctint.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jidctint.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jidctint.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -49,9 +49,9 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h" /* Private declarations for DCT subsystem */
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
+#include "fltk3jpeg/jdct.h" /* Private declarations for DCT subsystem */
#ifdef DCT_ISLOW_SUPPORTED
Modified: branches/branch-3.0/src/fltk3jpeg/jmemmgr.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jmemmgr.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jmemmgr.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -26,9 +26,9 @@
#define JPEG_INTERNALS
#define AM_MEMORY_MANAGER /* we define jvirt_Xarray_control structs */
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jmemsys.h" /* import the system-dependent declarations */
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
+#include "fltk3jpeg/jmemsys.h" /* import the system-dependent declarations */
#ifndef NO_GETENV
#ifndef HAVE_STDLIB_H /* <stdlib.h> should declare getenv() */
Modified: branches/branch-3.0/src/fltk3jpeg/jmemnobs.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jmemnobs.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jmemnobs.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -16,9 +16,9 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jmemsys.h" /* import the system-dependent declarations */
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
+#include "fltk3jpeg/jmemsys.h" /* import the system-dependent declarations */
#ifndef HAVE_STDLIB_H /* <stdlib.h> should declare malloc(),free() */
extern void * malloc JPP((size_t size));
Modified: branches/branch-3.0/src/fltk3jpeg/jquant1.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jquant1.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jquant1.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -11,8 +11,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
#ifdef QUANT_1PASS_SUPPORTED
Modified: branches/branch-3.0/src/fltk3jpeg/jquant2.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jquant2.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jquant2.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -18,8 +18,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
#ifdef QUANT_2PASS_SUPPORTED
Modified: branches/branch-3.0/src/fltk3jpeg/jutils.c
===================================================================
--- branches/branch-3.0/src/fltk3jpeg/jutils.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3jpeg/jutils.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -13,8 +13,8 @@
*/
#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
+#include "fltk3jpeg/jinclude.h"
+#include "fltk3jpeg/jpeglib.h"
/*
Modified: branches/branch-3.0/src/fltk3png/png.c
===================================================================
--- branches/branch-3.0/src/fltk3png/png.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3png/png.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -11,7 +11,7 @@
* and license in png.h
*/
-#include "pngpriv.h"
+#include "fltk3png/pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
typedef png_libpng_version_1_5_4 Your_png_h_is_not_version_1_5_4;
@@ -944,7 +944,7 @@
#if defined(PNG_sCAL_SUPPORTED) || defined(PNG_pCAL_SUPPORTED)
/* ASCII to fp functions */
/* Check an ASCII formated floating point value, see the more detailed
- * comments in pngpriv.h
+ * comments in fltk3png/pngpriv.h
*/
/* The following is used internally to preserve the sticky flags */
#define png_fp_add(state, flags) ((state) |= (flags))
Modified: branches/branch-3.0/src/fltk3png/pngerror.c
===================================================================
--- branches/branch-3.0/src/fltk3png/pngerror.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3png/pngerror.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -16,7 +16,7 @@
* at each function.
*/
-#include "pngpriv.h"
+#include "fltk3png/pngpriv.h"
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
Modified: branches/branch-3.0/src/fltk3png/pngget.c
===================================================================
--- branches/branch-3.0/src/fltk3png/pngget.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3png/pngget.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -12,7 +12,7 @@
*
*/
-#include "pngpriv.h"
+#include "fltk3png/pngpriv.h"
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
Modified: branches/branch-3.0/src/fltk3png/pngmem.c
===================================================================
--- branches/branch-3.0/src/fltk3png/pngmem.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3png/pngmem.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -17,7 +17,7 @@
* identify the replacement functions.
*/
-#include "pngpriv.h"
+#include "fltk3png/pngpriv.h"
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
Modified: branches/branch-3.0/src/fltk3png/pngpread.c
===================================================================
--- branches/branch-3.0/src/fltk3png/pngpread.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3png/pngpread.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -11,7 +11,7 @@
* and license in png.h
*/
-#include "pngpriv.h"
+#include "fltk3png/pngpriv.h"
#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
Modified: branches/branch-3.0/src/fltk3png/pngread.c
===================================================================
--- branches/branch-3.0/src/fltk3png/pngread.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3png/pngread.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -14,7 +14,7 @@
* read a PNG file or stream.
*/
-#include "pngpriv.h"
+#include "fltk3png/pngpriv.h"
#ifdef PNG_READ_SUPPORTED
Modified: branches/branch-3.0/src/fltk3png/pngrio.c
===================================================================
--- branches/branch-3.0/src/fltk3png/pngrio.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3png/pngrio.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -18,7 +18,7 @@
* libpng use it at run time with png_set_read_fn(...).
*/
-#include "pngpriv.h"
+#include "fltk3png/pngpriv.h"
#ifdef PNG_READ_SUPPORTED
Modified: branches/branch-3.0/src/fltk3png/pngrtran.c
===================================================================
--- branches/branch-3.0/src/fltk3png/pngrtran.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3png/pngrtran.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -16,7 +16,7 @@
* in pngtrans.c.
*/
-#include "pngpriv.h"
+#include "fltk3png/pngpriv.h"
#ifdef PNG_READ_SUPPORTED
Modified: branches/branch-3.0/src/fltk3png/pngrutil.c
===================================================================
--- branches/branch-3.0/src/fltk3png/pngrutil.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3png/pngrutil.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -14,7 +14,7 @@
* libpng itself during the course of reading an image.
*/
-#include "pngpriv.h"
+#include "fltk3png/pngpriv.h"
#ifdef PNG_READ_SUPPORTED
@@ -288,9 +288,9 @@
/* zlib can't necessarily handle more than 65535 bytes at once (i.e. it can't
* even necessarily handle 65536 bytes) because the type uInt is "16 bits or
* more". Consequently it is necessary to chunk the input to zlib. This
- * code uses ZLIB_IO_MAX, from pngpriv.h, as the maximum (the maximum value
+ * code uses ZLIB_IO_MAX, from fltk3png/pngpriv.h, as the maximum (the maximum value
* that can be stored in a uInt.) It is possible to set ZLIB_IO_MAX to a
- * lower value in pngpriv.h and this may sometimes have a performance
+ * lower value in fltk3png/pngpriv.h and this may sometimes have a performance
* advantage, because it forces access of the input data to be separated from
* at least some of the use by some period of time.
*/
Modified: branches/branch-3.0/src/fltk3png/pngset.c
===================================================================
--- branches/branch-3.0/src/fltk3png/pngset.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3png/pngset.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -16,7 +16,7 @@
* info struct and allows us to change the structure in the future.
*/
-#include "pngpriv.h"
+#include "fltk3png/pngpriv.h"
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
Modified: branches/branch-3.0/src/fltk3png/pngtrans.c
===================================================================
--- branches/branch-3.0/src/fltk3png/pngtrans.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3png/pngtrans.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -11,7 +11,7 @@
* and license in png.h
*/
-#include "pngpriv.h"
+#include "fltk3png/pngpriv.h"
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
Modified: branches/branch-3.0/src/fltk3png/pngwio.c
===================================================================
--- branches/branch-3.0/src/fltk3png/pngwio.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3png/pngwio.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -18,7 +18,7 @@
* them at run time with png_set_write_fn(...).
*/
-#include "pngpriv.h"
+#include "fltk3png/pngpriv.h"
#ifdef PNG_WRITE_SUPPORTED
Modified: branches/branch-3.0/src/fltk3png/pngwrite.c
===================================================================
--- branches/branch-3.0/src/fltk3png/pngwrite.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3png/pngwrite.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -11,7 +11,7 @@
* and license in png.h
*/
-#include "pngpriv.h"
+#include "fltk3png/pngpriv.h"
#ifdef PNG_WRITE_SUPPORTED
Modified: branches/branch-3.0/src/fltk3png/pngwtran.c
===================================================================
--- branches/branch-3.0/src/fltk3png/pngwtran.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3png/pngwtran.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -11,7 +11,7 @@
* and license in png.h
*/
-#include "pngpriv.h"
+#include "fltk3png/pngpriv.h"
#ifdef PNG_WRITE_SUPPORTED
Modified: branches/branch-3.0/src/fltk3png/pngwutil.c
===================================================================
--- branches/branch-3.0/src/fltk3png/pngwutil.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3png/pngwutil.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -11,7 +11,7 @@
* and license in png.h
*/
-#include "pngpriv.h"
+#include "fltk3png/pngpriv.h"
#ifdef PNG_WRITE_SUPPORTED
@@ -3109,7 +3109,7 @@
/* Record the number of bytes available - zlib supports at least 65535
* bytes at one step, depending on the size of the zlib type 'uInt', the
- * maximum size zlib can write at once is ZLIB_IO_MAX (from pngpriv.h).
+ * maximum size zlib can write at once is ZLIB_IO_MAX (from fltk3png/pngpriv.h).
* Use this because on 16 bit systems 'rowbytes' can be up to 65536 (i.e.
* one more than 16 bits) and, in this case 'rowbytes+1' can overflow a
* uInt. ZLIB_IO_MAX can be safely reduced to cause zlib to be called
Modified: branches/branch-3.0/src/fltk3zlib/adler32.c
===================================================================
--- branches/branch-3.0/src/fltk3zlib/adler32.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3zlib/adler32.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -5,7 +5,7 @@
/* @(#) $Id$ */
-#include "zutil.h"
+#include "fltk3zlib/zutil.h"
#define local static
Modified: branches/branch-3.0/src/fltk3zlib/crc32.c
===================================================================
--- branches/branch-3.0/src/fltk3zlib/crc32.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3zlib/crc32.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -26,7 +26,7 @@
# endif /* !DYNAMIC_CRC_TABLE */
#endif /* MAKECRCH */
-#include "zutil.h" /* for STDC and FAR definitions */
+#include "fltk3zlib/zutil.h" /* for STDC and FAR definitions */
#define local static
@@ -156,13 +156,13 @@
}
#ifdef MAKECRCH
- /* write out CRC tables to crc32.h */
+ /* write out CRC tables to fltk3zlib/crc32.h */
{
FILE *out;
- out = fopen("crc32.h", "w");
+ out = fopen("fltk3zlib/crc32.h", "w");
if (out == NULL) return;
- fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
+ fprintf(out, "/* fltk3zlib/crc32.h -- tables for rapid CRC calculation\n");
fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
fprintf(out, "local const unsigned long FAR ");
fprintf(out, "crc_table[TBLS][256] =\n{\n {\n");
@@ -198,7 +198,7 @@
/* ========================================================================
* Tables of CRC-32s of all single-byte values, made by make_crc_table().
*/
-#include "crc32.h"
+#include "fltk3zlib/crc32.h"
#endif /* DYNAMIC_CRC_TABLE */
/* =========================================================================
Modified: branches/branch-3.0/src/fltk3zlib/deflate.c
===================================================================
--- branches/branch-3.0/src/fltk3zlib/deflate.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3zlib/deflate.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -49,7 +49,7 @@
/* @(#) $Id$ */
-#include "deflate.h"
+#include "fltk3zlib/deflate.h"
const char deflate_copyright[] =
" deflate 1.2.5 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";
Modified: branches/branch-3.0/src/fltk3zlib/gzclose.c
===================================================================
--- branches/branch-3.0/src/fltk3zlib/gzclose.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3zlib/gzclose.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -3,7 +3,7 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
-#include "gzguts.h"
+#include "fltk3zlib/gzguts.h"
/* gzclose() is in a separate file so that it is linked in only if it is used.
That way the other gzclose functions can be used instead to avoid linking in
Modified: branches/branch-3.0/src/fltk3zlib/gzlib.c
===================================================================
--- branches/branch-3.0/src/fltk3zlib/gzlib.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3zlib/gzlib.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -3,7 +3,7 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
-#include "gzguts.h"
+#include "fltk3zlib/gzguts.h"
#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
# define LSEEK lseek64
Modified: branches/branch-3.0/src/fltk3zlib/gzread.c
===================================================================
--- branches/branch-3.0/src/fltk3zlib/gzread.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3zlib/gzread.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -3,7 +3,7 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
-#include "gzguts.h"
+#include "fltk3zlib/gzguts.h"
/* Local functions */
local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
Modified: branches/branch-3.0/src/fltk3zlib/gzwrite.c
===================================================================
--- branches/branch-3.0/src/fltk3zlib/gzwrite.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3zlib/gzwrite.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -3,7 +3,7 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
-#include "gzguts.h"
+#include "fltk3zlib/gzguts.h"
/* Local functions */
local int gz_init OF((gz_statep));
Modified: branches/branch-3.0/src/fltk3zlib/infback.c
===================================================================
--- branches/branch-3.0/src/fltk3zlib/infback.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3zlib/infback.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -10,10 +10,10 @@
inflate_fast() can be used with either inflate.c or infback.c.
*/
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
+#include "fltk3zlib/zutil.h"
+#include "fltk3zlib/inftrees.h"
+#include "fltk3zlib/inflate.h"
+#include "fltk3zlib/inffast.h"
/* function prototypes */
local void fixedtables OF((struct inflate_state FAR *state));
@@ -62,7 +62,7 @@
/*
Return state with length and distance decoding tables and index sizes set to
- fixed code decoding. Normally this returns fixed tables from inffixed.h.
+ fixed code decoding. Normally this returns fixed tables from fltk3zlib/inffixed.h.
If BUILDFIXED is defined, then instead this routine builds the tables the
first time it's called, and returns those tables the first time and
thereafter. This reduces the size of the code by about 2K bytes, in
@@ -105,7 +105,7 @@
virgin = 0;
}
#else /* !BUILDFIXED */
-# include "inffixed.h"
+# include "fltk3zlib/inffixed.h"
#endif /* BUILDFIXED */
state->lencode = lenfix;
state->lenbits = 9;
@@ -446,7 +446,7 @@
}
/* build code tables -- note: do not change the lenbits or distbits
- values here (9 and 6) without reading the comments in inftrees.h
+ values here (9 and 6) without reading the comments in fltk3zlib/inffltk3zlib/trees.h
concerning the ENOUGH constants, which depend on those values */
state->next = state->codes;
state->lencode = (code const FAR *)(state->next);
Modified: branches/branch-3.0/src/fltk3zlib/inffast.c
===================================================================
--- branches/branch-3.0/src/fltk3zlib/inffast.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3zlib/inffast.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -3,10 +3,10 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
+#include "fltk3zlib/zutil.h"
+#include "fltk3zlib/inftrees.h"
+#include "fltk3zlib/inflate.h"
+#include "fltk3zlib/inffast.h"
#ifndef ASMINF
Modified: branches/branch-3.0/src/fltk3zlib/inflate.c
===================================================================
--- branches/branch-3.0/src/fltk3zlib/inflate.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3zlib/inflate.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -21,14 +21,14 @@
*
* 1.2.beta2 4 Dec 2002
* - Change external routine names to reduce potential conflicts
- * - Correct filename to inffixed.h for fixed tables in inflate.c
+ * - Correct filename to fltk3zlib/inffixed.h for fixed tables in inflate.c
* - Make hbuf[] unsigned char to match parameter type in inflate.c
* - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
* to avoid negation problem on Alphas (64 bit) in inflate.c
*
* 1.2.beta3 22 Dec 2002
* - Add comments on state->bits assertion in inffast.c
- * - Add comments on op field in inftrees.h
+ * - Add comments on op field in fltk3zlib/inffltk3zlib/trees.h
* - Fix bug in reuse of allocated window after inflateReset()
* - Remove bit fields--back to byte structure for speed
* - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
@@ -80,10 +80,10 @@
* The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
*/
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
+#include "fltk3zlib/zutil.h"
+#include "fltk3zlib/inftrees.h"
+#include "fltk3zlib/inflate.h"
+#include "fltk3zlib/inffast.h"
#ifdef MAKEFIXED
# ifndef BUILDFIXED
@@ -229,7 +229,7 @@
/*
Return state with length and distance decoding tables and index sizes set to
- fixed code decoding. Normally this returns fixed tables from inffixed.h.
+ fixed code decoding. Normally this returns fixed tables from fltk3zlib/inffixed.h.
If BUILDFIXED is defined, then instead this routine builds the tables the
first time it's called, and returns those tables the first time and
thereafter. This reduces the size of the code by about 2K bytes, in
@@ -272,7 +272,7 @@
virgin = 0;
}
#else /* !BUILDFIXED */
-# include "inffixed.h"
+# include "fltk3zlib/inffixed.h"
#endif /* BUILDFIXED */
state->lencode = lenfix;
state->lenbits = 9;
@@ -284,9 +284,9 @@
#include <stdio.h>
/*
- Write out the inffixed.h that is #include'd above. Defining MAKEFIXED also
+ Write out the fltk3zlib/inffixed.h that is #include'd above. Defining MAKEFIXED also
defines BUILDFIXED, so the tables are built on the fly. makefixed() writes
- those tables to stdout, which would be piped to inffixed.h. A small program
+ those tables to stdout, which would be piped to fltk3zlib/inffixed.h. A small program
can simply call makefixed to do this:
void makefixed(void);
@@ -299,7 +299,7 @@
Then that can be linked with zlib built with MAKEFIXED defined and run:
- a.out > inffixed.h
+ a.out > fltk3zlib/inffixed.h
*/
void makefixed()
{
@@ -307,7 +307,7 @@
struct inflate_state state;
fixedtables(&state);
- puts(" /* inffixed.h -- table for decoding fixed codes");
+ puts(" /* fltk3zlib/inffixed.h -- table for decoding fixed codes");
puts(" * Generated automatically by makefixed().");
puts(" */");
puts("");
@@ -977,7 +977,7 @@
}
/* build code tables -- note: do not change the lenbits or distbits
- values here (9 and 6) without reading the comments in inftrees.h
+ values here (9 and 6) without reading the comments in fltk3zlib/inffltk3zlib/trees.h
concerning the ENOUGH constants, which depend on those values */
state->next = state->codes;
state->lencode = (code const FAR *)(state->next);
Modified: branches/branch-3.0/src/fltk3zlib/inftrees.c
===================================================================
--- branches/branch-3.0/src/fltk3zlib/inftrees.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3zlib/inftrees.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -3,8 +3,8 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
-#include "zutil.h"
-#include "inftrees.h"
+#include "fltk3zlib/zutil.h"
+#include "fltk3zlib/inftrees.h"
#define MAXBITS 15
@@ -168,7 +168,7 @@
used keeps track of how many table entries have been allocated from the
provided *table space. It is checked for LENS and DIST tables against
the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
- the initial root table size constants. See the comments in inftrees.h
+ the initial root table size constants. See the comments in fltk3zlib/inffltk3zlib/trees.h
for more information.
sym increments through all symbols, and the loop terminates when
Modified: branches/branch-3.0/src/fltk3zlib/trees.c
===================================================================
--- branches/branch-3.0/src/fltk3zlib/trees.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3zlib/trees.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -34,7 +34,7 @@
/* #define GEN_TREES_H */
-#include "deflate.h"
+#include "fltk3zlib/deflate.h"
#ifdef DEBUG
# include <ctype.h>
@@ -86,7 +86,7 @@
#define DIST_CODE_LEN 512 /* see definition of array dist_code below */
#if defined(GEN_TREES_H) || !defined(STDC)
-/* non ANSI compilers may not accept trees.h */
+/* non ANSI compilers may not accept fltk3zlib/trees.h */
local ct_data static_ltree[L_CODES+2];
/* The static literal tree. Since the bit lengths are imposed, there is no
@@ -116,7 +116,7 @@
/* First normalized distance for each code (0 = distance of 1) */
#else
-# include "trees.h"
+# include "fltk3zlib/trees.h"
#endif /* GEN_TREES_H */
struct static_tree_desc_s {
@@ -319,7 +319,7 @@
}
/* ===========================================================================
- * Genererate the file trees.h describing the static trees.
+ * Genererate the file fltk3zlib/trees.h describing the static trees.
*/
#ifdef GEN_TREES_H
# ifndef DEBUG
@@ -332,10 +332,10 @@
void gen_trees_header()
{
- FILE *header = fopen("trees.h", "w");
+ FILE *header = fopen("fltk3zlib/trees.h", "w");
int i;
- Assert (header != NULL, "Can't open trees.h");
+ Assert (header != NULL, "Can't open fltk3zlib/trees.h");
fprintf(header,
"/* header created automatically with -DGEN_TREES_H */\n\n");
Modified: branches/branch-3.0/src/fltk3zlib/zutil.c
===================================================================
--- branches/branch-3.0/src/fltk3zlib/zutil.c 2011-08-27 22:50:53 UTC (rev 9017)
+++ branches/branch-3.0/src/fltk3zlib/zutil.c 2011-08-28 09:39:18 UTC (rev 9018)
@@ -5,7 +5,7 @@
/* @(#) $Id$ */
-#include "zutil.h"
+#include "fltk3zlib/zutil.h"
#ifndef NO_DUMMY_DECL
struct internal_state {int dummy;}; /* for buggy compilers */
[ Direct Link to Message ] | |
