mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-03 03:30:06 +00:00
Code Activity

Improved isolation of internal jpeg library symbols.

Browse source
This commit is contained in:
Julian Storer 2010-08-29 10:48:51 +01:00
parent 5159554140
commit 8775571cd7
2 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
juce_amalgamated.cpp
View file

@ -187900,8 +187900,6 @@ namespace jpeglibNamespace
#if JUCE_MINGW
typedef unsigned char boolean;
#endif
extern "C"
{
#define JPEG_INTERNALS
#undef FAR
@ -211268,11 +211266,10 @@ jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
}
/*** End of inlined file: transupp.c ***/
}
#else
#define JPEG_INTERNALS
#undef FAR
#include <jpeglib.h>
#define JPEG_INTERNALS
#undef FAR
#include <jpeglib.h>
#endif
}

9
src/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp
View file

@ -35,8 +35,6 @@ namespace jpeglibNamespace
#if JUCE_MINGW
typedef unsigned char boolean;
#endif
extern "C"
{
#define JPEG_INTERNALS
#undef FAR
#include "jpglib/jpeglib.h"
@ -109,11 +107,10 @@ namespace jpeglibNamespace
#include "jpglib/jquant2.c"
#include "jpglib/jutils.c"
#include "jpglib/transupp.c"
}
#else
#define JPEG_INTERNALS
#undef FAR
#include <jpeglib.h>
#define JPEG_INTERNALS
#undef FAR
#include <jpeglib.h>
#endif
}