walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fixed "tiffio" header inclusion to use user version on Win32 system only (otherwise assume its existence in system headers).

This commit is contained in:
Antonin Descampe 2009-11-05 16:39:02 +00:00
parent bfd3fe8a4a
commit 449d7bedb6
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -5,6 +5,9 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : 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 September 10, 2009
* [antonin] fixed minor bugs which were triggering warnings at compilation (different signedness, wrong pointer type, etc) * [antonin] fixed minor bugs which were triggering warnings at compilation (different signedness, wrong pointer type, etc)

6
codec/convert.c
View File

@ -32,8 +32,12 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "openjpeg.h" #ifdef WIN32
#include "../libs/libtiff/tiffio.h" #include "../libs/libtiff/tiffio.h"
#else
#include <tiffio.h>
#endif /* WIN32 */
#include "openjpeg.h"
#include "convert.h" #include "convert.h"
/* /*

2
openjpeg.xcodeproj/project.pbxproj
View File

@ -697,6 +697,7 @@
69F984AA0D40A3AE00C2791C /* Debug */ = { 69F984AA0D40A3AE00C2791C /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
}; };
name = Debug; name = Debug;
@ -704,6 +705,7 @@
69F984AB0D40A3AE00C2791C /* Release */ = { 69F984AB0D40A3AE00C2791C /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
}; };
name = Release; name = Release;