Index: src/PdfString.cpp =================================================================== --- src/PdfString.cpp (revision 1160) +++ src/PdfString.cpp (working copy) @@ -681,8 +681,6 @@ #define UNI_REPLACEMENT_CHAR static_cast(0x0000FFFD) #define UNI_MAX_BMP static_cast(0x0000FFFF) #define UNI_MAX_UTF16 static_cast(0x0010FFFF) -#define UNI_MAX_UTF32 static_cast(0x7FFFFFFF) -#define UNI_MAX_LEGAL_UTF32 static_cast(0x0010FFFF) #define UNI_SUR_HIGH_START static_cast(0xD800) #define UNI_SUR_HIGH_END static_cast(0xDBFF) Index: src/PdfEncrypt.cpp =================================================================== --- src/PdfEncrypt.cpp (revision 1160) +++ src/PdfEncrypt.cpp (working copy) @@ -237,34 +237,7 @@ static void MD5Update(MD5_CTX *context, unsigned char const *buf, unsigned len); static void MD5Final(unsigned char digest[MD5_HASHBYTES], MD5_CTX *context); static void MD5Transform(unsigned int buf[4], unsigned int const in[16]); -static char* MD5End(MD5_CTX *, char *); -static char* MD5End(MD5_CTX *ctx, char *buf) -{ - int i; - unsigned char digest[MD5_HASHBYTES]; - char hex[]="0123456789abcdef"; - - if (!buf) - { - buf = static_cast(malloc(33)); - } - - if (!buf) - { - return 0; - } - - MD5Final(digest,ctx); - for (i=0;i> 4]; - buf[i+i+1] = hex[digest[i] & 0x0f]; - } - buf[i+i] = '\0'; - return buf; -} - /* * Final wrapup - pad to 64-byte boundary with the bit pattern * 1 0* (64-bit count of bits processed, MSB-first) @@ -468,29 +441,6 @@ } -#ifndef REVERSEBYTE -#define byteReverse(buf, len) /* Nothing */ -#else -void byteReverse(unsigned char *buf, unsigned longs); - -/* - * Note: this code is harmless on little-endian machines. - */ -static void byteReverse(unsigned char *buf, unsigned longs) -{ - unsigned int t; - do - { - t = (unsigned int) ((unsigned) buf[3] << 8 | buf[2]) << 16 | - ((unsigned) buf[1] << 8 | buf[0]); - *(unsigned int *) buf = t; - buf += 4; - } - while (--longs); -} -#endif - - /*************************************************************************** * Copyright (C) 2006 by Dominik Seichter * * domseichter@web.de * Index: src/PdfHintStream.cpp =================================================================== --- src/PdfHintStream.cpp (revision 1160) +++ src/PdfHintStream.cpp (working copy) @@ -32,8 +32,6 @@ // See PdfWriter.cpp #define LINEARIZATION_PADDING "1234567890" -#define PAGE_OFFSET_HEADER 38 - using namespace PoDoFo; namespace { Index: src/PdfMemStream.cpp =================================================================== --- src/PdfMemStream.cpp (revision 1160) +++ src/PdfMemStream.cpp (working copy) @@ -33,8 +33,6 @@ namespace PoDoFo { -#define STREAM_SIZE_INCREASE 1024 - PdfMemStream::PdfMemStream( PdfObject* pParent ) : PdfStream( pParent ), m_pStream( NULL ), m_pBufferStream( NULL ), m_lLength( 0 ) { Index: src/PdfFontTrueType.cpp =================================================================== --- src/PdfFontTrueType.cpp (revision 1160) +++ src/PdfFontTrueType.cpp (working copy) @@ -26,9 +26,6 @@ #include "PdfStream.h" #include "PdfDefinesPrivate.h" -#define FIRST_CHAR 0 -#define LAST_CHAR 255 - namespace PoDoFo { PdfFontTrueType::PdfFontTrueType( PdfFontMetrics* pMetrics, const PdfEncoding* const pEncoding, Index: src/PdfTokenizer.cpp =================================================================== --- src/PdfTokenizer.cpp (revision 1160) +++ src/PdfTokenizer.cpp (working copy) @@ -41,7 +41,6 @@ #define NULL_LENGTH 4 #define TRUE_LENGTH 4 #define FALSE_LENGTH 5 -#define REF_LENGTH 1 namespace PoDoFo { Index: src/PdfVariant.cpp =================================================================== --- src/PdfVariant.cpp (revision 1160) +++ src/PdfVariant.cpp (working copy) @@ -31,10 +31,6 @@ #include -#define NULL_LENGTH 4 -#define TRUE_LENGTH 4 -#define FALSE_LENGTH 5 - namespace PoDoFo { using namespace std; Index: src/PdfNamesTree.cpp =================================================================== --- src/PdfNamesTree.cpp (revision 1160) +++ src/PdfNamesTree.cpp (working copy) @@ -30,11 +30,9 @@ namespace PoDoFo { #define BALANCE_TREE_MAX 65 -#define BALANCE_TREE_MIN (BALANCE_TREE_MAX+1)/2 /* #define BALANCE_TREE_MAX 9 -#define BALANCE_TREE_MIN (BALANCE_TREE_MAX+1)/2 */ class PdfNameTreeNode { Index: src/PdfRefCountedBuffer.cpp =================================================================== --- src/PdfRefCountedBuffer.cpp (revision 1160) +++ src/PdfRefCountedBuffer.cpp (working copy) @@ -26,8 +26,6 @@ namespace PoDoFo { -#define STREAM_SIZE_INCREASE 1024 - PdfRefCountedBuffer::PdfRefCountedBuffer( char* pBuffer, size_t lSize ) : m_pBuffer( NULL ) { Index: src/PdfRijndael.cpp =================================================================== --- src/PdfRijndael.cpp (revision 1160) +++ src/PdfRijndael.cpp (working copy) @@ -29,8 +29,6 @@ // and on 128 bit blocks // -#define _PDFRIJNDAEL_CPP_ - #include "PdfRijndael.h" #include "PdfDefinesPrivate.h" Index: src/PdfWriter.cpp =================================================================== --- src/PdfWriter.cpp (revision 1160) +++ src/PdfWriter.cpp (working copy) @@ -38,7 +38,6 @@ //#define PDF_MAGIC "%âãÏÓ\n" //"%\0x25\0xe2\0xe3\0xcf\0xd3\0x0d" #define PDF_MAGIC "\xe2\xe3\xcf\xd3\n" -#define XREF_ENTRY_SIZE 20 // 10 spaces #define LINEARIZATION_PADDING " " Index: src/PdfParserObject.cpp =================================================================== --- src/PdfParserObject.cpp (revision 1160) +++ src/PdfParserObject.cpp (working copy) @@ -33,8 +33,6 @@ #include #include -#define KEY_BUFFER 128 - namespace PoDoFo { using namespace std; Index: src/PdfError.cpp =================================================================== --- src/PdfError.cpp (revision 1160) +++ src/PdfError.cpp (working copy) @@ -503,7 +503,7 @@ } if( pszPrefix ) - fprintf( stderr, pszPrefix ); + fprintf( stderr, "%s", pszPrefix ); vfprintf( stderr, pszMsg, args ); } @@ -580,7 +580,7 @@ va_start( args, pszMsg ); if( pszPrefix ) - fprintf( stderr, pszPrefix ); + fprintf( stderr, "%s", pszPrefix ); vfprintf( stderr, pszMsg, args ); va_end( args ); Index: src/PdfFiltersPrivate.cpp =================================================================== --- src/PdfFiltersPrivate.cpp (revision 1160) +++ src/PdfFiltersPrivate.cpp (working copy) @@ -49,7 +49,6 @@ #endif // PODOFO_HAVE_TIFF_LIB -#define CHUNK 16384 #define LZW_TABLE_SIZE 4096 namespace { @@ -1056,6 +1055,7 @@ #ifdef PODOFO_HAVE_TIFF_LIB +#ifdef DS_CCITT_DEVELOPMENT_CODE // ------------------------------------------------------- // // ------------------------------------------------------- @@ -1095,6 +1095,7 @@ { } +#endif // ------------------------------------------------------- // Actual filter code below