| PdfContentsTokenizer.h | | PdfContentsTokenizer.h | |
| /**************************************************************************
* | | /**************************************************************************
* | |
| * Copyright (C) 2007 by Dominik Seichter
* | | * Copyright (C) 2007 by Dominik Seichter
* | |
| * domseichter@web.de
* | | * domseichter@web.de
* | |
| *
* | | *
* | |
| * This program is free software; you can redistribute it and/or modify
* | | * This program is free software; you can redistribute it and/or modify
* | |
|
| * it under the terms of the GNU General Public License as published by | | * it under the terms of the GNU Library General Public License as | |
| * | | * | |
| * the Free Software Foundation; either version 2 of the License, or | | * published by the Free Software Foundation; either version 2 of the | |
| * | | * | |
| * (at your option) any later version. | | * License, or (at your option) any later version. | |
| * | | * | |
| *
* | | *
* | |
| * This program is distributed in the hope that it will be useful,
* | | * This program is distributed in the hope that it will be useful,
* | |
| * but WITHOUT ANY WARRANTY; without even the implied warranty of
* | | * but WITHOUT ANY WARRANTY; without even the implied warranty of
* | |
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* | | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* | |
| * GNU General Public License for more details.
* | | * GNU General Public License for more details.
* | |
| *
* | | *
* | |
|
| * You should have received a copy of the GNU General Public License | | * You should have received a copy of the GNU Library General Public | |
| * | | * | |
| * along with this program; if not, write to the | | * License along with this program; if not, write to the | |
| * | | * | |
| * Free Software Foundation, Inc.,
* | | * Free Software Foundation, Inc.,
* | |
| * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* | | * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* | |
| **************************************************************************
*/ | | **************************************************************************
*/ | |
| | | | |
| #ifndef _PDF_CONTENTS_TOKENIZER_H_ | | #ifndef _PDF_CONTENTS_TOKENIZER_H_ | |
| #define _PDF_CONTENTS_TOKENIZER_H_ | | #define _PDF_CONTENTS_TOKENIZER_H_ | |
| | | | |
| #include "PdfDefines.h" | | #include "PdfDefines.h" | |
| #include "PdfTokenizer.h" | | #include "PdfTokenizer.h" | |
| #include "PdfVariant.h" | | #include "PdfVariant.h" | |
| | | | |
End of changes. 2 change blocks. |
| 10 lines changed or deleted | | 10 lines changed or added | |
|
| PdfEncoding.h | | PdfEncoding.h | |
| | | | |
| skipping to change at line 279 | | skipping to change at line 279 | |
| | | | |
| /** | | /** | |
| * A common base class for standard PdfEncoding which are | | * A common base class for standard PdfEncoding which are | |
| * known by name. | | * known by name. | |
| * | | * | |
| * - PdfDocEncoding (only use this for strings which are not printed | | * - PdfDocEncoding (only use this for strings which are not printed | |
| * in the document. This is for meta data in the PDF). | | * in the document. This is for meta data in the PDF). | |
| * - MacRomanEncoding | | * - MacRomanEncoding | |
| * - WinAnsiEncoding | | * - WinAnsiEncoding | |
| * - MacExpertEncoding | | * - MacExpertEncoding | |
|
| | | * - StandardEncoding | |
| | | * - SymbolEncoding | |
| | | * - ZapfDingbatsEncoding | |
| * | | * | |
| * \see PdfWinAnsiEncoding | | * \see PdfWinAnsiEncoding | |
| * \see PdfMacRomanEncoding | | * \see PdfMacRomanEncoding | |
| * \see PdfMacExportEncoding | | * \see PdfMacExportEncoding | |
|
| | | *..\see PdfStandardEncoding | |
| | | * \see PdfSymbolEncoding | |
| | | * \see PdfZapfDingbatsEncoding | |
| * | | * | |
| */ | | */ | |
| class PODOFO_API PdfSimpleEncoding : public PdfEncoding { | | class PODOFO_API PdfSimpleEncoding : public PdfEncoding { | |
| public: | | public: | |
| /* | | /* | |
| * Create a new simple PdfEncoding which uses 1 byte. | | * Create a new simple PdfEncoding which uses 1 byte. | |
| * | | * | |
| * \param rName the name of a standard PdfEncoding | | * \param rName the name of a standard PdfEncoding | |
| * | | * | |
| * As of now possible values for rName are: | | * As of now possible values for rName are: | |
| * - MacRomanEncoding | | * - MacRomanEncoding | |
| * - WinAnsiEncoding | | * - WinAnsiEncoding | |
| * - MacExpertEncoding | | * - MacExpertEncoding | |
|
| | | * - StandardEncoding | |
| | | * - SymbolEncoding | |
| | | * - ZapfDingbatsEncoding | |
| * | | * | |
| * \see PdfWinAnsiEncoding | | * \see PdfWinAnsiEncoding | |
| * \see PdfMacRomanEncoding | | * \see PdfMacRomanEncoding | |
| * \see PdfMacExportEncoding | | * \see PdfMacExportEncoding | |
|
| | | * \see PdfStandardEncoding | |
| | | * \see PdfSymbolEncoding | |
| | | * \see PdfZapfDingbatsEncoding | |
| * | | * | |
| * This will allocate a table of 65535 short values | | * This will allocate a table of 65535 short values | |
| * to make conversion from unicode to encoded strings | | * to make conversion from unicode to encoded strings | |
| * faster. As this requires a lot of memory, make sure that | | * faster. As this requires a lot of memory, make sure that | |
| * only one object of a certain encoding exists at one | | * only one object of a certain encoding exists at one | |
| * time, which is no problem as all methods are const anyways! | | * time, which is no problem as all methods are const anyways! | |
| * | | * | |
| */ | | */ | |
| PdfSimpleEncoding( const PdfName & rName ); | | PdfSimpleEncoding( const PdfName & rName ); | |
| | | | |
| | | | |
| skipping to change at line 456 | | skipping to change at line 468 | |
| * file. | | * file. | |
| * | | * | |
| * Do not allocate this class yourself, as allocations | | * Do not allocate this class yourself, as allocations | |
| * might be expensive. Try using PdfFont::DocEncoding. | | * might be expensive. Try using PdfFont::DocEncoding. | |
| * | | * | |
| * \see PdfFont::DocEncoding | | * \see PdfFont::DocEncoding | |
| */ | | */ | |
| class PODOFO_API PdfDocEncoding : public PdfSimpleEncoding { | | class PODOFO_API PdfDocEncoding : public PdfSimpleEncoding { | |
| public: | | public: | |
| | | | |
|
| /** Create a new PdfWinAnsiEncoding | | /** Create a new PdfDocEncoding | |
| */ | | */ | |
| PdfDocEncoding() | | PdfDocEncoding() | |
| : PdfSimpleEncoding( PdfName("PdfDocEncoding") ) | | : PdfSimpleEncoding( PdfName("PdfDocEncoding") ) | |
| { | | { | |
| | | | |
| } | | } | |
| | | | |
| protected: | | protected: | |
| | | | |
| /** Gets a table of 256 short values which are the | | /** Gets a table of 256 short values which are the | |
| | | | |
| skipping to change at line 478 | | skipping to change at line 490 | |
| * to the 256 values of this encoding. | | * to the 256 values of this encoding. | |
| * | | * | |
| * This table is used internally to convert an encoded | | * This table is used internally to convert an encoded | |
| * string of this encoding to and from unicode. | | * string of this encoding to and from unicode. | |
| * | | * | |
| * \returns an array of 256 big endian unicode code points | | * \returns an array of 256 big endian unicode code points | |
| */ | | */ | |
| virtual const pdf_utf16be* GetToUnicodeTable() const; | | virtual const pdf_utf16be* GetToUnicodeTable() const; | |
| | | | |
| private: | | private: | |
|
| static const pdf_utf16be s_cEncoding[256]; ///< conversion table from W
inAnsiEncoding to UTF16 | | static const pdf_utf16be s_cEncoding[256]; ///< conversion table from D
ocEncoding to UTF16 | |
| | | | |
| }; | | }; | |
| | | | |
| /** | | /** | |
| * The WinAnsi Encoding is the default encoding in PoDoFo for | | * The WinAnsi Encoding is the default encoding in PoDoFo for | |
| * contents on PDF pages. | | * contents on PDF pages. | |
| * | | * | |
| * It is also called CP-1252 encoding. | | * It is also called CP-1252 encoding. | |
| * | | * | |
| * Do not allocate this class yourself, as allocations | | * Do not allocate this class yourself, as allocations | |
| | | | |
| skipping to change at line 553 | | skipping to change at line 565 | |
| * to the 256 values of this encoding. | | * to the 256 values of this encoding. | |
| * | | * | |
| * This table is used internally to convert an encoded | | * This table is used internally to convert an encoded | |
| * string of this encoding to and from unicode. | | * string of this encoding to and from unicode. | |
| * | | * | |
| * \returns an array of 256 big endian unicode code points | | * \returns an array of 256 big endian unicode code points | |
| */ | | */ | |
| virtual const pdf_utf16be* GetToUnicodeTable() const; | | virtual const pdf_utf16be* GetToUnicodeTable() const; | |
| | | | |
| private: | | private: | |
|
| static const pdf_utf16be s_cEncoding[256]; ///< conversion table from W
inAnsiEncoding to UTF16 | | static const pdf_utf16be s_cEncoding[256]; ///< conversion table from M
acRomanEncoding to UTF16 | |
| | | | |
| }; | | }; | |
| | | | |
| /** | | /** | |
| */ | | */ | |
| class PODOFO_API PdfMacExpertEncoding : public PdfSimpleEncoding { | | class PODOFO_API PdfMacExpertEncoding : public PdfSimpleEncoding { | |
| public: | | public: | |
| | | | |
| /** Create a new PdfMacExpertEncoding | | /** Create a new PdfMacExpertEncoding | |
| */ | | */ | |
| inline PdfMacExpertEncoding() | | inline PdfMacExpertEncoding() | |
| : PdfSimpleEncoding( PdfName("MacExpertEncoding") ) | | : PdfSimpleEncoding( PdfName("MacExpertEncoding") ) | |
| { | | { | |
| | | | |
| } | | } | |
| | | | |
|
| | | protected: | |
| | | | |
| | | /** Gets a table of 256 short values which are the | |
| | | * big endian unicode code points that are assigned | |
| | | * to the 256 values of this encoding. | |
| | | * | |
| | | * This table is used internally to convert an encoded | |
| | | * string of this encoding to and from unicode. | |
| | | * | |
| | | * \returns an array of 256 big endian unicode code points | |
| | | */ | |
| | | virtual const pdf_utf16be* GetToUnicodeTable() const; | |
| | | | |
| | | private: | |
| | | static const pdf_utf16be s_cEncoding[256]; ///< conversion table from M | |
| | | acExpertEncoding to UTF16 | |
| | | | |
| | | }; | |
| | | | |
| | | // OC 13.08.2010 Neu: StandardEncoding | |
| | | /** | |
| | | * Do not allocate this class yourself, as allocations | |
| | | * might be expensive. Try using PdfFont::StandardEncoding. | |
| | | * | |
| | | * \see PdfFont::StandardEncoding | |
| | | */ | |
| | | class PODOFO_API PdfStandardEncoding : public PdfSimpleEncoding { | |
| | | public: | |
| | | | |
| | | /** Create a new PdfStandardEncoding | |
| | | */ | |
| | | PdfStandardEncoding() | |
| | | : PdfSimpleEncoding( PdfName("StandardEncoding") ) | |
| | | { | |
| | | | |
| | | } | |
| | | | |
| | | protected: | |
| | | | |
| | | /** Gets a table of 256 short values which are the | |
| | | * big endian unicode code points that are assigned | |
| | | * to the 256 values of this encoding. | |
| | | * | |
| | | * This table is used internally to convert an encoded | |
| | | * string of this encoding to and from unicode. | |
| | | * | |
| | | * \returns an array of 256 big endian unicode code points | |
| | | */ | |
| | | virtual const pdf_utf16be* GetToUnicodeTable() const; | |
| | | | |
| | | private: | |
| | | static const pdf_utf16be s_cEncoding[256]; ///< conversion table from S | |
| | | tandardEncoding to UTF16 | |
| | | | |
| | | }; | |
| | | | |
| | | // OC 13.08.2010 Neu: SymbolEncoding | |
| | | /** | |
| | | * Do not allocate this class yourself, as allocations | |
| | | * might be expensive. Try using PdfFont::SymbolEncoding. | |
| | | * | |
| | | * \see PdfFont::SymbolEncoding | |
| | | */ | |
| | | class PODOFO_API PdfSymbolEncoding : public PdfSimpleEncoding { | |
| | | public: | |
| | | | |
| | | /** Create a new PdfSymbolEncoding | |
| | | */ | |
| | | PdfSymbolEncoding() | |
| | | : PdfSimpleEncoding( PdfName("SymbolEncoding") ) | |
| | | { | |
| | | | |
| | | } | |
| | | | |
| | | protected: | |
| | | | |
| | | /** Gets a table of 256 short values which are the | |
| | | * big endian unicode code points that are assigned | |
| | | * to the 256 values of this encoding. | |
| | | * | |
| | | * This table is used internally to convert an encoded | |
| | | * string of this encoding to and from unicode. | |
| | | * | |
| | | * \returns an array of 256 big endian unicode code points | |
| | | */ | |
| | | virtual const pdf_utf16be* GetToUnicodeTable() const; | |
| | | | |
| | | private: | |
| | | static const pdf_utf16be s_cEncoding[256]; ///< conversion table from S | |
| | | ymbolEncoding to UTF16 | |
| | | | |
| | | }; | |
| | | | |
| | | // OC 13.08.2010 Neu: ZapfDingbatsEncoding | |
| | | /** | |
| | | * Do not allocate this class yourself, as allocations | |
| | | * might be expensive. Try using PdfFont::ZapfDingbats. | |
| | | * | |
| | | * \see PdfFont::ZapfDingbatsEncoding | |
| | | */ | |
| | | class PODOFO_API PdfZapfDingbatsEncoding : public PdfSimpleEncoding { | |
| | | public: | |
| | | | |
| | | /** Create a new PdfZapfDingbatsEncoding | |
| | | */ | |
| | | PdfZapfDingbatsEncoding() | |
| | | : PdfSimpleEncoding( PdfName("ZapfDingbatsEncoding") ) | |
| | | { | |
| | | | |
| | | } | |
| | | | |
| | | protected: | |
| | | | |
| | | /** Gets a table of 256 short values which are the | |
| | | * big endian unicode code points that are assigned | |
| | | * to the 256 values of this encoding. | |
| | | * | |
| | | * This table is used internally to convert an encoded | |
| | | * string of this encoding to and from unicode. | |
| | | * | |
| | | * \returns an array of 256 big endian unicode code points | |
| | | */ | |
| | | virtual const pdf_utf16be* GetToUnicodeTable() const; | |
| | | | |
| | | private: | |
| | | static const pdf_utf16be s_cEncoding[256]; ///< conversion table from Z | |
| | | apfDingbatsEncoding to UTF16 | |
| | | | |
| }; | | }; | |
| | | | |
| /** PdfIdentityEncoding is a two-byte encoding which can be | | /** PdfIdentityEncoding is a two-byte encoding which can be | |
| * used with TrueType fonts to represent all characters | | * used with TrueType fonts to represent all characters | |
| * present in a font. If the font contains all unicode | | * present in a font. If the font contains all unicode | |
| * glyphs, PdfIdentityEncoding will support all unicode | | * glyphs, PdfIdentityEncoding will support all unicode | |
| * characters. | | * characters. | |
| */ | | */ | |
| class PODOFO_API PdfIdentityEncoding : public PdfEncoding { | | class PODOFO_API PdfIdentityEncoding : public PdfEncoding { | |
| public: | | public: | |
| | | | |
End of changes. 8 change blocks. |
| 3 lines changed or deleted | | 143 lines changed or added | |
|
| PdfEncodingFactory.h | | PdfEncodingFactory.h | |
| | | | |
| skipping to change at line 35 | | skipping to change at line 35 | |
| #include "util/PdfMutex.h" | | #include "util/PdfMutex.h" | |
| #include "string.h" | | #include "string.h" | |
| | | | |
| namespace PoDoFo { | | namespace PoDoFo { | |
| | | | |
| class PdfEncoding; | | class PdfEncoding; | |
| class PdfDocEncoding; | | class PdfDocEncoding; | |
| class PdfMacRomanEncoding; | | class PdfMacRomanEncoding; | |
| class PdfObject; | | class PdfObject; | |
| class PdfWinAnsiEncoding; | | class PdfWinAnsiEncoding; | |
|
| | | class PdfStandardEncoding; // OC 13.08.2010 | |
| | | class PdfMacExpertEncoding; // OC 13.08.2010 | |
| | | class PdfSymbolEncoding; // OC 13.08.2010 | |
| | | class PdfZapfDingbatsEncoding; // OC 13.08.2010 | |
| | | | |
| /** This factory creates a PdfEncoding | | /** This factory creates a PdfEncoding | |
| * from an existing object in the PDF. | | * from an existing object in the PDF. | |
| */ | | */ | |
| class PODOFO_API PdfEncodingFactory { | | class PODOFO_API PdfEncodingFactory { | |
| public: | | public: | |
| /** Create a new PdfEncoding from either an | | /** Create a new PdfEncoding from either an | |
| * encoding name or an encoding dictionary. | | * encoding name or an encoding dictionary. | |
| * | | * | |
| * \param pObject must be a name or an encoding dictionary | | * \param pObject must be a name or an encoding dictionary | |
| | | | |
| skipping to change at line 71 | | skipping to change at line 75 | |
| */ | | */ | |
| static const PdfEncoding* GlobalWinAnsiEncodingInstance(); | | static const PdfEncoding* GlobalWinAnsiEncodingInstance(); | |
| | | | |
| /** Singleton method which returns a global instance | | /** Singleton method which returns a global instance | |
| * of MacRomanEncoding. | | * of MacRomanEncoding. | |
| * | | * | |
| * \returns global instance of MacRomanEncoding | | * \returns global instance of MacRomanEncoding | |
| */ | | */ | |
| static const PdfEncoding* GlobalMacRomanEncodingInstance(); | | static const PdfEncoding* GlobalMacRomanEncodingInstance(); | |
| | | | |
|
| | | // OC 13.08.2010: | |
| | | /** Singleton method which returns a global instance | |
| | | * of StandardEncoding. | |
| | | * | |
| | | * \returns global instance of StandardEncoding | |
| | | */ | |
| | | static const PdfEncoding* GlobalStandardEncodingInstance(); | |
| | | | |
| | | // OC 13.08.2010: | |
| | | /** Singleton method which returns a global instance | |
| | | * of MacExpertEncoding. | |
| | | * | |
| | | * \returns global instance of MacExpertEncoding | |
| | | */ | |
| | | static const PdfEncoding* GlobalMacExpertEncodingInstance(); | |
| | | | |
| | | // OC 13.08.2010: | |
| | | /** Singleton method which returns a global instance | |
| | | * of SymbolEncoding. | |
| | | * | |
| | | * \returns global instance of SymbolEncoding | |
| | | */ | |
| | | static const PdfEncoding* GlobalSymbolEncodingInstance(); | |
| | | | |
| | | // OC 13.08.2010: | |
| | | /** Singleton method which returns a global instance | |
| | | * of ZapfDingbatsEncoding. | |
| | | * | |
| | | * \returns global instance of ZapfDingbatsEncoding | |
| | | */ | |
| | | static const PdfEncoding* GlobalZapfDingbatsEncodingInstance(); | |
| | | | |
| /** Free's the memory allocated by | | /** Free's the memory allocated by | |
| * the global encoding instancess in this singleton. | | * the global encoding instancess in this singleton. | |
| * | | * | |
| * PoDoFo will reallocated these encodings as soon | | * PoDoFo will reallocated these encodings as soon | |
| * as they are needed again. | | * as they are needed again. | |
| * | | * | |
| + Only call this method if no other class | | + Only call this method if no other class | |
| * of PoDoFo exists anymore, as PdfString etc | | * of PoDoFo exists anymore, as PdfString etc | |
| * contain pointers to the global instances. | | * contain pointers to the global instances. | |
| */ | | */ | |
| | | | |
| skipping to change at line 104 | | skipping to change at line 140 | |
| * as heap allocation is expensive for PdfWinAnsiEncoding. | | * as heap allocation is expensive for PdfWinAnsiEncoding. | |
| */ | | */ | |
| static const PdfWinAnsiEncoding* s_pWinAnsiEncoding; | | static const PdfWinAnsiEncoding* s_pWinAnsiEncoding; | |
| | | | |
| /** Always use this static declaration, | | /** Always use this static declaration, | |
| * if you need an instance of PdfWinAnsiEncoding | | * if you need an instance of PdfWinAnsiEncoding | |
| * as heap allocation is expensive for PdfWinAnsiEncoding. | | * as heap allocation is expensive for PdfWinAnsiEncoding. | |
| */ | | */ | |
| static const PdfMacRomanEncoding* s_pMacRomanEncoding; | | static const PdfMacRomanEncoding* s_pMacRomanEncoding; | |
| | | | |
|
| | | // OC 13.08.2010: | |
| | | /** Always use this static declaration, | |
| | | * if you need an instance of StandardEncoding | |
| | | * as heap allocation is expensive for PdfStandardEncoding. | |
| | | */ | |
| | | static const PdfStandardEncoding* s_pStandardEncoding; | |
| | | | |
| | | // OC 13.08.2010: | |
| | | /** Always use this static declaration, | |
| | | * if you need an instance of MacExpertEncoding | |
| | | * as heap allocation is expensive for PdfMacExpertEncoding. | |
| | | */ | |
| | | static const PdfMacExpertEncoding* s_pMacExpertEncoding; | |
| | | | |
| | | // OC 13.08.2010: | |
| | | /** Always use this static declaration, | |
| | | * if you need an instance of SymbolEncoding | |
| | | * as heap allocation is expensive for PdfSymbolEncoding. | |
| | | */ | |
| | | static const PdfSymbolEncoding* s_pSymbolEncoding; | |
| | | | |
| | | // OC 13.08.2010: | |
| | | /** Always use this static declaration, | |
| | | * if you need an instance of ZapfDingbatsEncoding | |
| | | * as heap allocation is expensive for PdfZapfDingbatsEncoding. | |
| | | */ | |
| | | static const PdfZapfDingbatsEncoding* s_pZapfDingbatsEncoding; | |
| | | | |
| static Util::PdfMutex s_mutex; | | static Util::PdfMutex s_mutex; | |
| }; | | }; | |
| | | | |
| }; /* namespace PoDoFo */ | | }; /* namespace PoDoFo */ | |
| | | | |
| #endif // _PDF_ENCODING_FACTORY_H__ | | #endif // _PDF_ENCODING_FACTORY_H__ | |
| | | | |
End of changes. 3 change blocks. |
| 0 lines changed or deleted | | 64 lines changed or added | |
|
| PdfError.h | | PdfError.h | |
| | | | |
| skipping to change at line 206 | | skipping to change at line 206 | |
| * | | * | |
| * A PdfError with Error() == ErrOk means | | * A PdfError with Error() == ErrOk means | |
| * successfull execution. | | * successfull execution. | |
| * | | * | |
| * This class provides also meaningfull | | * This class provides also meaningfull | |
| * error descriptions. | | * error descriptions. | |
| */ | | */ | |
| class PODOFO_EXCEPTION_API_DOXYGEN PdfError : public std::exception { | | class PODOFO_EXCEPTION_API_DOXYGEN PdfError : public std::exception { | |
| public: | | public: | |
| | | | |
|
| | | // OC 17.08.2010 New to optionally replace stderr output by a callback: | |
| | | class LogMessageCallback | |
| | | { | |
| | | public: | |
| | | virtual ~LogMessageCallback() {} // every class with virtual method | |
| | | s needs a virtual destructor | |
| | | virtual void LogMessage( ELogSeverity eLogSeverity, const char* psz | |
| | | Prefix, const char* pszMsg, va_list & args ) = 0; | |
| | | virtual void LogMessage( ELogSeverity eLogSeverity, const wchar_t* | |
| | | pszPrefix, const wchar_t* pszMsg, va_list & args ) = 0; | |
| | | }; | |
| | | /** Set a global static LogMessageCallback functor to repleace stderr o | |
| | | utput in LogMessageInternal | |
| | | * \param fCallback the pointer to the new callback functor object | |
| | | * \returns the pointer to the previous callback functor object | |
| | | */ | |
| | | static LogMessageCallback* SetLogMessageCallback(LogMessageCallback* fL | |
| | | ogMessageCallback); | |
| | | | |
| /** Create a PdfError object initialized to ErrOk | | /** Create a PdfError object initialized to ErrOk | |
| */ | | */ | |
| PdfError(); | | PdfError(); | |
| | | | |
| /** Create a PdfError object with a given error code. | | /** Create a PdfError object with a given error code. | |
| * \param eCode the error code of this object | | * \param eCode the error code of this object | |
| * \param pszFile the file in which the error has occured. | | * \param pszFile the file in which the error has occured. | |
| * Use the compiler macro __FILE__ to initialize the field. | | * Use the compiler macro __FILE__ to initialize the field. | |
| * \param line the line in which the error has occured. | | * \param line the line in which the error has occured. | |
| * Use the compiler macro __LINE__ to initialize the field. | | * Use the compiler macro __LINE__ to initialize the field. | |
| | | | |
| skipping to change at line 412 | | skipping to change at line 426 | |
| static void LogMessageInternal( ELogSeverity eLogSeverity, const char*
pszMsg, va_list & args ); | | static void LogMessageInternal( ELogSeverity eLogSeverity, const char*
pszMsg, va_list & args ); | |
| static void LogMessageInternal( ELogSeverity eLogSeverity, const wchar_
t* pszMsg, va_list & args ); | | static void LogMessageInternal( ELogSeverity eLogSeverity, const wchar_
t* pszMsg, va_list & args ); | |
| | | | |
| private: | | private: | |
| EPdfError m_error; | | EPdfError m_error; | |
| | | | |
| TDequeErrorInfo m_callStack; | | TDequeErrorInfo m_callStack; | |
| | | | |
| static bool s_DgbEnabled; | | static bool s_DgbEnabled; | |
| static bool s_LogEnabled; | | static bool s_LogEnabled; | |
|
| | | | |
| | | // OC 17.08.2010 New to optionally replace stderr output by a callback: | |
| | | static LogMessageCallback* m_fLogMessageCallback; | |
| }; | | }; | |
| | | | |
| // ----------------------------------------------------- | | // ----------------------------------------------------- | |
| // | | // | |
| // ----------------------------------------------------- | | // ----------------------------------------------------- | |
| EPdfError PdfError::GetError() const | | EPdfError PdfError::GetError() const | |
| { | | { | |
| return m_error; | | return m_error; | |
| } | | } | |
| | | | |
| | | | |
End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 22 lines changed or added | |
|