Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2009-02-17 18:15:05 +0000
committerStijn Buys <ingar@osirion.org>2009-02-17 18:15:05 +0000
commit4baca0eb3d71710cd598ffcb356ff302b9814c7c (patch)
tree59021467c76e8ef46e0af836ca198f74af041fc1 /src/render/jpgfile.cc
parenta519a1d5c034421d8d325512de1f2defbbae7303 (diff)
Fixed an overflow in the TGA reader,
always enable libjpeg #define workaround
Diffstat (limited to 'src/render/jpgfile.cc')
-rw-r--r--src/render/jpgfile.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/render/jpgfile.cc b/src/render/jpgfile.cc
index 7713a07..5ed3ff8 100644
--- a/src/render/jpgfile.cc
+++ b/src/render/jpgfile.cc
@@ -18,12 +18,10 @@ http://www.zarb.org/~gc/html/libpng.html
#include "render/jpgfile.h"
#include "sys/sys.h"
-// work around for the win32 build
-#ifdef _WIN32
+// work-around for a jpeglib problem, needed on win32 and osx
#ifdef HAVE_STDLIB_H
#undef HAVE_STDLIB_H
#endif
-#endif
extern "C" {
#include "jpeglib.h"
}