Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: grahamboree/cppimage
base: ddad776a40
...
head fork: grahamboree/cppimage
compare: 8fb7ef62ef
  • 2 commits
  • 35 files changed
  • 0 commit comments
  • 1 contributor
Showing with 1,131 additions and 475 deletions.
  1. +5 −4 Source/cppimage/CxIOFile.h
  2. +2 −0  Source/cppimage/CxImage.h
  3. +3 −1 Source/cppimage/CxMath.cpp
  4. +1 −1  Source/cppimage/Types.h
  5. +9 −4 Source/cppimage/formatSpecific/ximabmp.cpp
  6. +1 −1  Source/cppimage/formatSpecific/ximagif.cpp
  7. +14 −2 Source/cppimage/formatSpecific/ximaico.cpp
  8. +1 −1  Source/cppimage/formatSpecific/ximajas.h
  9. +1 −1  Source/cppimage/formatSpecific/ximajbg.cpp
  10. +1 −1  Source/cppimage/formatSpecific/ximajbg.h
  11. +2 −2 Source/cppimage/formatSpecific/ximajpg.cpp
  12. +2 −2 Source/cppimage/formatSpecific/ximajpg.h
  13. +3 −3 Source/cppimage/formatSpecific/ximamng.h
  14. +1 −1  Source/cppimage/formatSpecific/ximapcx.cpp
  15. +1 −1  Source/cppimage/formatSpecific/ximapsd.h
  16. +4 −0 Source/cppimage/formatSpecific/ximaraw.cpp
  17. +1 −1  Source/cppimage/formatSpecific/ximaraw.h
  18. +1 −1  Source/cppimage/formatSpecific/ximatga.cpp
  19. +1 −1  Source/cppimage/formatSpecific/ximatif.cpp
  20. +1 −1  Source/cppimage/formatSpecific/ximatif.h
  21. +1 −1  Source/cppimage/formatSpecific/ximawbmp.cpp
  22. +4 −2 Source/cppimage/tif_xfile.cpp
  23. +16 −15 Source/cppimage/ximacfg.h
  24. +12 −12 Source/cppimage/ximaenc.cpp
  25. +1 −1  Source/cppimage/ximaint.cpp
  26. +1 −1  Source/cppimage/ximatran.cpp
  27. +158 −0 Source/jbig/jbig.xcodeproj/project.pbxproj
  28. +59 −0 Source/jbig/jbig.xcodeproj/xcuserdata/pentheny.xcuserdatad/xcschemes/jbig.xcscheme
  29. +22 −0 Source/jbig/jbig.xcodeproj/xcuserdata/pentheny.xcuserdatad/xcschemes/xcschememanagement.plist
  30. +73 −63 Source/tiff/tif_config.h
  31. +355 −350 Source/tiff/tiffiop.h
  32. +230 −0 Source/zlib/zlib.xcodeproj/project.pbxproj
  33. +22 −0 Source/zlib/zlib.xcodeproj/xcuserdata/pentheny.xcuserdatad/xcschemes/xcschememanagement.plist
  34. +59 −0 Source/zlib/zlib.xcodeproj/xcuserdata/pentheny.xcuserdatad/xcschemes/zlib.xcscheme
  35. +63 −1 cppimage.xcodeproj/project.pbxproj
View
9 Source/cppimage/CxIOFile.h
@@ -93,17 +93,18 @@ inline bool CxIOFile::Seek(int32_t offset, int32_t origin)
inline int32_t CxIOFile::Tell()
{
if (!m_fp) return 0;
- return ftell(m_fp);
+ return static_cast<int32_t>(ftell(m_fp));
}
//////////////////////////////////////////////////////////
inline int32_t CxIOFile::Size()
{
if (!m_fp) return -1;
- int32_t pos,size;
- pos = ftell(m_fp);
+ int32_t pos;
+ int32_t size;
+ pos = static_cast<int32_t>(ftell(m_fp));
fseek(m_fp, 0, SEEK_END);
- size = ftell(m_fp);
+ size = static_cast<int32_t>(ftell(m_fp));
fseek(m_fp, pos,SEEK_SET);
return size;
}
View
2  Source/cppimage/CxImage.h
@@ -795,8 +795,10 @@ class DLL_EXP CxImage
CxImage* GetLayer(int32_t position);
CxImage* GetParent() const;
int32_t GetNumLayers() const;
+#ifdef WIN32 //@HACK
int32_t LayerDrawAll(HDC hdc, int32_t x = 0, int32_t y = 0, int32_t cx = -1, int32_t cy = -1, RECT* pClipRect = 0, bool bSmooth = false);
int32_t LayerDrawAll(HDC hdc, const RECT& rect, RECT* pClipRect = NULL, bool bSmooth = false);
+#endif
//@}
#endif //CXIMAGE_SUPPORT_LAYERS
View
4 Source/cppimage/CxMath.cpp
@@ -1,5 +1,7 @@
+
+#include "CxMath.h"
+
#include "CxImage.h"
-#include "ximath.h"
#include <math.h>
//this module should contain some classes for geometrical transformations
View
2  Source/cppimage/Types.h
@@ -21,4 +21,4 @@
typedef unsigned char BYTE;
-typedef unsigned int DWORD;
+typedef unsigned int DWORD;
View
13 Source/cppimage/formatSpecific/ximabmp.cpp
@@ -9,7 +9,7 @@
#if CXIMAGE_SUPPORT_BMP
-#include "ximaiter.h"
+#include "CImageIterator.h"
////////////////////////////////////////////////////////////////////////////////
#if CXIMAGE_SUPPORT_ENCODE
@@ -142,9 +142,14 @@ bool CxImageBMP::Decode(CxFile * hFile)
hFile->Read(reinterpret_cast<void*>(pRgb), DibNumColors(&bmpHeader) * sizeof(RGBTRIPLE), 1);
for (int32_t i = DibNumColors(&head) - 1; i >= 0; i--)
{
- pRgb[i].rgbRed = (static_cast<RGBTRIPLE*>(pRgb))[i].rgbtRed;
- pRgb[i].rgbBlue = (static_cast<RGBTRIPLE*>(pRgb))[i].rgbtBlue;
- pRgb[i].rgbGreen = (static_cast<RGBTRIPLE*>(pRgb))[i].rgbtGreen;
+ pRgb[i].rgbRed = (reinterpret_cast<RGBTRIPLE*>(pRgb))[i].rgbtRed;
+ pRgb[i].rgbBlue = (reinterpret_cast<RGBTRIPLE*>(pRgb))[i].rgbtBlue;
+ pRgb[i].rgbGreen = (reinterpret_cast<RGBTRIPLE*>(pRgb))[i].rgbtGreen;
+ /*
+ pRgb[i].rgbRed = ((RGBTRIPLE*)(pRgb))[i].rgbtRed;
+ pRgb[i].rgbBlue = ((RGBTRIPLE*)(pRgb))[i].rgbtBlue;
+ pRgb[i].rgbGreen = ((RGBTRIPLE*)(pRgb))[i].rgbtGreen;
+ */
pRgb[i].rgbReserved = static_cast<uint8_t>(0);
}
}
View
2  Source/cppimage/formatSpecific/ximagif.cpp
@@ -9,7 +9,7 @@
#if CXIMAGE_SUPPORT_GIF
-#include "ximaiter.h"
+#include "CImageIterator.h"
#if defined (_WIN32_WCE)
#define assert(s)
View
16 Source/cppimage/formatSpecific/ximaico.cpp
@@ -322,7 +322,8 @@ bool CxImageICO::Encode(CxFile * hFile, bool bAppend, int32_t nPageCount)
int32_t nPages = nPageCount;
if (nPages<1) nPages = 1;
- ICONHEADER icon_header={0,1,nPages};
+ ICONHEADER icon_header={0,1,static_cast<uint16_t>(nPages)};
+ //ICONHEADER icon_header={0,1,nPages};
if (!bAppend)
m_dwImageOffset = sizeof(ICONHEADER) + nPages * sizeof(ICONDIRENTRY);
@@ -345,9 +346,20 @@ bool CxImageICO::Encode(CxFile * hFile, bool bAppend, int32_t nPageCount)
2*head.biHeight,
1,
(uint16_t)bitcount,
- 0, imagesize,
+ 0, static_cast<uint32_t>(imagesize),
0, 0, 0, 0
};
+ /*
+ BITMAPINFOHEADER bi={
+ sizeof(BITMAPINFOHEADER),
+ head.biWidth,
+ 2*head.biHeight,
+ 1,
+ (uint16_t)bitcount,
+ 0, imagesize,
+ 0, 0, 0, 0
+ };
+ */
#if CXIMAGE_SUPPORT_PNG // Vista icon support
CxImage png(*this);
View
2  Source/cppimage/formatSpecific/ximajas.h
@@ -19,7 +19,7 @@
#ifdef _LINUX
#include <jasper/jasper.h>
#else
- #include "../jasper/include/jasper/jasper.h"
+ #include "../../jasper/include/jasper/jasper.h"
#endif
class CxImageJAS: public CxImage
View
2  Source/cppimage/formatSpecific/ximajbg.cpp
@@ -9,7 +9,7 @@
#if CXIMAGE_SUPPORT_JBG
-#include "ximaiter.h"
+#include "CImageIterator.h"
#define JBIG_BUFSIZE 8192
View
2  Source/cppimage/formatSpecific/ximajbg.h
@@ -17,7 +17,7 @@
#if CXIMAGE_SUPPORT_JBG
extern "C" {
-#include "../jbig/jbig.h"
+#include "../../jbig/jbig.h"
};
class CxImageJBG: public CxImage
View
4 Source/cppimage/formatSpecific/ximajpg.cpp
@@ -12,10 +12,10 @@
#ifdef _LINUX
#include <jmorecfg.h>
#else
- #include "../jpeg/jmorecfg.h"
+ #include "../../jpeg/jmorecfg.h"
#endif
-#include "ximaiter.h"
+#include "CImageIterator.h"
#include <setjmp.h>
View
4 Source/cppimage/formatSpecific/ximajpg.h
@@ -33,8 +33,8 @@ extern "C" {
#include <jpeglib.h>
#include <jerror.h>
#else
- #include "../jpeg/jpeglib.h"
- #include "../jpeg/jerror.h"
+ #include "../../jpeg/jpeglib.h"
+ #include "../../jpeg/jerror.h"
#endif
}
View
6 Source/cppimage/formatSpecific/ximamng.h
@@ -31,9 +31,9 @@
#define MNG_STORE_CHUNKS
extern "C" {
-#include "../mng/libmng.h"
-#include "../mng/libmng_data.h"
-#include "../mng/libmng_error.h"
+#include "../../mng/libmng.h"
+#include "../../mng/libmng_data.h"
+#include "../../mng/libmng_error.h"
}
//uint32_t _stdcall RunMNGThread(void *lpParam);
View
2  Source/cppimage/formatSpecific/ximapcx.cpp
@@ -13,7 +13,7 @@
#if CXIMAGE_SUPPORT_PCX
-#include "xmemfile.h"
+#include "CxMemFile.h"
#define PCX_MAGIC 0X0A // PCX magic number
#define PCX_256_COLORS 0X0C // magic number for 256 colors
View
2  Source/cppimage/formatSpecific/ximapsd.h
@@ -21,7 +21,7 @@
#if CXIMAGE_USE_LIBPSD
extern "C" {
- #include "../libpsd/libpsd.h"
+ #include "../../libpsd/libpsd.h"
}
#endif
View
4 Source/cppimage/formatSpecific/ximaraw.cpp
@@ -269,7 +269,11 @@ bool CxImageRAW::GetExifThumbnail(const TCHAR *filename, const TCHAR *outname, i
// THUMB.
if (dcr.thumb_offset != 0)
{
+#ifdef WIN32
FILE* file = _tfopen(outname, _T("wb"));
+#else
+ FILE* file = fopen(outname, _T("wb"));
+#endif
DCRAW* p = &dcr;
dcr_fseek(dcr.obj_, dcr.thumb_offset, SEEK_SET);
dcr.write_thumb(&dcr, file);
View
2  Source/cppimage/formatSpecific/ximaraw.h
@@ -21,7 +21,7 @@
#if CXIMAGE_SUPPORT_RAW
extern "C" {
- #include "../raw/libdcr.h"
+ #include "../../raw/libdcr.h"
}
class CxImageRAW: public CxImage
View
2  Source/cppimage/formatSpecific/ximatga.cpp
@@ -9,7 +9,7 @@
#if CXIMAGE_SUPPORT_TGA
-#include "ximaiter.h"
+#include "CImageIterator.h"
// Definitions for image types.
#define TGA_Null 0
View
2  Source/cppimage/formatSpecific/ximatif.cpp
@@ -11,7 +11,7 @@
#define FIX_16BPP_DARKIMG // + VK: if uncomment, dark 16bpp images are fixed
-#include "../tiff/tiffio.h"
+#include "../../tiff/tiffio.h"
#define CVT(x) (((x) * 255L) / ((1L<<16)-1))
#define SCALE(x) (((x)*((1L<<16)-1))/255)
View
2  Source/cppimage/formatSpecific/ximatif.h
@@ -23,7 +23,7 @@
#if CXIMAGE_SUPPORT_TIF
-#include "../tiff/tiffio.h"
+#include "../../tiff/tiffio.h"
class DLL_EXP CxImageTIF: public CxImage
{
View
2  Source/cppimage/formatSpecific/ximawbmp.cpp
@@ -9,7 +9,7 @@
#if CXIMAGE_SUPPORT_WBMP
-#include "ximaiter.h"
+#include "CImageIterator.h"
////////////////////////////////////////////////////////////////////////////////
#if CXIMAGE_SUPPORT_DECODE
View
6 Source/cppimage/tif_xfile.cpp
@@ -14,7 +14,7 @@
# include "../tiff/tiffiop.h"
# include "../tiff/tiffvers.h"
-# include "xfile.h"
+# include "CxFile.h"
//////////////////////////////////////////////////////////////////////////
static tsize_t _tiffReadProcEx(thandle_t fd, tdata_t buf, tsize_t size)
@@ -98,7 +98,9 @@ TIFF* _TIFFFdOpen(void* fd, const char* name, const char* mode)
_tiffSizeProcEx, _tiffMapProcEx, _tiffUnmapProcEx);
if (tif)
{
- tif->tif_fd = (int)fd;
+ tif->tif_fd = static_cast<int>(reinterpret_cast<long>(fd));
+ //@HACK
+ //tif->tif_fd = (int)fd;
}
return (tif);
}
View
31 Source/cppimage/ximacfg.h
@@ -6,27 +6,28 @@
#define CXIMAGE_SUPPORT_SELECTION 1
#define CXIMAGE_SUPPORT_TRANSFORMATION 1
#define CXIMAGE_SUPPORT_DSP 1
-#define CXIMAGE_SUPPORT_LAYERS 0
+#define CXIMAGE_SUPPORT_LAYERS 1
#define CXIMAGE_SUPPORT_INTERPOLATION 1
#define CXIMAGE_SUPPORT_DECODE 1
#define CXIMAGE_SUPPORT_ENCODE 1 //<vho><T.Peck>
#define CXIMAGE_SUPPORT_WINDOWS 1
-#define CXIMAGE_SUPPORT_EXIF 0
+#define CXIMAGE_SUPPORT_EXIF 1
/////////////////////////////////////////////////////////////////////////////
// CxImage supported formats
-#define CXIMAGE_SUPPORT_BMP 0
-#define CXIMAGE_SUPPORT_GIF 0
-#define CXIMAGE_SUPPORT_JPG 0
+#define CXIMAGE_SUPPORT_BMP 1
+#define CXIMAGE_SUPPORT_GIF 1
+#define CXIMAGE_SUPPORT_JPG 1
#define CXIMAGE_SUPPORT_PNG 1
-#define CXIMAGE_SUPPORT_ICO 0
-#define CXIMAGE_SUPPORT_TIF 0
-#define CXIMAGE_SUPPORT_TGA 0
-#define CXIMAGE_SUPPORT_PCX 0
-#define CXIMAGE_SUPPORT_WBMP 0
-#define CXIMAGE_SUPPORT_WMF 0
-
+#define CXIMAGE_SUPPORT_ICO 1
+#define CXIMAGE_SUPPORT_TIF 1
+#define CXIMAGE_SUPPORT_TGA 1
+#define CXIMAGE_SUPPORT_PCX 1
+#define CXIMAGE_SUPPORT_WBMP 1
+#define CXIMAGE_SUPPORT_WMF 1
+
+// Jasper files
#define CXIMAGE_SUPPORT_JP2 0
#define CXIMAGE_SUPPORT_JPC 0
#define CXIMAGE_SUPPORT_PGX 0
@@ -36,9 +37,9 @@
#define CXIMAGE_SUPPORT_JBG 0 // GPL'd see ../jbig/copying.txt & ../jbig/patents.htm
#define CXIMAGE_SUPPORT_MNG 0
-#define CXIMAGE_SUPPORT_SKA 0
-#define CXIMAGE_SUPPORT_RAW 0
-#define CXIMAGE_SUPPORT_PSD 0
+#define CXIMAGE_SUPPORT_SKA 1
+#define CXIMAGE_SUPPORT_RAW 1
+#define CXIMAGE_SUPPORT_PSD 1
/////////////////////////////////////////////////////////////////////////////
#define CXIMAGE_MAX_MEMORY 268435456
View
24 Source/cppimage/ximaenc.cpp
@@ -965,7 +965,7 @@ bool CxImage::Decode(CxFile* hFile, uint32_t imagetype)
strcpy(info.szLastError, newima->GetLastError());
hFile->Seek(pos, SEEK_SET);
delete newima;
- if (CXIMAGE_FORMAT_UNKNOWN! = imagetype)
+ if (CXIMAGE_FORMAT_UNKNOWN != imagetype)
{
return false;
}
@@ -991,7 +991,7 @@ bool CxImage::Decode(CxFile* hFile, uint32_t imagetype)
strcpy(info.szLastError, newima->GetLastError());
hFile->Seek(pos, SEEK_SET);
delete newima;
- if (CXIMAGE_FORMAT_UNKNOWN! = imagetype)
+ if (CXIMAGE_FORMAT_UNKNOWN != imagetype)
{
return false;
}
@@ -1042,7 +1042,7 @@ bool CxImage::Decode(CxFile* hFile, uint32_t imagetype)
strcpy(info.szLastError, newima->GetLastError());
hFile->Seek(pos, SEEK_SET);
delete newima;
- if (CXIMAGE_FORMAT_UNKNOWN! = imagetype)
+ if (CXIMAGE_FORMAT_UNKNOWN != imagetype)
{
return false;
}
@@ -1068,7 +1068,7 @@ bool CxImage::Decode(CxFile* hFile, uint32_t imagetype)
strcpy(info.szLastError, newima->GetLastError());
hFile->Seek(pos, SEEK_SET);
delete newima;
- if (CXIMAGE_FORMAT_UNKNOWN! = imagetype)
+ if (CXIMAGE_FORMAT_UNKNOWN != imagetype)
{
return false;
}
@@ -1093,7 +1093,7 @@ bool CxImage::Decode(CxFile* hFile, uint32_t imagetype)
strcpy(info.szLastError, newima->GetLastError());
hFile->Seek(pos, SEEK_SET);
delete newima;
- if (CXIMAGE_FORMAT_UNKNOWN! = imagetype)
+ if (CXIMAGE_FORMAT_UNKNOWN != imagetype)
{
return false;
}
@@ -1118,7 +1118,7 @@ bool CxImage::Decode(CxFile* hFile, uint32_t imagetype)
strcpy(info.szLastError, newima->GetLastError());
hFile->Seek(pos, SEEK_SET);
delete newima;
- if (CXIMAGE_FORMAT_UNKNOWN! = imagetype)
+ if (CXIMAGE_FORMAT_UNKNOWN != imagetype)
{
return false;
}
@@ -1143,7 +1143,7 @@ bool CxImage::Decode(CxFile* hFile, uint32_t imagetype)
strcpy(info.szLastError, newima->GetLastError());
hFile->Seek(pos, SEEK_SET);
delete newima;
- if (CXIMAGE_FORMAT_UNKNOWN! = imagetype)
+ if (CXIMAGE_FORMAT_UNKNOWN != imagetype)
{
return false;
}
@@ -1168,7 +1168,7 @@ bool CxImage::Decode(CxFile* hFile, uint32_t imagetype)
strcpy(info.szLastError, newima->GetLastError());
hFile->Seek(pos, SEEK_SET);
delete newima;
- if (CXIMAGE_FORMAT_UNKNOWN! = imagetype)
+ if (CXIMAGE_FORMAT_UNKNOWN != imagetype)
{
return false;
}
@@ -1193,7 +1193,7 @@ bool CxImage::Decode(CxFile* hFile, uint32_t imagetype)
strcpy(info.szLastError, newima->GetLastError());
hFile->Seek(pos, SEEK_SET);
delete newima;
- if (CXIMAGE_FORMAT_UNKNOWN! = imagetype)
+ if (CXIMAGE_FORMAT_UNKNOWN != imagetype)
{
return false;
}
@@ -1259,7 +1259,7 @@ bool CxImage::Decode(CxFile* hFile, uint32_t imagetype)
strcpy(info.szLastError, newima->GetLastError());
hFile->Seek(pos, SEEK_SET);
delete newima;
- if (CXIMAGE_FORMAT_UNKNOWN! = imagetype)
+ if (CXIMAGE_FORMAT_UNKNOWN != imagetype)
{
return false;
}
@@ -1284,7 +1284,7 @@ bool CxImage::Decode(CxFile* hFile, uint32_t imagetype)
strcpy(info.szLastError, newima->GetLastError());
hFile->Seek(pos, SEEK_SET);
delete newima;
- if (CXIMAGE_FORMAT_UNKNOWN! = imagetype)
+ if (CXIMAGE_FORMAT_UNKNOWN != imagetype)
{
return false;
}
@@ -1309,7 +1309,7 @@ bool CxImage::Decode(CxFile* hFile, uint32_t imagetype)
strcpy(info.szLastError, newima->GetLastError());
hFile->Seek(pos, SEEK_SET);
delete newima;
- if (CXIMAGE_FORMAT_UNKNOWN! = imagetype)
+ if (CXIMAGE_FORMAT_UNKNOWN != imagetype)
{
return false;
}
View
2  Source/cppimage/ximaint.cpp
@@ -4,7 +4,7 @@
*/
#include "CxImage.h"
-#include "ximath.h"
+#include "CxMath.h"
#if CXIMAGE_SUPPORT_INTERPOLATION
View
2  Source/cppimage/ximatran.cpp
@@ -4,7 +4,7 @@
*/
#include "CxImage.h"
-#include "ximath.h"
+#include "CxMath.h"
#if CXIMAGE_SUPPORT_BASICTRANSFORMATIONS
////////////////////////////////////////////////////////////////////////////////
View
158 Source/jbig/jbig.xcodeproj/project.pbxproj
@@ -0,0 +1,158 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 46;
+ objects = {
+
+/* Begin PBXFileReference section */
+ C92685F71622077700D4EB54 /* copying.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = copying.txt; sourceTree = "<group>"; };
+ C92685F81622077800D4EB54 /* jbig.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = jbig.c; sourceTree = "<group>"; };
+ C92685F91622077800D4EB54 /* jbig.doc */ = {isa = PBXFileReference; lastKnownFileType = text; path = jbig.doc; sourceTree = "<group>"; };
+ C92685FA1622077800D4EB54 /* jbig.dsp */ = {isa = PBXFileReference; lastKnownFileType = text; path = jbig.dsp; sourceTree = "<group>"; };
+ C92685FB1622077800D4EB54 /* jbig.dsw */ = {isa = PBXFileReference; lastKnownFileType = text; path = jbig.dsw; sourceTree = "<group>"; };
+ C92685FC1622077800D4EB54 /* jbig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = jbig.h; sourceTree = "<group>"; };
+ C92685FD1622077800D4EB54 /* jbig.vcproj */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = jbig.vcproj; sourceTree = "<group>"; };
+ C92685FE1622077800D4EB54 /* jbig_tab.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = jbig_tab.c; sourceTree = "<group>"; };
+ C92685FF1622077800D4EB54 /* jbig_wince.sln */ = {isa = PBXFileReference; lastKnownFileType = text; path = jbig_wince.sln; sourceTree = "<group>"; };
+ C92686001622077800D4EB54 /* jbig_wince.vcproj */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = jbig_wince.vcproj; sourceTree = "<group>"; };
+ C92686011622077800D4EB54 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+ C92686021622077800D4EB54 /* patents.htm */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = patents.htm; sourceTree = "<group>"; };
+ C92686031622077800D4EB54 /* tstcodec.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = tstcodec.c; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXGroup section */
+ C92685EF1622077700D4EB54 = {
+ isa = PBXGroup;
+ children = (
+ C92685F71622077700D4EB54 /* copying.txt */,
+ C92685F81622077800D4EB54 /* jbig.c */,
+ C92685F91622077800D4EB54 /* jbig.doc */,
+ C92685FA1622077800D4EB54 /* jbig.dsp */,
+ C92685FB1622077800D4EB54 /* jbig.dsw */,
+ C92685FC1622077800D4EB54 /* jbig.h */,
+ C92685FD1622077800D4EB54 /* jbig.vcproj */,
+ C92685FE1622077800D4EB54 /* jbig_tab.c */,
+ C92685FF1622077800D4EB54 /* jbig_wince.sln */,
+ C92686001622077800D4EB54 /* jbig_wince.vcproj */,
+ C92686011622077800D4EB54 /* Makefile */,
+ C92686021622077800D4EB54 /* patents.htm */,
+ C92686031622077800D4EB54 /* tstcodec.c */,
+ );
+ sourceTree = "<group>";
+ };
+/* End PBXGroup section */
+
+/* Begin PBXLegacyTarget section */
+ C92685F61622077700D4EB54 /* jbig */ = {
+ isa = PBXLegacyTarget;
+ buildArgumentsString = "$(ACTION)";
+ buildConfigurationList = C92686041622077800D4EB54 /* Build configuration list for PBXLegacyTarget "jbig" */;
+ buildPhases = (
+ );
+ buildToolPath = /usr/bin/make;
+ buildWorkingDirectory = /Users/pentheny/Documents/workspace/cppimage/Source/jbig;
+ dependencies = (
+ );
+ name = jbig;
+ passBuildSettingsInEnvironment = 1;
+ productName = jbig;
+ };
+/* End PBXLegacyTarget section */
+
+/* Begin PBXProject section */
+ C92685F11622077700D4EB54 /* Project object */ = {
+ isa = PBXProject;
+ buildConfigurationList = C92685F41622077700D4EB54 /* Build configuration list for PBXProject "jbig" */;
+ compatibilityVersion = "Xcode 3.2";
+ developmentRegion = English;
+ hasScannedForEncodings = 0;
+ knownRegions = (
+ en,
+ );
+ mainGroup = C92685EF1622077700D4EB54;
+ projectDirPath = "";
+ projectRoot = "";
+ targets = (
+ C92685F61622077700D4EB54 /* jbig */,
+ );
+ };
+/* End PBXProject section */
+
+/* Begin XCBuildConfiguration section */
+ C92685F21622077700D4EB54 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ COPY_PHASE_STRIP = NO;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ ONLY_ACTIVE_ARCH = YES;
+ SDKROOT = macosx10.6;
+ };
+ name = Debug;
+ };
+ C92685F31622077700D4EB54 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ COPY_PHASE_STRIP = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ SDKROOT = macosx10.6;
+ };
+ name = Release;
+ };
+ C92686051622077800D4EB54 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
+ DEBUGGING_SYMBOLS = YES;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ OTHER_CFLAGS = "";
+ OTHER_LDFLAGS = "";
+ PRODUCT_NAME = jbig;
+ };
+ name = Debug;
+ };
+ C92686061622077800D4EB54 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ OTHER_CFLAGS = "";
+ OTHER_LDFLAGS = "";
+ PRODUCT_NAME = jbig;
+ };
+ name = Release;
+ };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+ C92685F41622077700D4EB54 /* Build configuration list for PBXProject "jbig" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ C92685F21622077700D4EB54 /* Debug */,
+ C92685F31622077700D4EB54 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ C92686041622077800D4EB54 /* Build configuration list for PBXLegacyTarget "jbig" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ C92686051622077800D4EB54 /* Debug */,
+ C92686061622077800D4EB54 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+/* End XCConfigurationList section */
+ };
+ rootObject = C92685F11622077700D4EB54 /* Project object */;
+}
View
59 Source/jbig/jbig.xcodeproj/xcuserdata/pentheny.xcuserdatad/xcschemes/jbig.xcscheme
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "0440"
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "C92685F61622077700D4EB54"
+ BuildableName = "jbig"
+ BlueprintName = "jbig"
+ ReferencedContainer = "container:jbig.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ buildConfiguration = "Debug">
+ <Testables>
+ </Testables>
+ </TestAction>
+ <LaunchAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Debug"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
+ <AdditionalOptions>
+ </AdditionalOptions>
+ </LaunchAction>
+ <ProfileAction
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
View
22 ...ce/jbig/jbig.xcodeproj/xcuserdata/pentheny.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>SchemeUserState</key>
+ <dict>
+ <key>jbig.xcscheme</key>
+ <dict>
+ <key>orderHint</key>
+ <integer>1</integer>
+ </dict>
+ </dict>
+ <key>SuppressBuildableAutocreation</key>
+ <dict>
+ <key>C92685F61622077700D4EB54</key>
+ <dict>
+ <key>primary</key>
+ <true/>
+ </dict>
+ </dict>
+</dict>
+</plist>
View
136 Source/tiff/tif_config.h
@@ -1,63 +1,73 @@
-/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define as 0 or 1 according to the floating point format suported by the
- machine */
-#define HAVE_IEEEFP 1
-
-/* Define to 1 if you have the `jbg_newlen' function. */
-#define HAVE_JBG_NEWLEN 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <io.h> header file. */
-#define HAVE_IO_H 1
-
-/* Define to 1 if you have the <search.h> header file. */
-#define HAVE_SEARCH_H 1
-
-/* Define to 1 if you have the `setmode' function. */
-#define HAVE_SETMODE 1
-
-/* The size of a `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* Signed 64-bit type */
-#define TIFF_INT64_T signed __int64
-
-/* Unsigned 64-bit type */
-#define TIFF_UINT64_T unsigned __int64
-
-/* Set the native cpu bit order */
-#define HOST_FILLORDER FILLORDER_LSB2MSB
-
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-# ifndef inline
-# define inline __inline
-# endif
-#endif
-
-#define lfind _lfind
-/*
- * Local Variables:
- * mode: c
- * c-basic-offset: 8
- * fill-column: 78
- * End:
- */
+/* Define to 1 if you have the <assert.h> header file. */
+#define HAVE_ASSERT_H 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define as 0 or 1 according to the floating point format suported by the
+ machine */
+#define HAVE_IEEEFP 1
+
+/* Define to 1 if you have the `jbg_newlen' function. */
+#define HAVE_JBG_NEWLEN 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <io.h> header file. */
+#define HAVE_IO_H 1
+
+/* Define to 1 if you have the <search.h> header file. */
+#define HAVE_SEARCH_H 1
+
+/* Define to 1 if you have the `setmode' function. */
+#define HAVE_SETMODE 1
+
+/* The size of a `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of a `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* Signed 64-bit type */
+//#define TIFF_INT64_T signed __int64
+#ifdef WIN32
+typedef __int64 TIFF_INT64_T;
+#else
+typedef __int64_t TIFF_INT64_T;
+#endif
+
+/* Unsigned 64-bit type */
+//#define TIFF_UINT64_T unsigned __int64
+#ifdef WIN32
+typedef __uint64 TIFF_UINT64_T;
+#else
+typedef __uint64_t TIFF_UINT64_T;
+#endif
+
+/* Set the native cpu bit order */
+#define HOST_FILLORDER FILLORDER_LSB2MSB
+
+/* Define to 1 if your processor stores words with the most significant byte
+ first (like Motorola and SPARC, unlike Intel and VAX). */
+/* #undef WORDS_BIGENDIAN */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
+#ifndef __cplusplus
+# ifndef inline
+# define inline __inline
+# endif
+#endif
+
+#define lfind _lfind
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 8
+ * fill-column: 78
+ * End:
+ */
View
705 Source/tiff/tiffiop.h
@@ -1,350 +1,355 @@
-/* $Id: tiffiop.h,v 1.51.2.6 2010-06-12 02:55:16 bfriesen Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#ifndef _TIFFIOP_
-#define _TIFFIOP_
-/*
- * ``Library-private'' definitions.
- */
-
-#include "tif_config.h"
-
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-
-#ifdef HAVE_ASSERT_H
-# include <assert.h>
-#else
-# define assert(x)
-#endif
-
-#ifdef HAVE_SEARCH_H
-# include <search.h>
-#else
-extern void *lfind(const void *, const void *, size_t *, size_t,
- int (*)(const void *, const void *));
-#endif
-
-/*
- Libtiff itself does not require a 64-bit type, but bundled TIFF
- utilities may use it.
-*/
-typedef TIFF_INT64_T int64;
-typedef TIFF_UINT64_T uint64;
-
-#include "tiffio.h"
-#include "tif_dir.h"
-
-#ifndef STRIP_SIZE_DEFAULT
-# define STRIP_SIZE_DEFAULT 8192
-#endif
-
-#define streq(a,b) (strcmp(a,b) == 0)
-
-#ifndef TRUE
-#define TRUE 1
-#define FALSE 0
-#endif
-
-typedef struct client_info {
- struct client_info *next;
- void *data;
- char *name;
-} TIFFClientInfoLink;
-
-/*
- * Typedefs for ``method pointers'' used internally.
- */
-typedef unsigned char tidataval_t; /* internal image data value type */
-typedef tidataval_t* tidata_t; /* reference to internal image data */
-
-typedef void (*TIFFVoidMethod)(TIFF*);
-typedef int (*TIFFBoolMethod)(TIFF*);
-typedef int (*TIFFPreMethod)(TIFF*, tsample_t);
-typedef int (*TIFFCodeMethod)(TIFF*, tidata_t, tsize_t, tsample_t);
-typedef int (*TIFFSeekMethod)(TIFF*, uint32);
-typedef void (*TIFFPostMethod)(TIFF*, tidata_t, tsize_t);
-typedef uint32 (*TIFFStripMethod)(TIFF*, uint32);
-typedef void (*TIFFTileMethod)(TIFF*, uint32*, uint32*);
-
-struct tiff {
- char* tif_name; /* name of open file */
- int tif_fd; /* open file descriptor */
- int tif_mode; /* open mode (O_*) */
- uint32 tif_flags;
-#define TIFF_FILLORDER 0x00003 /* natural bit fill order for machine */
-#define TIFF_DIRTYHEADER 0x00004 /* header must be written on close */
-#define TIFF_DIRTYDIRECT 0x00008 /* current directory must be written */
-#define TIFF_BUFFERSETUP 0x00010 /* data buffers setup */
-#define TIFF_CODERSETUP 0x00020 /* encoder/decoder setup done */
-#define TIFF_BEENWRITING 0x00040 /* written 1+ scanlines to file */
-#define TIFF_SWAB 0x00080 /* byte swap file information */
-#define TIFF_NOBITREV 0x00100 /* inhibit bit reversal logic */
-#define TIFF_MYBUFFER 0x00200 /* my raw data buffer; free on close */
-#define TIFF_ISTILED 0x00400 /* file is tile, not strip- based */
-#define TIFF_MAPPED 0x00800 /* file is mapped into memory */
-#define TIFF_POSTENCODE 0x01000 /* need call to postencode routine */
-#define TIFF_INSUBIFD 0x02000 /* currently writing a subifd */
-#define TIFF_UPSAMPLED 0x04000 /* library is doing data up-sampling */
-#define TIFF_STRIPCHOP 0x08000 /* enable strip chopping support */
-#define TIFF_HEADERONLY 0x10000 /* read header only, do not process */
- /* the first directory */
-#define TIFF_NOREADRAW 0x20000 /* skip reading of raw uncompressed */
- /* image data */
-#define TIFF_INCUSTOMIFD 0x40000 /* currently writing a custom IFD */
- toff_t tif_diroff; /* file offset of current directory */
- toff_t tif_nextdiroff; /* file offset of following directory */
- toff_t* tif_dirlist; /* list of offsets to already seen */
- /* directories to prevent IFD looping */
- tsize_t tif_dirlistsize;/* number of entires in offset list */
- uint16 tif_dirnumber; /* number of already seen directories */
- TIFFDirectory tif_dir; /* internal rep of current directory */
- TIFFDirectory tif_customdir; /* custom IFDs are separated from
- the main ones */
- TIFFHeader tif_header; /* file's header block */
- const int* tif_typeshift; /* data type shift counts */
- const long* tif_typemask; /* data type masks */
- uint32 tif_row; /* current scanline */
- tdir_t tif_curdir; /* current directory (index) */
- tstrip_t tif_curstrip; /* current strip for read/write */
- toff_t tif_curoff; /* current offset for read/write */
- toff_t tif_dataoff; /* current offset for writing dir */
-/* SubIFD support */
- uint16 tif_nsubifd; /* remaining subifds to write */
- toff_t tif_subifdoff; /* offset for patching SubIFD link */
-/* tiling support */
- uint32 tif_col; /* current column (offset by row too) */
- ttile_t tif_curtile; /* current tile for read/write */
- tsize_t tif_tilesize; /* # of bytes in a tile */
-/* compression scheme hooks */
- int tif_decodestatus;
- TIFFBoolMethod tif_setupdecode;/* called once before predecode */
- TIFFPreMethod tif_predecode; /* pre- row/strip/tile decoding */
- TIFFBoolMethod tif_setupencode;/* called once before preencode */
- int tif_encodestatus;
- TIFFPreMethod tif_preencode; /* pre- row/strip/tile encoding */
- TIFFBoolMethod tif_postencode; /* post- row/strip/tile encoding */
- TIFFCodeMethod tif_decoderow; /* scanline decoding routine */
- TIFFCodeMethod tif_encoderow; /* scanline encoding routine */
- TIFFCodeMethod tif_decodestrip;/* strip decoding routine */
- TIFFCodeMethod tif_encodestrip;/* strip encoding routine */
- TIFFCodeMethod tif_decodetile; /* tile decoding routine */
- TIFFCodeMethod tif_encodetile; /* tile encoding routine */
- TIFFVoidMethod tif_close; /* cleanup-on-close routine */
- TIFFSeekMethod tif_seek; /* position within a strip routine */
- TIFFVoidMethod tif_cleanup; /* cleanup state routine */
- TIFFStripMethod tif_defstripsize;/* calculate/constrain strip size */
- TIFFTileMethod tif_deftilesize;/* calculate/constrain tile size */
- tidata_t tif_data; /* compression scheme private data */
-/* input/output buffering */
- tsize_t tif_scanlinesize;/* # of bytes in a scanline */
- tsize_t tif_scanlineskew;/* scanline skew for reading strips */
- tidata_t tif_rawdata; /* raw data buffer */
- tsize_t tif_rawdatasize;/* # of bytes in raw data buffer */
- tidata_t tif_rawcp; /* current spot in raw buffer */
- tsize_t tif_rawcc; /* bytes unread from raw buffer */
-/* memory-mapped file support */
- tidata_t tif_base; /* base of mapped file */
- toff_t tif_size; /* size of mapped file region (bytes)
- FIXME: it should be tsize_t */
- TIFFMapFileProc tif_mapproc; /* map file method */
- TIFFUnmapFileProc tif_unmapproc;/* unmap file method */
-/* input/output callback methods */
- thandle_t tif_clientdata; /* callback parameter */
- TIFFReadWriteProc tif_readproc; /* read method */
- TIFFReadWriteProc tif_writeproc;/* write method */
- TIFFSeekProc tif_seekproc; /* lseek method */
- TIFFCloseProc tif_closeproc; /* close method */
- TIFFSizeProc tif_sizeproc; /* filesize method */
-/* post-decoding support */
- TIFFPostMethod tif_postdecode; /* post decoding routine */
-/* tag support */
- TIFFFieldInfo** tif_fieldinfo; /* sorted table of registered tags */
- size_t tif_nfields; /* # entries in registered tag table */
- const TIFFFieldInfo *tif_foundfield;/* cached pointer to already found tag */
- TIFFTagMethods tif_tagmethods; /* tag get/set/print routines */
- TIFFClientInfoLink *tif_clientinfo; /* extra client information. */
-};
-
-#define isPseudoTag(t) (t > 0xffff) /* is tag value normal or pseudo */
-
-#define isTiled(tif) (((tif)->tif_flags & TIFF_ISTILED) != 0)
-#define isMapped(tif) (((tif)->tif_flags & TIFF_MAPPED) != 0)
-#define isFillOrder(tif, o) (((tif)->tif_flags & (o)) != 0)
-#define isUpSampled(tif) (((tif)->tif_flags & TIFF_UPSAMPLED) != 0)
-#define TIFFReadFile(tif, buf, size) \
- ((*(tif)->tif_readproc)((tif)->tif_clientdata,buf,size))
-#define TIFFWriteFile(tif, buf, size) \
- ((*(tif)->tif_writeproc)((tif)->tif_clientdata,buf,size))
-#define TIFFSeekFile(tif, off, whence) \
- ((*(tif)->tif_seekproc)((tif)->tif_clientdata,(toff_t)(off),whence))
-#define TIFFCloseFile(tif) \
- ((*(tif)->tif_closeproc)((tif)->tif_clientdata))
-#define TIFFGetFileSize(tif) \
- ((*(tif)->tif_sizeproc)((tif)->tif_clientdata))
-#define TIFFMapFileContents(tif, paddr, psize) \
- ((*(tif)->tif_mapproc)((tif)->tif_clientdata,paddr,psize))
-#define TIFFUnmapFileContents(tif, addr, size) \
- ((*(tif)->tif_unmapproc)((tif)->tif_clientdata,addr,size))
-
-/*
- * Default Read/Seek/Write definitions.
- */
-#ifndef ReadOK
-#define ReadOK(tif, buf, size) \
- (TIFFReadFile(tif, (tdata_t) buf, (tsize_t)(size)) == (tsize_t)(size))
-#endif
-#ifndef SeekOK
-#define SeekOK(tif, off) \
- (TIFFSeekFile(tif, (toff_t) off, SEEK_SET) == (toff_t) off)
-#endif
-#ifndef WriteOK
-#define WriteOK(tif, buf, size) \
- (TIFFWriteFile(tif, (tdata_t) buf, (tsize_t) size) == (tsize_t) size)
-#endif
-
-/* NB: the uint32 casts are to silence certain ANSI-C compilers */
-#define TIFFhowmany(x, y) (((uint32)x < (0xffffffff - (uint32)(y-1))) ? \
- ((((uint32)(x))+(((uint32)(y))-1))/((uint32)(y))) : \
- 0U)
-#define TIFFhowmany8(x) (((x)&0x07)?((uint32)(x)>>3)+1:(uint32)(x)>>3)
-#define TIFFroundup(x, y) (TIFFhowmany(x,y)*(y))
-
-/* Safe multiply which returns zero if there is an integer overflow */
-#define TIFFSafeMultiply(t,v,m) ((((t)m != (t)0) && (((t)((v*m)/m)) == (t)v)) ? (t)(v*m) : (t)0)
-
-#define TIFFmax(A,B) ((A)>(B)?(A):(B))
-#define TIFFmin(A,B) ((A)<(B)?(A):(B))
-
-#define TIFFArrayCount(a) (sizeof (a) / sizeof ((a)[0]))
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-extern int _TIFFgetMode(const char*, const char*);
-extern int _TIFFNoRowEncode(TIFF*, tidata_t, tsize_t, tsample_t);
-extern int _TIFFNoStripEncode(TIFF*, tidata_t, tsize_t, tsample_t);
-extern int _TIFFNoTileEncode(TIFF*, tidata_t, tsize_t, tsample_t);
-extern int _TIFFNoRowDecode(TIFF*, tidata_t, tsize_t, tsample_t);
-extern int _TIFFNoStripDecode(TIFF*, tidata_t, tsize_t, tsample_t);
-extern int _TIFFNoTileDecode(TIFF*, tidata_t, tsize_t, tsample_t);
-extern void _TIFFNoPostDecode(TIFF*, tidata_t, tsize_t);
-extern int _TIFFNoPreCode (TIFF*, tsample_t);
-extern int _TIFFNoSeek(TIFF*, uint32);
-extern void _TIFFSwab16BitData(TIFF*, tidata_t, tsize_t);
-extern void _TIFFSwab24BitData(TIFF*, tidata_t, tsize_t);
-extern void _TIFFSwab32BitData(TIFF*, tidata_t, tsize_t);
-extern void _TIFFSwab64BitData(TIFF*, tidata_t, tsize_t);
-extern int TIFFFlushData1(TIFF*);
-extern int TIFFDefaultDirectory(TIFF*);
-extern void _TIFFSetDefaultCompressionState(TIFF*);
-extern int TIFFSetCompressionScheme(TIFF*, int);
-extern int TIFFSetDefaultCompressionState(TIFF*);
-extern uint32 _TIFFDefaultStripSize(TIFF*, uint32);
-extern void _TIFFDefaultTileSize(TIFF*, uint32*, uint32*);
-extern int _TIFFDataSize(TIFFDataType);
-
-extern void _TIFFsetByteArray(void**, void*, uint32);
-extern void _TIFFsetString(char**, char*);
-extern void _TIFFsetShortArray(uint16**, uint16*, uint32);
-extern void _TIFFsetLongArray(uint32**, uint32*, uint32);
-extern void _TIFFsetFloatArray(float**, float*, uint32);
-extern void _TIFFsetDoubleArray(double**, double*, uint32);
-
-extern void _TIFFprintAscii(FILE*, const char*);
-extern void _TIFFprintAsciiTag(FILE*, const char*, const char*);
-
-extern TIFFErrorHandler _TIFFwarningHandler;
-extern TIFFErrorHandler _TIFFerrorHandler;
-extern TIFFErrorHandlerExt _TIFFwarningHandlerExt;
-extern TIFFErrorHandlerExt _TIFFerrorHandlerExt;
-
-extern tdata_t _TIFFCheckMalloc(TIFF*, size_t, size_t, const char*);
-extern tdata_t _TIFFCheckRealloc(TIFF*, tdata_t, size_t, size_t, const char*);
-
-extern int TIFFInitDumpMode(TIFF*, int);
-#ifdef PACKBITS_SUPPORT
-extern int TIFFInitPackBits(TIFF*, int);
-#endif
-#ifdef CCITT_SUPPORT
-extern int TIFFInitCCITTRLE(TIFF*, int), TIFFInitCCITTRLEW(TIFF*, int);
-extern int TIFFInitCCITTFax3(TIFF*, int), TIFFInitCCITTFax4(TIFF*, int);
-#endif
-#ifdef THUNDER_SUPPORT
-extern int TIFFInitThunderScan(TIFF*, int);
-#endif
-#ifdef NEXT_SUPPORT
-extern int TIFFInitNeXT(TIFF*, int);
-#endif
-#ifdef LZW_SUPPORT
-extern int TIFFInitLZW(TIFF*, int);
-#endif
-#ifdef OJPEG_SUPPORT
-extern int TIFFInitOJPEG(TIFF*, int);
-#endif
-#ifdef JPEG_SUPPORT
-extern int TIFFInitJPEG(TIFF*, int);
-#endif
-#ifdef JBIG_SUPPORT
-extern int TIFFInitJBIG(TIFF*, int);
-#endif
-#ifdef ZIP_SUPPORT
-extern int TIFFInitZIP(TIFF*, int);
-#endif
-#ifdef PIXARLOG_SUPPORT
-extern int TIFFInitPixarLog(TIFF*, int);
-#endif
-#ifdef LOGLUV_SUPPORT
-extern int TIFFInitSGILog(TIFF*, int);
-#endif
-#ifdef VMS
-extern const TIFFCodec _TIFFBuiltinCODECS[];
-#else
-extern TIFFCodec _TIFFBuiltinCODECS[];
-#endif
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* _TIFFIOP_ */
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
-/*
- * Local Variables:
- * mode: c
- * c-basic-offset: 8
- * fill-column: 78
- * End:
- */
+/* $Id: tiffiop.h,v 1.51.2.6 2010-06-12 02:55:16 bfriesen Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _TIFFIOP_
+#define _TIFFIOP_
+/*
+ * ``Library-private'' definitions.
+ */
+
+#include "tif_config.h"
+
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+
+#ifdef HAVE_ASSERT_H
+# include <assert.h>
+#else
+# define assert(x)
+#endif
+
+#ifdef HAVE_SEARCH_H
+# include <search.h>
+#else
+extern void *lfind(const void *, const void *, size_t *, size_t,
+ int (*)(const void *, const void *));
+#endif
+
+/*
+ Libtiff itself does not require a 64-bit type, but bundled TIFF
+ utilities may use it.
+*/
+#ifndef int64
+typedef TIFF_INT64_T int64;
+#endif
+
+#ifndef uint64
+typedef TIFF_UINT64_T uint64;
+#endif
+
+#include "tiffio.h"
+#include "tif_dir.h"
+
+#ifndef STRIP_SIZE_DEFAULT
+# define STRIP_SIZE_DEFAULT 8192
+#endif
+
+#define streq(a,b) (strcmp(a,b) == 0)
+
+#ifndef TRUE
+#define TRUE 1
+#define FALSE 0
+#endif
+
+typedef struct client_info {
+ struct client_info *next;
+ void *data;
+ char *name;
+} TIFFClientInfoLink;
+
+/*
+ * Typedefs for ``method pointers'' used internally.
+ */
+typedef unsigned char tidataval_t; /* internal image data value type */
+typedef tidataval_t* tidata_t; /* reference to internal image data */
+
+typedef void (*TIFFVoidMethod)(TIFF*);
+typedef int (*TIFFBoolMethod)(TIFF*);
+typedef int (*TIFFPreMethod)(TIFF*, tsample_t);
+typedef int (*TIFFCodeMethod)(TIFF*, tidata_t, tsize_t, tsample_t);
+typedef int (*TIFFSeekMethod)(TIFF*, uint32);
+typedef void (*TIFFPostMethod)(TIFF*, tidata_t, tsize_t);
+typedef uint32 (*TIFFStripMethod)(TIFF*, uint32);
+typedef void (*TIFFTileMethod)(TIFF*, uint32*, uint32*);
+
+struct tiff {
+ char* tif_name; /* name of open file */
+ int tif_fd; /* open file descriptor */
+ int tif_mode; /* open mode (O_*) */
+ uint32 tif_flags;
+#define TIFF_FILLORDER 0x00003 /* natural bit fill order for machine */
+#define TIFF_DIRTYHEADER 0x00004 /* header must be written on close */
+#define TIFF_DIRTYDIRECT 0x00008 /* current directory must be written */
+#define TIFF_BUFFERSETUP 0x00010 /* data buffers setup */
+#define TIFF_CODERSETUP 0x00020 /* encoder/decoder setup done */
+#define TIFF_BEENWRITING 0x00040 /* written 1+ scanlines to file */
+#define TIFF_SWAB 0x00080 /* byte swap file information */
+#define TIFF_NOBITREV 0x00100 /* inhibit bit reversal logic */
+#define TIFF_MYBUFFER 0x00200 /* my raw data buffer; free on close */
+#define TIFF_ISTILED 0x00400 /* file is tile, not strip- based */
+#define TIFF_MAPPED 0x00800 /* file is mapped into memory */
+#define TIFF_POSTENCODE 0x01000 /* need call to postencode routine */
+#define TIFF_INSUBIFD 0x02000 /* currently writing a subifd */
+#define TIFF_UPSAMPLED 0x04000 /* library is doing data up-sampling */
+#define TIFF_STRIPCHOP 0x08000 /* enable strip chopping support */
+#define TIFF_HEADERONLY 0x10000 /* read header only, do not process */
+ /* the first directory */
+#define TIFF_NOREADRAW 0x20000 /* skip reading of raw uncompressed */
+ /* image data */
+#define TIFF_INCUSTOMIFD 0x40000 /* currently writing a custom IFD */
+ toff_t tif_diroff; /* file offset of current directory */
+ toff_t tif_nextdiroff; /* file offset of following directory */
+ toff_t* tif_dirlist; /* list of offsets to already seen */
+ /* directories to prevent IFD looping */
+ tsize_t tif_dirlistsize;/* number of entires in offset list */
+ uint16 tif_dirnumber; /* number of already seen directories */
+ TIFFDirectory tif_dir; /* internal rep of current directory */
+ TIFFDirectory tif_customdir; /* custom IFDs are separated from
+ the main ones */
+ TIFFHeader tif_header; /* file's header block */
+ const int* tif_typeshift; /* data type shift counts */
+ const long* tif_typemask; /* data type masks */
+ uint32 tif_row; /* current scanline */
+ tdir_t tif_curdir; /* current directory (index) */
+ tstrip_t tif_curstrip; /* current strip for read/write */
+ toff_t tif_curoff; /* current offset for read/write */
+ toff_t tif_dataoff; /* current offset for writing dir */
+/* SubIFD support */
+ uint16 tif_nsubifd; /* remaining subifds to write */
+ toff_t tif_subifdoff; /* offset for patching SubIFD link */
+/* tiling support */
+ uint32 tif_col; /* current column (offset by row too) */
+ ttile_t tif_curtile; /* current tile for read/write */
+ tsize_t tif_tilesize; /* # of bytes in a tile */
+/* compression scheme hooks */
+ int tif_decodestatus;
+ TIFFBoolMethod tif_setupdecode;/* called once before predecode */
+ TIFFPreMethod tif_predecode; /* pre- row/strip/tile decoding */
+ TIFFBoolMethod tif_setupencode;/* called once before preencode */
+ int tif_encodestatus;
+ TIFFPreMethod tif_preencode; /* pre- row/strip/tile encoding */
+ TIFFBoolMethod tif_postencode; /* post- row/strip/tile encoding */
+ TIFFCodeMethod tif_decoderow; /* scanline decoding routine */
+ TIFFCodeMethod tif_encoderow; /* scanline encoding routine */
+ TIFFCodeMethod tif_decodestrip;/* strip decoding routine */
+ TIFFCodeMethod tif_encodestrip;/* strip encoding routine */
+ TIFFCodeMethod tif_decodetile; /* tile decoding routine */
+ TIFFCodeMethod tif_encodetile; /* tile encoding routine */
+ TIFFVoidMethod tif_close; /* cleanup-on-close routine */
+ TIFFSeekMethod tif_seek; /* position within a strip routine */
+ TIFFVoidMethod tif_cleanup; /* cleanup state routine */
+ TIFFStripMethod tif_defstripsize;/* calculate/constrain strip size */
+ TIFFTileMethod tif_deftilesize;/* calculate/constrain tile size */
+ tidata_t tif_data; /* compression scheme private data */
+/* input/output buffering */
+ tsize_t tif_scanlinesize;/* # of bytes in a scanline */
+ tsize_t tif_scanlineskew;/* scanline skew for reading strips */
+ tidata_t tif_rawdata; /* raw data buffer */
+ tsize_t tif_rawdatasize;/* # of bytes in raw data buffer */
+ tidata_t tif_rawcp; /* current spot in raw buffer */
+ tsize_t tif_rawcc; /* bytes unread from raw buffer */
+/* memory-mapped file support */
+ tidata_t tif_base; /* base of mapped file */
+ toff_t tif_size; /* size of mapped file region (bytes)
+ FIXME: it should be tsize_t */
+ TIFFMapFileProc tif_mapproc; /* map file method */
+ TIFFUnmapFileProc tif_unmapproc;/* unmap file method */
+/* input/output callback methods */
+ thandle_t tif_clientdata; /* callback parameter */
+ TIFFReadWriteProc tif_readproc; /* read method */
+ TIFFReadWriteProc tif_writeproc;/* write method */
+ TIFFSeekProc tif_seekproc; /* lseek method */
+ TIFFCloseProc tif_closeproc; /* close method */
+ TIFFSizeProc tif_sizeproc; /* filesize method */
+/* post-decoding support */
+ TIFFPostMethod tif_postdecode; /* post decoding routine */
+/* tag support */
+ TIFFFieldInfo** tif_fieldinfo; /* sorted table of registered tags */
+ size_t tif_nfields; /* # entries in registered tag table */
+ const TIFFFieldInfo *tif_foundfield;/* cached pointer to already found tag */
+ TIFFTagMethods tif_tagmethods; /* tag get/set/print routines */
+ TIFFClientInfoLink *tif_clientinfo; /* extra client information. */
+};
+
+#define isPseudoTag(t) (t > 0xffff) /* is tag value normal or pseudo */
+
+#define isTiled(tif) (((tif)->tif_flags & TIFF_ISTILED) != 0)
+#define isMapped(tif) (((tif)->tif_flags & TIFF_MAPPED) != 0)
+#define isFillOrder(tif, o) (((tif)->tif_flags & (o)) != 0)
+#define isUpSampled(tif) (((tif)->tif_flags & TIFF_UPSAMPLED) != 0)
+#define TIFFReadFile(tif, buf, size) \
+ ((*(tif)->tif_readproc)((tif)->tif_clientdata,buf,size))
+#define TIFFWriteFile(tif, buf, size) \
+ ((*(tif)->tif_writeproc)((tif)->tif_clientdata,buf,size))
+#define TIFFSeekFile(tif, off, whence) \
+ ((*(tif)->tif_seekproc)((tif)->tif_clientdata,(toff_t)(off),whence))
+#define TIFFCloseFile(tif) \
+ ((*(tif)->tif_closeproc)((tif)->tif_clientdata))
+#define TIFFGetFileSize(tif) \
+ ((*(tif)->tif_sizeproc)((tif)->tif_clientdata))
+#define TIFFMapFileContents(tif, paddr, psize) \
+ ((*(tif)->tif_mapproc)((tif)->tif_clientdata,paddr,psize))
+#define TIFFUnmapFileContents(tif, addr, size) \
+ ((*(tif)->tif_unmapproc)((tif)->tif_clientdata,addr,size))
+
+/*
+ * Default Read/Seek/Write definitions.
+ */
+#ifndef ReadOK
+#define ReadOK(tif, buf, size) \
+ (TIFFReadFile(tif, (tdata_t) buf, (tsize_t)(size)) == (tsize_t)(size))
+#endif
+#ifndef SeekOK
+#define SeekOK(tif, off) \
+ (TIFFSeekFile(tif, (toff_t) off, SEEK_SET) == (toff_t) off)
+#endif
+#ifndef WriteOK
+#define WriteOK(tif, buf, size) \
+ (TIFFWriteFile(tif, (tdata_t) buf, (tsize_t) size) == (tsize_t) size)
+#endif
+
+/* NB: the uint32 casts are to silence certain ANSI-C compilers */
+#define TIFFhowmany(x, y) (((uint32)x < (0xffffffff - (uint32)(y-1))) ? \
+ ((((uint32)(x))+(((uint32)(y))-1))/((uint32)(y))) : \
+ 0U)
+#define TIFFhowmany8(x) (((x)&0x07)?((uint32)(x)>>3)+1:(uint32)(x)>>3)
+#define TIFFroundup(x, y) (TIFFhowmany(x,y)*(y))
+
+/* Safe multiply which returns zero if there is an integer overflow */
+#define TIFFSafeMultiply(t,v,m) ((((t)m != (t)0) && (((t)((v*m)/m)) == (t)v)) ? (t)(v*m) : (t)0)
+
+#define TIFFmax(A,B) ((A)>(B)?(A):(B))
+#define TIFFmin(A,B) ((A)<(B)?(A):(B))
+
+#define TIFFArrayCount(a) (sizeof (a) / sizeof ((a)[0]))
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+extern int _TIFFgetMode(const char*, const char*);
+extern int _TIFFNoRowEncode(TIFF*, tidata_t, tsize_t, tsample_t);
+extern int _TIFFNoStripEncode(TIFF*, tidata_t, tsize_t, tsample_t);
+extern int _TIFFNoTileEncode(TIFF*, tidata_t, tsize_t, tsample_t);
+extern int _TIFFNoRowDecode(TIFF*, tidata_t, tsize_t, tsample_t);
+extern int _TIFFNoStripDecode(TIFF*, tidata_t, tsize_t, tsample_t);
+extern int _TIFFNoTileDecode(TIFF*, tidata_t, tsize_t, tsample_t);
+extern void _TIFFNoPostDecode(TIFF*, tidata_t, tsize_t);
+extern int _TIFFNoPreCode (TIFF*, tsample_t);
+extern int _TIFFNoSeek(TIFF*, uint32);
+extern void _TIFFSwab16BitData(TIFF*, tidata_t, tsize_t);
+extern void _TIFFSwab24BitData(TIFF*, tidata_t, tsize_t);
+extern void _TIFFSwab32BitData(TIFF*, tidata_t, tsize_t);
+extern void _TIFFSwab64BitData(TIFF*, tidata_t, tsize_t);
+extern int TIFFFlushData1(TIFF*);
+extern int TIFFDefaultDirectory(TIFF*);
+extern void _TIFFSetDefaultCompressionState(TIFF*);
+extern int TIFFSetCompressionScheme(TIFF*, int);
+extern int TIFFSetDefaultCompressionState(TIFF*);
+extern uint32 _TIFFDefaultStripSize(TIFF*, uint32);
+extern void _TIFFDefaultTileSize(TIFF*, uint32*, uint32*);
+extern int _TIFFDataSize(TIFFDataType);
+
+extern void _TIFFsetByteArray(void**, void*, uint32);
+extern void _TIFFsetString(char**, char*);
+extern void _TIFFsetShortArray(uint16**, uint16*, uint32);
+extern void _TIFFsetLongArray(uint32**, uint32*, uint32);
+extern void _TIFFsetFloatArray(float**, float*, uint32);
+extern void _TIFFsetDoubleArray(double**, double*, uint32);
+
+extern void _TIFFprintAscii(FILE*, const char*);
+extern void _TIFFprintAsciiTag(FILE*, const char*, const char*);
+
+extern TIFFErrorHandler _TIFFwarningHandler;
+extern TIFFErrorHandler _TIFFerrorHandler;
+extern TIFFErrorHandlerExt _TIFFwarningHandlerExt;
+extern TIFFErrorHandlerExt _TIFFerrorHandlerExt;
+
+extern tdata_t _TIFFCheckMalloc(TIFF*, size_t, size_t, const char*);
+extern tdata_t _TIFFCheckRealloc(TIFF*, tdata_t, size_t, size_t, const char*);
+
+extern int TIFFInitDumpMode(TIFF*, int);
+#ifdef PACKBITS_SUPPORT
+extern int TIFFInitPackBits(TIFF*, int);
+#endif
+#ifdef CCITT_SUPPORT
+extern int TIFFInitCCITTRLE(TIFF*, int), TIFFInitCCITTRLEW(TIFF*, int);
+extern int TIFFInitCCITTFax3(TIFF*, int), TIFFInitCCITTFax4(TIFF*, int);
+#endif
+#ifdef THUNDER_SUPPORT
+extern int TIFFInitThunderScan(TIFF*, int);
+#endif
+#ifdef NEXT_SUPPORT
+extern int TIFFInitNeXT(TIFF*, int);
+#endif
+#ifdef LZW_SUPPORT
+extern int TIFFInitLZW(TIFF*, int);
+#endif
+#ifdef OJPEG_SUPPORT
+extern int TIFFInitOJPEG(TIFF*, int);
+#endif
+#ifdef JPEG_SUPPORT
+extern int TIFFInitJPEG(TIFF*, int);
+#endif
+#ifdef JBIG_SUPPORT
+extern int TIFFInitJBIG(TIFF*, int);
+#endif
+#ifdef ZIP_SUPPORT
+extern int TIFFInitZIP(TIFF*, int);
+#endif
+#ifdef PIXARLOG_SUPPORT
+extern int TIFFInitPixarLog(TIFF*, int);
+#endif
+#ifdef LOGLUV_SUPPORT
+extern int TIFFInitSGILog(TIFF*, int);
+#endif
+#ifdef VMS
+extern const TIFFCodec _TIFFBuiltinCODECS[];
+#else
+extern TIFFCodec _TIFFBuiltinCODECS[];
+#endif
+
+#if defined(__cplusplus)
+}
+#endif
+#endif /* _TIFFIOP_ */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 8
+ * fill-column: 78
+ * End:
+ */
View
230 Source/zlib/zlib.xcodeproj/project.pbxproj
@@ -0,0 +1,230 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 46;
+ objects = {
+
+/* Begin PBXFileReference section */
+ C926860F1622077800D4EB54 /* adler32.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = adler32.c; sourceTree = "<group>"; };
+ C92686101622077800D4EB54 /* ChangeLog */ = {isa = PBXFileReference; lastKnownFileType = text; path = ChangeLog; sourceTree = "<group>"; };
+ C92686111622077800D4EB54 /* CMakeLists.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+ C92686121622077800D4EB54 /* compress.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = compress.c; sourceTree = "<group>"; };
+ C92686131622077800D4EB54 /* configure */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = configure; sourceTree = "<group>"; };
+ C92686141622077800D4EB54 /* crc32.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = crc32.c; sourceTree = "<group>"; };
+ C92686151622077800D4EB54 /* crc32.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = crc32.h; sourceTree = "<group>"; };
+ C92686161622077800D4EB54 /* deflate.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = deflate.c; sourceTree = "<group>"; };
+ C92686171622077800D4EB54 /* deflate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = deflate.h; sourceTree = "<group>"; };
+ C92686181622077800D4EB54 /* example.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = example.c; sourceTree = "<group>"; };
+ C92686191622077800D4EB54 /* FAQ */ = {isa = PBXFileReference; lastKnownFileType = text; path = FAQ; sourceTree = "<group>"; };
+ C926861A1622077800D4EB54 /* gzclose.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gzclose.c; sourceTree = "<group>"; };
+ C926861B1622077800D4EB54 /* gzguts.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gzguts.h; sourceTree = "<group>"; };
+ C926861C1622077800D4EB54 /* gzlib.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gzlib.c; sourceTree = "<group>"; };
+ C926861D1622077800D4EB54 /* gzread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gzread.c; sourceTree = "<group>"; };
+ C926861E1622077800D4EB54 /* gzwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gzwrite.c; sourceTree = "<group>"; };
+ C926861F1622077800D4EB54 /* INDEX */ = {isa = PBXFileReference; lastKnownFileType = text; path = INDEX; sourceTree = "<group>"; };
+ C92686201622077800D4EB54 /* infback.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = infback.c; sourceTree = "<group>"; };
+ C92686211622077800D4EB54 /* inffast.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = inffast.c; sourceTree = "<group>"; };
+ C92686221622077800D4EB54 /* inffast.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = inffast.h; sourceTree = "<group>"; };
+ C92686231622077800D4EB54 /* inffixed.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = inffixed.h; sourceTree = "<group>"; };
+ C92686241622077800D4EB54 /* inflate.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = inflate.c; sourceTree = "<group>"; };
+ C92686251622077800D4EB54 /* inflate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = inflate.h; sourceTree = "<group>"; };
+ C92686261622077800D4EB54 /* inftrees.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = inftrees.c; sourceTree = "<group>"; };
+ C92686271622077800D4EB54 /* inftrees.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = inftrees.h; sourceTree = "<group>"; };
+ C92686281622077800D4EB54 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+ C92686291622077800D4EB54 /* Makefile.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = Makefile.in; sourceTree = "<group>"; };
+ C926862A1622077800D4EB54 /* minigzip.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = minigzip.c; sourceTree = "<group>"; };
+ C926862B1622077800D4EB54 /* README */ = {isa = PBXFileReference; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
+ C926862C1622077800D4EB54 /* treebuild.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = treebuild.xml; sourceTree = "<group>"; };
+ C926862D1622077800D4EB54 /* trees.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = trees.c; sourceTree = "<group>"; };
+ C926862E1622077800D4EB54 /* trees.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = trees.h; sourceTree = "<group>"; };
+ C926862F1622077800D4EB54 /* uncompr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = uncompr.c; sourceTree = "<group>"; };
+ C92686301622077800D4EB54 /* zconf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = zconf.h; sourceTree = "<group>"; };
+ C92686311622077800D4EB54 /* zconf.h.cmakein */ = {isa = PBXFileReference; lastKnownFileType = text; path = zconf.h.cmakein; sourceTree = "<group>"; };
+ C92686321622077800D4EB54 /* zconf.h.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = zconf.h.in; sourceTree = "<group>"; };
+ C92686331622077800D4EB54 /* zlib.3 */ = {isa = PBXFileReference; lastKnownFileType = text; path = zlib.3; sourceTree = "<group>"; };
+ C92686341622077800D4EB54 /* zlib.3.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = zlib.3.pdf; sourceTree = "<group>"; };
+ C92686351622077800D4EB54 /* zlib.dsp */ = {isa = PBXFileReference; lastKnownFileType = text; path = zlib.dsp; sourceTree = "<group>"; };
+ C92686361622077800D4EB54 /* zlib.dsw */ = {isa = PBXFileReference; lastKnownFileType = text; path = zlib.dsw; sourceTree = "<group>"; };
+ C92686371622077800D4EB54 /* zlib.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = zlib.h; sourceTree = "<group>"; };
+ C92686381622077800D4EB54 /* zlib.map */ = {isa = PBXFileReference; lastKnownFileType = text; path = zlib.map; sourceTree = "<group>"; };
+ C92686391622077800D4EB54 /* zlib.pc.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = zlib.pc.in; sourceTree = "<group>"; };
+ C926863A1622077800D4EB54 /* zlib.vcproj */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = zlib.vcproj; sourceTree = "<group>"; };
+ C926863B1622077800D4EB54 /* zlib2ansi */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = zlib2ansi; sourceTree = "<group>"; };
+ C926863C1622077800D4EB54 /* zlib_wince.sln */ = {isa = PBXFileReference; lastKnownFileType = text; path = zlib_wince.sln; sourceTree = "<group>"; };
+ C926863D1622077800D4EB54 /* zlib_wince.vcproj */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = zlib_wince.vcproj; sourceTree = "<group>"; };
+ C926863E1622077800D4EB54 /* zutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = zutil.c; sourceTree = "<group>"; };
+ C926863F1622077800D4EB54 /* zutil.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = zutil.h; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXGroup section */
+ C92686071622077800D4EB54 = {
+ isa = PBXGroup;
+ children = (
+ C926860F1622077800D4EB54 /* adler32.c */,
+ C92686101622077800D4EB54 /* ChangeLog */,
+ C92686111622077800D4EB54 /* CMakeLists.txt */,
+ C92686121622077800D4EB54 /* compress.c */,
+ C92686131622077800D4EB54 /* configure */,
+ C92686141622077800D4EB54 /* crc32.c */,
+ C92686151622077800D4EB54 /* crc32.h */,
+ C92686161622077800D4EB54 /* deflate.c */,
+ C92686171622077800D4EB54 /* deflate.h */,
+ C92686181622077800D4EB54 /* example.c */,
+ C92686191622077800D4EB54 /* FAQ */,
+ C926861A1622077800D4EB54 /* gzclose.c */,
+ C926861B1622077800D4EB54 /* gzguts.h */,
+ C926861C1622077800D4EB54 /* gzlib.c */,
+ C926861D1622077800D4EB54 /* gzread.c */,
+ C926861E1622077800D4EB54 /* gzwrite.c */,
+ C926861F1622077800D4EB54 /* INDEX */,
+ C92686201622077800D4EB54 /* infback.c */,
+ C92686211622077800D4EB54 /* inffast.c */,
+ C92686221622077800D4EB54 /* inffast.h */,
+ C92686231622077800D4EB54 /* inffixed.h */,
+ C92686241622077800D4EB54 /* inflate.c */,
+ C92686251622077800D4EB54 /* inflate.h */,
+ C92686261622077800D4EB54 /* inftrees.c */,
+ C92686271622077800D4EB54 /* inftrees.h */,
+ C92686281622077800D4EB54 /* Makefile */,
+ C92686291622077800D4EB54 /* Makefile.in */,
+ C926862A1622077800D4EB54 /* minigzip.c */,
+ C926862B1622077800D4EB54 /* README */,
+ C926862C1622077800D4EB54 /* treebuild.xml */,
+ C926862D1622077800D4EB54 /* trees.c */,
+ C926862E1622077800D4EB54 /* trees.h */,
+ C926862F1622077800D4EB54 /* uncompr.c */,
+ C92686301622077800D4EB54 /* zconf.h */,
+ C92686311622077800D4EB54 /* zconf.h.cmakein */,
+ C92686321622077800D4EB54 /* zconf.h.in */,
+ C92686331622077800D4EB54 /* zlib.3 */,
+ C92686341622077800D4EB54 /* zlib.3.pdf */,
+ C92686351622077800D4EB54 /* zlib.dsp */,
+ C92686361622077800D4EB54 /* zlib.dsw */,
+ C92686371622077800D4EB54 /* zlib.h */,
+ C92686381622077800D4EB54 /* zlib.map */,
+ C92686391622077800D4EB54 /* zlib.pc.in */,
+ C926863A1622077800D4EB54 /* zlib.vcproj */,
+ C926863B1622077800D4EB54 /* zlib2ansi */,
+ C926863C1622077800D4EB54 /* zlib_wince.sln */,
+ C926863D1622077800D4EB54 /* zlib_wince.vcproj */,
+ C926863E1622077800D4EB54 /* zutil.c */,
+ C926863F1622077800D4EB54 /* zutil.h */,
+ );
+ sourceTree = "<group>";
+ };
+/* End PBXGroup section */
+
+/* Begin PBXLegacyTarget section */
+ C926860E1622077800D4EB54 /* zlib */ = {
+ isa = PBXLegacyTarget;
+ buildArgumentsString = "$(ACTION)";
+ buildConfigurationList = C92686401622077800D4EB54 /* Build configuration list for PBXLegacyTarget "zlib" */;
+ buildPhases = (
+ );
+ buildToolPath = /usr/bin/make;
+ buildWorkingDirectory = /Users/pentheny/Documents/workspace/cppimage/Source/zlib;
+ dependencies = (
+ );
+ name = zlib;
+ passBuildSettingsInEnvironment = 1;
+ productName = zlib;
+ };
+/* End PBXLegacyTarget section */
+
+/* Begin PBXProject section */
+ C92686091622077800D4EB54 /* Project object */ = {
+ isa = PBXProject;
+ buildConfigurationList = C926860C1622077800D4EB54 /* Build configuration list for PBXProject "zlib" */;
+ compatibilityVersion = "Xcode 3.2";
+ developmentRegion = English;
+ hasScannedForEncodings = 0;
+ knownRegions = (
+ en,
+ );
+ mainGroup = C92686071622077800D4EB54;
+ projectDirPath = "";
+ projectRoot = "";
+ targets = (
+ C926860E1622077800D4EB54 /* zlib */,
+ );
+ };
+/* End PBXProject section */
+
+/* Begin XCBuildConfiguration section */
+ C926860A1622077800D4EB54 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ COPY_PHASE_STRIP = NO;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ ONLY_ACTIVE_ARCH = YES;
+ SDKROOT = macosx10.6;
+ };
+ name = Debug;
+ };
+ C926860B1622077800D4EB54 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ COPY_PHASE_STRIP = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ SDKROOT = macosx10.6;
+ };
+ name = Release;
+ };
+ C92686411622077800D4EB54 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
+ DEBUGGING_SYMBOLS = YES;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ OTHER_CFLAGS = "";
+ OTHER_LDFLAGS = "";
+ PRODUCT_NAME = zlib;
+ };
+ name = Debug;
+ };
+ C92686421622077800D4EB54 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ OTHER_CFLAGS = "";
+ OTHER_LDFLAGS = "";
+ PRODUCT_NAME = zlib;
+ };
+ name = Release;
+ };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+ C926860C1622077800D4EB54 /* Build configuration list for PBXProject "zlib" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ C926860A1622077800D4EB54 /* Debug */,
+ C926860B1622077800D4EB54 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ C92686401622077800D4EB54 /* Build configuration list for PBXLegacyTarget "zlib" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ C92686411622077800D4EB54 /* Debug */,
+ C92686421622077800D4EB54 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+/* End XCConfigurationList section */
+ };
+ rootObject = C92686091622077800D4EB54 /* Project object */;
+}
View
22 ...ce/zlib/zlib.xcodeproj/xcuserdata/pentheny.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>SchemeUserState</key>
+ <dict>
+ <key>zlib.xcscheme</key>
+ <dict>
+ <key>orderHint</key>
+ <integer>2</integer>
+ </dict>
+ </dict>
+ <key>SuppressBuildableAutocreation</key>
+ <dict>
+ <key>C926860E1622077800D4EB54</key>
+ <dict>
+ <key>primary</key>
+ <true/>
+ </dict>
+ </dict>
+</dict>
+</plist>
View
59 Source/zlib/zlib.xcodeproj/xcuserdata/pentheny.xcuserdatad/xcschemes/zlib.xcscheme
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "0440"
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "C926860E1622077800D4EB54"
+ BuildableName = "zlib"
+ BlueprintName = "zlib"
+ ReferencedContainer = "container:zlib.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ buildConfiguration = "Debug">
+ <Testables>
+ </Testables>
+ </TestAction>
+ <LaunchAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Debug"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
+ <AdditionalOptions>
+ </AdditionalOptions>
+ </LaunchAction>
+ <ProfileAction
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
View
64 cppimage.xcodeproj/project.pbxproj
@@ -176,10 +176,18 @@
path = Source/cppimage/formatSpecific;
sourceTree = "<group>";
};
- C9FA0F491610296F0010C75D = {
+ C92685EE1622074900D4EB54 /* Source */ = {
isa = PBXGroup;
children = (
C9FA0F5B1610297E0010C75D /* CppImage */,
+ );
+ name = Source;
+ sourceTree = "<group>";
+ };
+ C9FA0F491610296F0010C75D = {
+ isa = PBXGroup;
+ children = (
+ C92685EE1622074900D4EB54 /* Source */,
C9FA0F551610296F0010C75D /* Products */,
);
sourceTree = "<group>";
@@ -353,7 +361,15 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+ CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
+ CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES;
+ CLANG_WARN_OBJC_RECEIVER_WEAK = YES;
+ CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES;
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
@@ -364,10 +380,29 @@
"$(inherited)",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
+ GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
+ GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
+ GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
+ GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
+ GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = YES;
+ GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
+ GCC_WARN_SHADOW = YES;
+ GCC_WARN_SIGN_COMPARE = YES;
+ GCC_WARN_STRICT_SELECTOR_MATCH = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNKNOWN_PRAGMAS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
+ GCC_WARN_UNUSED_LABEL = YES;
+ GCC_WARN_UNUSED_PARAMETER = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
@@ -380,15 +415,42 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+ CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
+ CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES;
+ CLANG_WARN_OBJC_RECEIVER_WEAK = YES;
+ CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
+ GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
+ GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
+ GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
+ GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
+ GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = YES;
+ GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
+ GCC_WARN_SHADOW = YES;
+ GCC_WARN_SIGN_COMPARE = YES;
+ GCC_WARN_STRICT_SELECTOR_MATCH = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNKNOWN_PRAGMAS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
+ GCC_WARN_UNUSED_LABEL = YES;
+ GCC_WARN_UNUSED_PARAMETER = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
};

No commit comments for this range

Something went wrong with that request. Please try again.