Hi all,
this is the surprise I promised to you: because of
health reasons I didn't get to it earlier (I'm sorry).
In addition to the typo fixes and clarifications, e.g.
about methods being getters (isn't that also in the
PoDoFo CodingStyle?) I also fixed typos and some formatting
in attribute names and code using them. I didn't adhere to
the 80 chars/line limit everywhere because zyx pronounced
that unnecessary. I build-tested it for static- and shared-
library (both incl. programs) build both for native GNU/Linux
and as cross-build to Win32 (via MinGW-w64), it was all OK (no
new warnings).
I hope to have submitted the patch attached to this e-mail early
enough for it being committed making the revision directly after
the current one, i.e. Julian Rehborn's change (even as modified
by zyx) shall count for the future only, right?
Please, as long as there is no other change to commit, await the
second part of this my change submission, which will include more
controversial changes (although none to method bodies except for
typo fixes/formatting as in this).
Please commit the second part (only on acceptance, of course)
together with this one, this is an exception to what's usual for me.
When you'll have another person's change to commit, please commit the
patch attached here (my first part) first (without waiting for the
second one). The next revision number (after current) is important to me.
Best regards, mabri
Index: src/base/PdfCompilerCompat.h
===================================================================
--- src/base/PdfCompilerCompat.h (revision 1699)
+++ src/base/PdfCompilerCompat.h (working copy)
@@ -196,6 +196,10 @@
#undef DrawText
#endif // DrawText
+#ifdef IsLoggingEnabled
+#undef IsLoggingEnabled
+#endif // IsLoggingEnabled
+
#endif // defined(_WIN32)
/**
Index: src/base/PdfCompilerCompatPrivate.h
===================================================================
--- src/base/PdfCompilerCompatPrivate.h (revision 1699)
+++ src/base/PdfCompilerCompatPrivate.h (working copy)
@@ -71,6 +71,9 @@
# if defined(CreateFont)
# undef CreateFont
# endif
+# if defined(IsLoggingEnabled)
+# undef IsLoggingEnabled // dito, newly discovered breakage from windows.h
+# endif
#endif
namespace PoDoFo {
Index: src/base/PdfData.h
===================================================================
--- src/base/PdfData.h (revision 1699)
+++ src/base/PdfData.h (working copy)
@@ -107,7 +107,7 @@
* Access the data as a std::string
* \returns a const reference to the contained data
*/
- inline const std::string & data() const;
+ inline const std::string & GetData() const;
private:
std::string m_sData;
@@ -125,7 +125,7 @@
// -----------------------------------------------------
//
// -----------------------------------------------------
-const std::string & PdfData::data() const {
+const std::string & PdfData::GetData() const {
return m_sData;
}
Index: src/base/PdfDate.cpp
===================================================================
--- src/base/PdfDate.cpp (revision 1699)
+++ src/base/PdfDate.cpp (working copy)
@@ -169,7 +169,7 @@
std::ostringstream ss;
ss << "Generated invalid date from time_t value " << m_time
<< " (couldn't determine time zone)\n";
- PdfError::DebugMessage( ss.str().c_str() );
+ PdfError::LogDebugMessage( ss.str().c_str() );
strcpy( m_szDate, INVALIDDATE );
return;
}
@@ -184,7 +184,7 @@
std::ostringstream ss;
ss << "Generated invalid date from time_t value " << m_time
<< "\n";
- PdfError::DebugMessage( ss.str().c_str() );
+ PdfError::LogDebugMessage( ss.str().c_str() );
strcpy( m_szDate, INVALIDDATE );
return;
}
Index: src/base/PdfError.cpp
===================================================================
--- src/base/PdfError.cpp (revision 1699)
+++ src/base/PdfError.cpp (working copy)
@@ -41,7 +41,7 @@
namespace PoDoFo {
-bool PdfError::s_DgbEnabled = true;
+bool PdfError::s_DebugEnabled = true;
bool PdfError::s_LogEnabled = true;
// OC 17.08.2010 New to optionally replace stderr output by a callback:
@@ -149,8 +149,8 @@
void PdfError::PrintErrorMsg() const
{
TCIDequeErrorInfo it = m_callStack.begin();
- const char* pszMsg = PdfError::ErrorMessage( m_error );
- const char* pszName = PdfError::ErrorName( m_error );
+ const char* pszMsg = PdfError::GetErrorMessage( m_error );
+ const char* pszName = PdfError::GetErrorName( m_error );
int i = 0;
@@ -183,10 +183,10 @@
const char* PdfError::what() const
{
- return PdfError::ErrorName( m_error );
+ return PdfError::GetErrorName( m_error );
}
-const char* PdfError::ErrorName( EPdfError eCode )
+const char* PdfError::GetErrorName( EPdfError eCode )
{
const char* pszMsg = NULL;
@@ -352,7 +352,7 @@
return pszMsg;
}
-const char* PdfError::ErrorMessage( EPdfError eCode )
+const char* PdfError::GetErrorMessage( EPdfError eCode )
{
const char* pszMsg = NULL;
@@ -490,7 +490,7 @@
void PdfError::LogMessage( ELogSeverity eLogSeverity, const char* pszMsg, ... )
{
- if(!PdfError::LoggingEnabled())
+ if(!PdfError::IsLoggingEnabled())
return;
#ifdef DEBUG
@@ -560,7 +560,7 @@
void PdfError::LogMessage( ELogSeverity eLogSeverity, const wchar_t* pszMsg, ... )
{
- if(!PdfError::LoggingEnabled())
+ if(!PdfError::IsLoggingEnabled())
return;
#ifdef DEBUG
@@ -628,9 +628,9 @@
vfwprintf( stderr, pszMsg, args );
}
-void PdfError::DebugMessage( const char* pszMsg, ... )
+void PdfError::LogDebugMessage( const char* pszMsg, ... )
{
- if ( !PdfError::DebugEnabled() )
+ if ( !PdfError::IsDebugEnabled() )
return;
const char* pszPrefix = "DEBUG: ";
Index: src/base/PdfError.h
===================================================================
--- src/base/PdfError.h (revision 1699)
+++ src/base/PdfError.h (working copy)
@@ -55,8 +55,8 @@
/** Error Code defines which are used in PdfError to describe the error.
*
- * If you add an error code to this enum, please also add it to PdfError::ErrorName
- * and PdfError::ErrorMessage.
+ * If you add an error code to this enum, please also add it to PdfError::GetErrorName()
+ * and PdfError::GetErrorMessage().
*
* \see PdfError
*/
@@ -80,7 +80,7 @@
ePdfError_NoXRef, /**< The PDF file has no or an invalid XRef table. */
ePdfError_NoTrailer, /**< The PDF file has no or an invalid trailer. */
ePdfError_NoNumber, /**< A number was expected in the PDF file, but the read string is no number. */
- ePdfError_NoObject, /**< A object was expected and non was found. */
+ ePdfError_NoObject, /**< A object was expected and none was found. */
ePdfError_NoEOFToken, /**< The PDF file has no or an invalid EOF marker. */
ePdfError_InvalidTrailerSize, /**< The trailer size is invalid. */
@@ -102,7 +102,7 @@
ePdfError_InvalidContentStream, /**< The content stream is invalid due to mismatched context pairing or other problems */
ePdfError_UnsupportedFilter, /**< The requested filter is not yet implemented. */
- ePdfError_UnsupportedFontFormat, /**< This font format is not supported by PoDoFO. */
+ ePdfError_UnsupportedFontFormat, /**< This font format is not supported by PoDoFo. */
ePdfError_ActionAlreadyPresent, /**< An Action was already present when trying to add a Destination */
ePdfError_WrongDestinationType, /**< The requested field is not available for the given destination type */
@@ -114,15 +114,15 @@
ePdfError_MutexError, /**< Error during a mutex operation */
- ePdfError_UnsupportedImageFormat, /**< This image format is not supported by PoDoFO. */
+ ePdfError_UnsupportedImageFormat, /**< This image format is not supported by PoDoFo. */
ePdfError_CannotConvertColor, /**< This color format cannot be converted. */
ePdfError_NotImplemented, /**< This feature is currently not implemented. */
- ePdfError_DestinationAlreadyPresent,/**< An destination was already present when trying to add a Action */
+ ePdfError_DestinationAlreadyPresent,/**< An destination was already present when trying to add an Action */
ePdfError_ChangeOnImmutable, /**< Changing values on immutable objects is not allowed. */
- ePdfError_NotCompiled, /**< This feature was disabled during compile time. */
+ ePdfError_NotCompiled, /**< This feature was disabled at compile time. */
ePdfError_Unknown = 0xffff /**< Unknown error */
};
@@ -180,7 +180,7 @@
PdfErrorInfo();
PdfErrorInfo( int line, const char* pszFile, const char* pszInfo );
PdfErrorInfo( int line, const char* pszFile, const wchar_t* pszInfo );
- PdfErrorInfo( const PdfErrorInfo & rhs );
+ PdfErrorInfo( const PdfErrorInfo & rhs );
const PdfErrorInfo & operator=( const PdfErrorInfo & rhs );
@@ -196,7 +196,7 @@
int m_nLine;
std::string m_sFile;
std::string m_sInfo;
- std::wstring m_swInfo;
+ std::wstring m_swInfo;
};
@@ -367,7 +367,7 @@
* \returns the name or NULL if no name for the specified
* error code is available.
*/
- PODOFO_NOTHROW static const char* ErrorName( EPdfError eCode );
+ PODOFO_NOTHROW static const char* GetErrorName( EPdfError eCode );
/** Get the error message for a certain error code.
* \returns the error message or NULL if no error
@@ -374,7 +374,7 @@
* message for the specified error code
* is available.
*/
- static const char* ErrorMessage( EPdfError eCode );
+ static const char* GetErrorMessage( EPdfError eCode );
/** Log a message to the logging system defined for PoDoFo.
* \param eLogSeverity the sevirity of the log message
@@ -395,29 +395,29 @@
/** Is the display of debugging messages enabled or not?
*/
- static bool LoggingEnabled() { return PdfError::s_LogEnabled; }
+ static bool IsLoggingEnabled() { return PdfError::s_LogEnabled; }
/** Log a message to the logging system defined for PoDoFo for debugging
* \param pszMsg the message to be logged
*/
- static void DebugMessage( const char* pszMsg, ... );
+ static void LogDebugMessage( const char* pszMsg, ... );
/** Enable or disable the display of debugging messages
* \param bEnable enable (true) or disable (false)
*/
- static void EnableDebug( bool bEnable ) { PdfError::s_DgbEnabled = bEnable; }
+ static void EnableDebug( bool bEnable ) { PdfError::s_DebugEnabled = bEnable; }
/** Is the display of debugging messages enabled or not?
*/
- static bool DebugEnabled() { return PdfError::s_DgbEnabled; }
+ static bool IsDebugEnabled() { return PdfError::s_DebugEnabled; }
private:
/** Log a message to the logging system defined for PoDoFo.
*
* This call does not check if logging is enabled and always
- * prints the error message
+ * prints the error message.
*
- * \param eLogSeverity the sevirity of the log message
+ * \param eLogSeverity the severity of the log message
* \param pszMsg the message to be logged
*/
static void LogErrorMessage( ELogSeverity eLogSeverity, const char* pszMsg, ... );
@@ -425,9 +425,9 @@
/** Log a message to the logging system defined for PoDoFo.
*
* This call does not check if logging is enabled and always
- * prints the error message
+ * prints the error message.
*
- * \param eLogSeverity the sevirity of the log message
+ * \param eLogSeverity the severity of the log message
* \param pszMsg the message to be logged
*/
static void LogErrorMessage( ELogSeverity eLogSeverity, const wchar_t* pszMsg, ... );
@@ -440,7 +440,7 @@
TDequeErrorInfo m_callStack;
- static bool s_DgbEnabled;
+ static bool s_DebugEnabled;
static bool s_LogEnabled;
// OC 17.08.2010 New to optionally replace stderr output by a callback:
Index: src/base/PdfParser.cpp
===================================================================
--- src/base/PdfParser.cpp (revision 1699)
+++ src/base/PdfParser.cpp (working copy)
@@ -417,7 +417,7 @@
return;
}
} catch( PdfError & e ) {
- PdfError::LogMessage( eLogSeverity_Warning, e.ErrorName(e.GetError()) );
+ PdfError::LogMessage( eLogSeverity_Warning, e.GetErrorName(e.GetError()) );
delete m_pLinearization;
m_pLinearization = NULL;
return;
@@ -692,7 +692,7 @@
bool gotToken = this->GetNextToken( pszRead, &eType );
if( gotToken )
{
- this->QuequeToken( pszRead, eType );
+ this->EnqueueToken( pszRead, eType );
if ( strcmp( "trailer", pszRead ) == 0 )
break;
}
Index: src/base/PdfRefCountedBuffer.cpp
===================================================================
--- src/base/PdfRefCountedBuffer.cpp (revision 1699)
+++ src/base/PdfRefCountedBuffer.cpp (working copy)
@@ -50,7 +50,7 @@
m_pBuffer->m_bOnHeap = true;
m_pBuffer->m_lBufferSize = lSize;
m_pBuffer->m_lVisibleSize = lSize;
- m_pBuffer->m_bPossesion = true;
+ m_pBuffer->m_bPossession = true;
}
}
@@ -59,7 +59,7 @@
PODOFO_RAISE_LOGIC_IF( !m_pBuffer || m_pBuffer->m_lRefCount, "Tried to free in-use buffer" );
// last owner of the file!
- if( m_pBuffer->m_bOnHeap && m_pBuffer->m_bPossesion )
+ if( m_pBuffer->m_bOnHeap && m_pBuffer->m_bPossession )
free( m_pBuffer->m_pHeapBuffer );
delete m_pBuffer;
}
@@ -78,7 +78,7 @@
else
pBuffer->m_pHeapBuffer = 0;
pBuffer->m_lBufferSize = PDF_MAX( lSize, static_cast<size_t>(+TRefCountedBuffer::INTERNAL_BUFSIZE) );
- pBuffer->m_bPossesion = true;
+ pBuffer->m_bPossession = true;
if( pBuffer->m_bOnHeap && !pBuffer->m_pHeapBuffer )
{
@@ -114,7 +114,7 @@
// to clients.
//
const size_t lAllocSize = PDF_MAX(lSize, m_pBuffer->m_lBufferSize) << 1;
- if ( m_pBuffer->m_bPossesion && m_pBuffer->m_bOnHeap )
+ if ( m_pBuffer->m_bPossession && m_pBuffer->m_bOnHeap )
{
// We have an existing on-heap buffer that we own. Realloc()
// it, potentially saving us a memcpy and free().
@@ -165,7 +165,7 @@
}
m_pBuffer->m_lBufferSize = PDF_MAX( lSize, static_cast<size_t>(+TRefCountedBuffer::INTERNAL_BUFSIZE) );
- m_pBuffer->m_bPossesion = true;
+ m_pBuffer->m_bPossession = true;
if( m_pBuffer->m_bOnHeap && !m_pBuffer->m_pHeapBuffer )
{
Index: src/base/PdfRefCountedBuffer.h
===================================================================
--- src/base/PdfRefCountedBuffer.h (revision 1699)
+++ src/base/PdfRefCountedBuffer.h (working copy)
@@ -123,13 +123,13 @@
*
* \param bTakePossession if false the buffer will not be deleted.
*/
- inline void SetTakePossesion( bool bTakePossession );
+ inline void SetTakePossession( bool bTakePossession );
/**
* \returns true if the buffer is owned by the PdfRefCountedBuffer
* and is deleted along with it.
*/
- inline bool TakePossesion() const;
+ inline bool GetTakePossession() const;
/** Compare to buffers.
* \param rhs compare to this buffer
@@ -202,7 +202,7 @@
long m_lRefCount;
char* m_pHeapBuffer;
char m_sInternalBuffer[INTERNAL_BUFSIZE];
- bool m_bPossesion;
+ bool m_bPossession;
// Are we using the heap-allocated buffer in place of our small internal one?
bool m_bOnHeap;
};
@@ -267,18 +267,18 @@
// -----------------------------------------------------
//
// -----------------------------------------------------
-inline void PdfRefCountedBuffer::SetTakePossesion( bool bTakePossession )
+inline void PdfRefCountedBuffer::SetTakePossession( bool bTakePossession )
{
if( m_pBuffer )
- m_pBuffer->m_bPossesion = bTakePossession;
+ m_pBuffer->m_bPossession = bTakePossession;
}
// -----------------------------------------------------
//
// -----------------------------------------------------
-inline bool PdfRefCountedBuffer::TakePossesion() const
+inline bool PdfRefCountedBuffer::GetTakePossession() const
{
- return m_pBuffer ? m_pBuffer->m_bPossesion : false;
+ return m_pBuffer ? m_pBuffer->m_bPossession : false;
}
// -----------------------------------------------------
Index: src/base/PdfTokenizer.cpp
===================================================================
--- src/base/PdfTokenizer.cpp (revision 1699)
+++ src/base/PdfTokenizer.cpp (working copy)
@@ -209,11 +209,11 @@
int c;
pdf_int64 counter = 0;
- // check first if there are quequed tokens and return them first
- if( m_deqQueque.size() )
+ // check first if there are queued tokens and return them first
+ if( m_deqQueue.size() )
{
- TTokenizerPair pair = m_deqQueque.front();
- m_deqQueque.pop_front();
+ TTokenizerPair pair = m_deqQueue.front();
+ m_deqQueue.pop_front();
if( peType )
*peType = pair.second;
@@ -362,7 +362,7 @@
if( end == pszRead )
{
// Don't consume the token
- this->QuequeToken( pszRead, eType );
+ this->EnqueueToken( pszRead, eType );
PODOFO_RAISE_ERROR_INFO( ePdfError_NoNumber, pszRead );
}
@@ -475,7 +475,7 @@
return eDataType;
if( eSecondTokenType != ePdfTokenType_Token )
{
- this->QuequeToken( pszToken, eSecondTokenType );
+ this->EnqueueToken( pszToken, eSecondTokenType );
return eDataType;
}
@@ -488,7 +488,7 @@
#endif
if( pszToken == pszStart )
{
- this->QuequeToken( pszStart, eSecondTokenType );
+ this->EnqueueToken( pszStart, eSecondTokenType );
return eDataType;
}
@@ -507,8 +507,8 @@
}
else
{
- this->QuequeToken( backup.c_str(), eSecondTokenType );
- this->QuequeToken( pszToken, eThirdTokenType );
+ this->EnqueueToken( backup.c_str(), eSecondTokenType );
+ this->EnqueueToken( pszToken, eThirdTokenType );
return eDataType;
}
}
@@ -540,7 +540,7 @@
<< "\". Current read offset is "
<< m_device.Device()->Tell()
<< " which should be around the problem.\n";
- PdfError::DebugMessage(ss.str().c_str());
+ PdfError::LogDebugMessage(ss.str().c_str());
}
return ePdfDataType_Unknown;
@@ -803,17 +803,17 @@
// Some weird PDFs even use them.
rVariant = PdfName();
- // Queque the token again
+ // Enqueue the token again
if( gotToken )
- QuequeToken( pszToken, eType );
+ EnqueueToken( pszToken, eType );
}
else
rVariant = PdfName::FromEscaped( pszToken );
}
-void PdfTokenizer::QuequeToken( const char* pszToken, EPdfTokenType eType )
+void PdfTokenizer::EnqueueToken( const char* pszToken, EPdfTokenType eType )
{
- m_deqQueque.push_back( TTokenizerPair( std::string( pszToken ), eType ) );
+ m_deqQueue.push_back( TTokenizerPair( std::string( pszToken ), eType ) );
}
};
Index: src/base/PdfTokenizer.h
===================================================================
--- src/base/PdfTokenizer.h (revision 1699)
+++ src/base/PdfTokenizer.h (working copy)
@@ -54,9 +54,9 @@
};
typedef std::pair<std::string,EPdfTokenType> TTokenizerPair;
-typedef std::deque<TTokenizerPair> TTokenizerQueque;
-typedef TTokenizerQueque::iterator TITokenizerQueque;
-typedef TTokenizerQueque::const_iterator TCITokenizerQueque;
+typedef std::deque<TTokenizerPair> TTokenizerQueue;
+typedef TTokenizerQueue::iterator TITokenizerQueue;
+typedef TTokenizerQueue::const_iterator TCITokenizerQueue;
/**
@@ -234,8 +234,8 @@
*/
void ReadName( PdfVariant& rVariant );
- /** Add a token to the queque of tokens.
- * GetNextToken() will return all quequed tokens first before
+ /** Add a token to the queue of tokens.
+ * GetNextToken() will return all enqueued tokens first before
* reading new tokens from the input device.
*
* \param pszToken string of the token
@@ -243,7 +243,7 @@
*
* \see GetNextToken
*/
- void QuequeToken( const char* pszToken, EPdfTokenType eType );
+ void EnqueueToken( const char* pszToken, EPdfTokenType eType );
protected:
PdfRefCountedInputDevice m_device;
@@ -261,7 +261,7 @@
static const char * const s_hexMap; ///< Mapping of hex characters to there value
- TTokenizerQueque m_deqQueque;
+ TTokenizerQueue m_deqQueue;
// A vector which is used as a buffer to read strings.
// It is a member of the class to avoid reallocations while parsing.
Index: src/base/PdfVecObjects.cpp
===================================================================
--- src/base/PdfVecObjects.cpp (revision 1699)
+++ src/base/PdfVecObjects.cpp (working copy)
@@ -264,7 +264,7 @@
if( it.first != it.second && !m_lstFreeObjects.empty() )
{
// Be sure that no reference is added twice to free list
- PdfError::DebugMessage( "Adding %d to freelist, is already contained !!", rReference.ObjectNumber() );
+ PdfError::LogDebugMessage( "Adding %d to free list, is already contained in it!", rReference.ObjectNumber() );
return;
}
else
Index: src/base/PdfVecObjects.h
===================================================================
--- src/base/PdfVecObjects.h (revision 1699)
+++ src/base/PdfVecObjects.h (working copy)
@@ -183,7 +183,7 @@
* \returns if autodeletion is enabled and all objects will be deleted when the PdfVecObjects is
* deleted.
*/
- inline bool AutoDelete() const;
+ inline bool GetAutoDelete() const;
/** Removes all objects from the vector
* and resets it to the default state.
@@ -509,7 +509,7 @@
// -----------------------------------------------------
//
// -----------------------------------------------------
-inline bool PdfVecObjects::AutoDelete() const
+inline bool PdfVecObjects::GetAutoDelete() const
{
return m_bAutoDelete;
}
Index: src/base/PdfXRefStream.cpp
===================================================================
--- src/base/PdfXRefStream.cpp (revision 1699)
+++ src/base/PdfXRefStream.cpp (working copy)
@@ -68,7 +68,7 @@
void PdfXRefStream::WriteSubSection( PdfOutputDevice*, pdf_objnum first, pdf_uint32 count )
{
- PdfError::DebugMessage("Writing XRef section: %u %u\n", first, count );
+ PdfError::LogDebugMessage("Writing XRef section: %u %u\n", first, count );
m_indeces.push_back( static_cast<pdf_int64>(first) );
m_indeces.push_back( static_cast<pdf_int64>(count) );
Index: src/doc/PdfField.h
===================================================================
--- src/doc/PdfField.h (revision 1699)
+++ src/doc/PdfField.h (working copy)
@@ -924,7 +924,7 @@
*
* \param bCombs if true enable division into combs
*
- * By default coms are disabled. Requires the max len
+ * By default combs are disabled. Requires the max-len
* property to be set.
*
* \see SetMaxLen
@@ -932,9 +932,9 @@
inline void SetCombs( bool bCombs );
/**
- * \returns true if the text field is divided in to equal combs
+ * \returns true if the text field has a division into equal combs set on it
*/
- inline bool IsCombs() const;
+ inline bool HasCombs() const;
/**
* Creates a richtext field.
@@ -1045,7 +1045,7 @@
// -----------------------------------------------------
//
// -----------------------------------------------------
-inline bool PdfTextField::IsCombs() const
+inline bool PdfTextField::HasCombs() const
{
return this->GetFieldFlag( static_cast<int>(ePdfTextField_Comb), false );
}
Index: src/doc/PdfFontMetrics.cpp
===================================================================
--- src/doc/PdfFontMetrics.cpp (revision 1699)
+++ src/doc/PdfFontMetrics.cpp (working copy)
@@ -1016,7 +1016,7 @@
EPdfFontType eFontType = PdfFontFactory::GetFontType( pszFilename );
if( eFontType == ePdfFontType_Unknown )
- PdfError::DebugMessage( "Warning: Unrecognized FontFormat: %s\n", pszFilename );
+ PdfError::LogDebugMessage( "Warning: Unrecognized FontFormat: %s\n", pszFilename );
return eFontType;
}
Index: src/doc/PdfMemDocument.cpp
===================================================================
--- src/doc/PdfMemDocument.cpp (revision 1699)
+++ src/doc/PdfMemDocument.cpp (working copy)
@@ -132,7 +132,7 @@
// so that pTrailer has an owner
// and GetIndirectKey will work
- if(PdfError::DebugEnabled())
+ if(PdfError::IsDebugEnabled())
{
// OC 17.08.2010: Avoid using cout here:
// PdfOutputDevice debug( &(std::cout) );
Index: src/doc/PdfPage.cpp
===================================================================
--- src/doc/PdfPage.cpp (revision 1699)
+++ src/doc/PdfPage.cpp (working copy)
@@ -356,7 +356,7 @@
pObj = this->GetObject()->GetOwner()->GetObject( ref );
if( !pObj )
{
- PdfError::DebugMessage( "Error looking up object %i %i R\n", ref.ObjectNumber(), ref.GenerationNumber() );
+ PdfError::LogDebugMessage( "Error looking up object %i %i R\n", ref.ObjectNumber(), ref.GenerationNumber() );
PODOFO_RAISE_ERROR( ePdfError_NoObject );
}
Index: src/doc/PdfSignOutputDevice.cpp
===================================================================
--- src/doc/PdfSignOutputDevice.cpp (revision 1699)
+++ src/doc/PdfSignOutputDevice.cpp (working copy)
@@ -100,7 +100,7 @@
size_t PdfSignOutputDevice::GetSignatureSize()const
{
- return (m_pSignatureBeacon == NULL)?0:(m_pSignatureBeacon->data().size()/2);
+ return (m_pSignatureBeacon == NULL) ? 0 : ( m_pSignatureBeacon->GetData().size() / 2 );
}
void PdfSignOutputDevice::SetSignature(const PdfData &sigData)
@@ -108,13 +108,13 @@
if(!m_bBeaconFound) {
PODOFO_RAISE_ERROR( ePdfError_InternalLogic );
}
- size_t maxSigSize = m_pSignatureBeacon->data().size();
- size_t sigByteSize = sigData.data().size();
+ size_t maxSigSize = m_pSignatureBeacon->GetData().size();
+ size_t sigByteSize = sigData.GetData().size();
// check signature size
if((sigByteSize*2)> maxSigSize) {
PODOFO_RAISE_ERROR( ePdfError_ValueOutOfRange );
}
- PdfString sig(sigData.data().c_str(), sigByteSize, true);
+ PdfString sig(sigData.GetData().c_str(), sigByteSize, true);
m_pRealDevice->Seek(m_sBeaconPos);
sig.Write(m_pRealDevice, PoDoFo::ePdfWriteMode_Compact);
@@ -142,8 +142,8 @@
PdfArray arr;
arr.push_back( PdfVariant(static_cast<pdf_int64>(0)) );
arr.push_back( PdfVariant(static_cast<pdf_int64>(m_sBeaconPos)) );
- arr.push_back( PdfVariant(static_cast<pdf_int64>(m_sBeaconPos+m_pSignatureBeacon->data().size()+2) ) );
- arr.push_back( PdfVariant(static_cast<pdf_int64>(sFileEnd-(m_sBeaconPos+m_pSignatureBeacon->data().size()+2)) ) );
+ arr.push_back( PdfVariant(static_cast<pdf_int64>(m_sBeaconPos+m_pSignatureBeacon->GetData().size() + 2) ) );
+ arr.push_back( PdfVariant(static_cast<pdf_int64>(sFileEnd-(m_sBeaconPos+m_pSignatureBeacon->GetData().size() + 2)) ) );
std::string sPosition;
PdfVariant(arr).ToString(sPosition, ePdfWriteMode_Compact);
// Fill padding
@@ -196,12 +196,12 @@
if(lLen==0) return numRead;
}
}
- // shift at the end of beacon
- if( (pos+numRead)>= m_sBeaconPos &&
- pos < (m_sBeaconPos+(m_pSignatureBeacon->data().size()+2) )
- ) {
- m_pRealDevice->Seek(m_sBeaconPos+(m_pSignatureBeacon->data().size()+2) );
- }
+ // shift at the end of beacon
+ if ( (pos + numRead) >= m_sBeaconPos &&
+ pos < ( m_sBeaconPos + (m_pSignatureBeacon->GetData().size() + 2) )
+ ) {
+ m_pRealDevice->Seek( m_sBeaconPos + (m_pSignatureBeacon->GetData().size() + 2) );
+ }
// read after beacon
lLen = PODOFO_MIN(lLen, m_pRealDevice->GetLength()-m_pRealDevice->Tell());
if(lLen==0) return numRead;
@@ -211,10 +211,10 @@
void PdfSignOutputDevice::Write( const char* pBuffer, size_t lLen )
{
// Check if data with beacon
- if(m_pSignatureBeacon!=NULL)
+ if(m_pSignatureBeacon != NULL)
{
- const std::string &data = m_pSignatureBeacon->data();
- if(data.size()<=lLen)
+ const std::string & data = m_pSignatureBeacon->GetData();
+ if(data.size() <= lLen)
{
const char *pStart = pBuffer;
const char *pStop = pStart + (lLen-data.size());
Index: src/doc/PdfSignatureField.cpp
===================================================================
--- src/doc/PdfSignatureField.cpp (revision 1699)
+++ src/doc/PdfSignatureField.cpp (working copy)
@@ -122,12 +122,12 @@
void PdfSignatureField::SetSignature(const PdfData &sSignatureData)
{
// Prepare source data
- size_t lSigLen = sSignatureData.data().size();
- char* pData = static_cast<char*>(malloc(lSigLen+2));
- pData[0]='<';
- pData[lSigLen+1]='>';
- memcpy(pData+1, sSignatureData.data().c_str(), lSigLen);
- PdfData signatureData(pData, lSigLen+2);
+ size_t lSigLen = sSignatureData.GetData().size();
+ char* pData = static_cast<char*>( malloc(lSigLen + 2) );
+ pData[0] = '<';
+ pData[lSigLen + 1] = '>';
+ memcpy(pData + 1, sSignatureData.GetData().c_str(), lSigLen);
+ PdfData signatureData(pData, lSigLen + 2);
free(pData);
// Content of the signature
if( !m_pSignatureObj )
Index: test/ContentParser/main.cpp
===================================================================
--- test/ContentParser/main.cpp (revision 1699)
+++ test/ContentParser/main.cpp (working copy)
@@ -64,7 +64,7 @@
else if (eType == ePdfContentsType_ImageData)
{
if (print_output) {
- std::string d ( var.GetRawData().data() );
+ std::string d ( var.GetRawData().GetData() );
std::cout << string(13, ' ') << "Inline image data: " << d.size() << " bytes. Hex follows." << std::hex << std::endl;
std::cout << std::hex << std::setfill('0');
for ( std::string::iterator i = d.begin(); i != d.end(); i ++) {
Index: tools/podofoimpose/pdftranslator.cpp
===================================================================
--- tools/podofoimpose/pdftranslator.cpp (revision 1699)
+++ tools/podofoimpose/pdftranslator.cpp (working copy)
@@ -125,7 +125,7 @@
}
catch(PdfError& e)
{
- std::cerr<<"Unable to create Document: " <<PdfError::ErrorMessage( e. GetError() )<<endl;
+ std::cerr << "Unable to create Document: " << PdfError::GetErrorMessage( e.GetError() ) << std::endl;
return;
}
}
------------------------------------------------------------------------------
_______________________________________________
Podofo-users mailing list
Podofo-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/podofo-users
