fixed "tiffio" header inclusion to use user version on Win32 system only (otherwise...

diff --git a/ChangeLog b/ChangeLog
index c2ee86781cdcbea03ae0b20133394ed555977519..51dd1187395291db16146d81a45c98297e8c7e98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+November 5, 2009
+* [antonin] fixed "tiffio" header inclusion to use user version on Win32 system only (otherwise assume its existence in system headers).
+
 September 10, 2009
 * [antonin] fixed minor bugs which were triggering warnings at compilation (different signedness, wrong pointer type, etc)
 

diff --git a/codec/convert.c b/codec/convert.c
index 465b0e0b91279f4dc68f52a1731f5983e23d2c1e..a9ffb0da1e08c9554f18743c6cbdace3f523a498 100644 (file)
--- 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"
 
 /*

diff --git a/openjpeg.xcodeproj/project.pbxproj b/openjpeg.xcodeproj/project.pbxproj
index 7bc8a945854de8b706a5cdae93a2d851b99e4f47..4caa23b66eef7ee541e69d7b1b270de7eeb010d0 100644 (file)
--- a/openjpeg.xcodeproj/project.pbxproj
+++ b/openjpeg.xcodeproj/project.pbxproj
@@ -697,6 +697,7 @@
                69F984AA0D40A3AE00C2791C /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
                                COPY_PHASE_STRIP = NO;
                        };
                        name = Debug;
@@ -704,6 +705,7 @@
                69F984AB0D40A3AE00C2791C /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
                                COPY_PHASE_STRIP = YES;
                        };
                        name = Release;