diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-07-26 14:22:02 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-07-26 14:22:02 +0000 |
| commit | 1cfc6385dd1def16ce809793ff6358eb69d6f770 (patch) | |
| tree | 99ec0fc68475bc4dc4d811d51f1dca0ce69f89f4 /src | |
| parent | 7ce42e25927a18323aabe87e006a6f699aaf3f25 (diff) | |
BMP image loader fixes.
JPEG with Cygwin fix.
Make sure that all generated files are removed with a "make distclean".
Make sure we remove the autoconf cache directory when building the
source distribution.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2551 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_BMP_Image.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_JPEG_Image.cxx | 15 |
2 files changed, 16 insertions, 5 deletions
diff --git a/src/Fl_BMP_Image.cxx b/src/Fl_BMP_Image.cxx index ed8ea6e00..63dc9015d 100644 --- a/src/Fl_BMP_Image.cxx +++ b/src/Fl_BMP_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_BMP_Image.cxx,v 1.1.2.7 2002/06/24 02:04:54 easysw Exp $" +// "$Id: Fl_BMP_Image.cxx,v 1.1.2.8 2002/07/26 14:22:02 easysw Exp $" // // Fl_BMP_Image routines. // @@ -111,7 +111,7 @@ Fl_BMP_Image::Fl_BMP_Image(const char *bmp) // I - File to read compression = BI_RGB; colors_used = 0; - count = info_size - 8; + count = info_size - 12; } else { // New BMP header... w(read_long(fp)); @@ -393,5 +393,5 @@ read_long(FILE *fp) { // I - File to read from // -// End of "$Id: Fl_BMP_Image.cxx,v 1.1.2.7 2002/06/24 02:04:54 easysw Exp $". +// End of "$Id: Fl_BMP_Image.cxx,v 1.1.2.8 2002/07/26 14:22:02 easysw Exp $". // diff --git a/src/Fl_JPEG_Image.cxx b/src/Fl_JPEG_Image.cxx index 183c41eba..0421b2bdf 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.5 2002/05/25 02:56:59 easysw Exp $" +// "$Id: Fl_JPEG_Image.cxx,v 1.1.2.6 2002/07/26 14:22:02 easysw Exp $" // // Fl_JPEG_Image routines. // @@ -25,6 +25,7 @@ // // Contents: // +// Fl_JPEG_Image::Fl_JPEG_Image() - Load a JPEG image file. // // @@ -36,6 +37,16 @@ #include <stdio.h> #include <stdlib.h> + +// Some releases of the Cygwin JPEG libraries don't have a correctly +// updated header file for the INT32 data type; the following define +// from Shane Hill seems to be a usable workaround... + +#if defined(WIN32) && defined(__CYGWIN__) +# define XMD_H +#endif // WIN32 && __CYGWIN__ + + extern "C" { #ifdef HAVE_LIBJPEG @@ -96,5 +107,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.5 2002/05/25 02:56:59 easysw Exp $". +// End of "$Id: Fl_JPEG_Image.cxx,v 1.1.2.6 2002/07/26 14:22:02 easysw Exp $". // |