[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28291] trunk/lib/darwin-9.x.universal: OSX libs 10.5 : update libtiff to 3.9.2
Damien Plisson
damien.plisson at yahoo.fr
Mon Apr 19 22:07:13 CEST 2010
Revision: 28291
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28291
Author: damien78
Date: 2010-04-19 22:07:13 +0200 (Mon, 19 Apr 2010)
Log Message:
-----------
OSX libs 10.5 : update libtiff to 3.9.2
Modified Paths:
--------------
trunk/lib/darwin-9.x.universal/README
trunk/lib/darwin-9.x.universal/tiff/include/tiff.h
trunk/lib/darwin-9.x.universal/tiff/include/tiffconf.h
trunk/lib/darwin-9.x.universal/tiff/include/tiffio.h
trunk/lib/darwin-9.x.universal/tiff/include/tiffvers.h
trunk/lib/darwin-9.x.universal/tiff/lib/libtiff.a
trunk/lib/darwin-9.x.universal/tiff/lib/libtiffxx.a
Modified: trunk/lib/darwin-9.x.universal/README
===================================================================
--- trunk/lib/darwin-9.x.universal/README 2010-04-19 19:29:40 UTC (rev 28290)
+++ trunk/lib/darwin-9.x.universal/README 2010-04-19 20:07:13 UTC (rev 28291)
@@ -11,7 +11,7 @@
png (version 1.2.29)
python (release3.1-maint)
release (python_??.zip)
-tiff (version 3.9.1)
+tiff (version 3.9.2)
ppc64 missing:
openexr (version 1.4.0a)
@@ -31,8 +31,12 @@
The following configuration parameters were used to build the libs:
Tiff:
-./configure --with-jbig-include-dir=/Users/username/Desktop/Dev/jbigkit/libjbig/ --with-jbig-lib-dir=/Users/username/Desktop/Dev/jbigkit/libjbig/ --with-jpeg-include-dir=/Users/username/Desktop/Dev/jpeg-7 --with-jpeg-lib-dir=/Users/username/Desktop/Dev/jpeg-7/output --with-apple-opengl-framework CFLAGS="-arch x86_64" LDFLAGS="-arch x86_64" CXXFLAGS="-arch x86_64"
+./configure --disable-shared --with-jpeg-include-dir=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/jpeg/include --with-jpeg-lib-dir=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/jpeg/lib --with-apple-opengl-framework --build=x86_64-apple-darwin9.8.0 CC="gcc-4.2" CXX="g++-4.2" CFLAGS="-arch x86_64 -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CXXFLAGS="-arch x86_64 -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"
+./configure --disable-shared --with-jpeg-include-dir=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/jpeg/include --with-jpeg-lib-dir=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/jpeg/lib --with-apple-opengl-framework --build=i386-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CXX="g++-4.2" CXXFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"
+
+./configure --disable-shared --with-jpeg-include-dir=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/jpeg/include --with-jpeg-lib-dir=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/jpeg/lib --with-apple-opengl-framework --build=powerpc-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CXX="g++-4.2" CXXFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"
+
Python:
./configure CC=gcc-4.2 CXX=g++-4.2 CFLAGS="-arch x86_64" CXXFLAGS="-arch x86_64" OBJCFLAGS="-arch x86_64" OBJCXXFLAGS="-arch x86_64" LDFLAGS="-arch x86_64" --enable-universalsdk=/Developer/SDKs/MacOSX10.5.sdk --with-universal-archs="all"
Modified: trunk/lib/darwin-9.x.universal/tiff/include/tiff.h
===================================================================
--- trunk/lib/darwin-9.x.universal/tiff/include/tiff.h 2010-04-19 19:29:40 UTC (rev 28290)
+++ trunk/lib/darwin-9.x.universal/tiff/include/tiff.h 2010-04-19 20:07:13 UTC (rev 28291)
@@ -1,4 +1,4 @@
-/* $Id: tiff.h,v 1.42 2005/12/23 15:10:45 dron Exp $ */
+/* $Id: tiff.h,v 1.43 2006-10-05 15:20:40 dron Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@@ -43,7 +43,7 @@
* (http://partners.adobe.com/asn/developer/PDFS/TN/TIFF6.pdf)
*
* For Big TIFF design notes see the following link
- * http://gdal.maptools.org/twiki/bin/view/libtiff/BigTIFFDesign
+ * http://www.remotesensing.org/libtiff/bigtiffdesign.html
*/
#define TIFF_VERSION 42
#define TIFF_BIGTIFF_VERSION 43
Modified: trunk/lib/darwin-9.x.universal/tiff/include/tiffconf.h
===================================================================
--- trunk/lib/darwin-9.x.universal/tiff/include/tiffconf.h 2010-04-19 19:29:40 UTC (rev 28290)
+++ trunk/lib/darwin-9.x.universal/tiff/include/tiffconf.h 2010-04-19 20:07:13 UTC (rev 28291)
@@ -1,4 +1,4 @@
-/* libtiff/tiffconf.h. Generated by configure. */
+/* libtiff/tiffconf.h. Generated from tiffconf.h.in by configure. */
/*
Configuration defines for installed libtiff.
This file maintained for backward compatibility. Do not use definitions
@@ -40,8 +40,11 @@
#define CCITT_SUPPORT 1
/* Support JPEG compression (requires IJG JPEG library) */
-/* #undef JPEG_SUPPORT */
+#define JPEG_SUPPORT 1
+/* Support JBIG compression (requires JBIG-KIT library) */
+/* #undef JBIG_SUPPORT */
+
/* Support LogLuv high dynamic range encoding */
#define LOGLUV_SUPPORT 1
@@ -53,7 +56,7 @@
/* Support Old JPEG compresson (read contrib/ojpeg/README first! Compilation
fails with unpatched IJG JPEG library) */
-/* #undef OJPEG_SUPPORT */
+#define OJPEG_SUPPORT 1
/* Support Macintosh PackBits algorithm */
#define PACKBITS_SUPPORT 1
Modified: trunk/lib/darwin-9.x.universal/tiff/include/tiffio.h
===================================================================
--- trunk/lib/darwin-9.x.universal/tiff/include/tiffio.h 2010-04-19 19:29:40 UTC (rev 28290)
+++ trunk/lib/darwin-9.x.universal/tiff/include/tiffio.h 2010-04-19 20:07:13 UTC (rev 28291)
@@ -1,4 +1,4 @@
-/* $Id: tiffio.h,v 1.50 2006/03/21 16:37:51 dron Exp $ */
+/* $Id: tiffio.h,v 1.56.2.3 2009-01-01 00:10:43 bfriesen Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@@ -58,14 +58,15 @@
* 32-bit file offsets being the most important, and to ensure
* that it is unsigned, rather than signed.
*/
-typedef uint32 ttag_t; /* directory tag */
-typedef uint16 tdir_t; /* directory index */
-typedef uint16 tsample_t; /* sample number */
-typedef uint32 tstrip_t; /* strip number */
-typedef uint32 ttile_t; /* tile number */
-typedef int32 tsize_t; /* i/o size in bytes */
-typedef void* tdata_t; /* image data ref */
-typedef uint32 toff_t; /* file offset */
+typedef uint32 ttag_t; /* directory tag */
+typedef uint16 tdir_t; /* directory index */
+typedef uint16 tsample_t; /* sample number */
+typedef uint32 tstrile_t; /* strip or tile number */
+typedef tstrile_t tstrip_t; /* strip number */
+typedef tstrile_t ttile_t; /* tile number */
+typedef int32 tsize_t; /* i/o size in bytes */
+typedef void* tdata_t; /* image data ref */
+typedef uint32 toff_t; /* file offset */
#if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32))
#define __WIN32__
@@ -96,10 +97,6 @@
typedef void* thandle_t; /* client data handle */
#endif /* USE_WIN32_FILEIO */
-#ifndef NULL
-# define NULL (void *)0
-#endif
-
/*
* Flags to pass to TIFFPrintDirectory to control
* printing of data structures that are potentially
@@ -191,35 +188,36 @@
* RGBA-reader state.
*/
struct _TIFFRGBAImage {
- TIFF* tif; /* image handle */
- int stoponerr; /* stop on read error */
- int isContig; /* data is packed/separate */
- int alpha; /* type of alpha data present */
- uint32 width; /* image width */
- uint32 height; /* image height */
- uint16 bitspersample; /* image bits/sample */
- uint16 samplesperpixel; /* image samples/pixel */
- uint16 orientation; /* image orientation */
- uint16 req_orientation; /* requested orientation */
- uint16 photometric; /* image photometric interp */
- uint16* redcmap; /* colormap pallete */
- uint16* greencmap;
- uint16* bluecmap;
- /* get image data routine */
- int (*get)(TIFFRGBAImage*, uint32*, uint32, uint32);
+ TIFF* tif; /* image handle */
+ int stoponerr; /* stop on read error */
+ int isContig; /* data is packed/separate */
+ int alpha; /* type of alpha data present */
+ uint32 width; /* image width */
+ uint32 height; /* image height */
+ uint16 bitspersample; /* image bits/sample */
+ uint16 samplesperpixel; /* image samples/pixel */
+ uint16 orientation; /* image orientation */
+ uint16 req_orientation; /* requested orientation */
+ uint16 photometric; /* image photometric interp */
+ uint16* redcmap; /* colormap pallete */
+ uint16* greencmap;
+ uint16* bluecmap;
+ /* get image data routine */
+ int (*get)(TIFFRGBAImage*, uint32*, uint32, uint32);
+ /* put decoded strip/tile */
union {
void (*any)(TIFFRGBAImage*);
- tileContigRoutine contig;
- tileSeparateRoutine separate;
- } put; /* put decoded strip/tile */
- TIFFRGBValue* Map; /* sample mapping array */
- uint32** BWmap; /* black&white map */
- uint32** PALmap; /* palette image map */
- TIFFYCbCrToRGB* ycbcr; /* YCbCr conversion state */
- TIFFCIELabToRGB* cielab; /* CIE L*a*b conversion state */
+ tileContigRoutine contig;
+ tileSeparateRoutine separate;
+ } put;
+ TIFFRGBValue* Map; /* sample mapping array */
+ uint32** BWmap; /* black&white map */
+ uint32** PALmap; /* palette image map */
+ TIFFYCbCrToRGB* ycbcr; /* YCbCr conversion state */
+ TIFFCIELabToRGB* cielab; /* CIE L*a*b conversion state */
- int row_offset;
- int col_offset;
+ int row_offset;
+ int col_offset;
};
/*
@@ -253,6 +251,10 @@
#define LOGLUV_PUBLIC 1
#endif
+#if !defined(__GNUC__) && !defined(__attribute__)
+# define __attribute__(x) /*nothing*/
+#endif
+
#if defined(c_plusplus) || defined(__cplusplus)
extern "C" {
#endif
@@ -349,6 +351,8 @@
size_t);
extern int TIFFReadEXIFDirectory(TIFF*, toff_t);
extern tsize_t TIFFScanlineSize(TIFF*);
+extern tsize_t TIFFOldScanlineSize(TIFF*);
+extern tsize_t TIFFNewScanlineSize(TIFF*);
extern tsize_t TIFFRasterScanlineSize(TIFF*);
extern tsize_t TIFFStripSize(TIFF*);
extern tsize_t TIFFRawStripSize(TIFF*, tstrip_t);
@@ -433,10 +437,10 @@
TIFFMapFileProc, TIFFUnmapFileProc);
extern const char* TIFFFileName(TIFF*);
extern const char* TIFFSetFileName(TIFF*, const char *);
-extern void TIFFError(const char*, const char*, ...);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list