summaryrefslogtreecommitdiff
path: root/codec
diff options
context:
space:
mode:
authorAntonin Descampe <antonin@gmail.com>2009-11-05 16:39:02 +0000
committerAntonin Descampe <antonin@gmail.com>2009-11-05 16:39:02 +0000
commit449d7bedb62ba1f13768ec2ed355f47f2ea89580 (patch)
treeec4a8f9443fa93176e4151f440014f33acecf24e /codec
parentbfd3fe8a4aafb263fedc56345f3e048e52e56326 (diff)
fixed "tiffio" header inclusion to use user version on Win32 system only (otherwise assume its existence in system headers).
Diffstat (limited to 'codec')
-rw-r--r--codec/convert.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/codec/convert.c b/codec/convert.c
index 465b0e0b..a9ffb0da 100644
--- a/codec/convert.c
+++ b/codec/convert.c
@@ -32,8 +32,12 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "openjpeg.h"
+#ifdef WIN32
#include "../libs/libtiff/tiffio.h"
+#else
+#include <tiffio.h>
+#endif /* WIN32 */
+#include "openjpeg.h"
#include "convert.h"
/*