PdfArray.h   PdfArray.h 
skipping to change at line 137 skipping to change at line 137
/** /**
* \returns true if the array is empty. * \returns true if the array is empty.
*/ */
inline bool empty() const; inline bool empty() const;
inline PdfObject & operator[](size_type __n); inline PdfObject & operator[](size_type __n);
inline const PdfObject & operator[](size_type __n) const; inline const PdfObject & operator[](size_type __n) const;
/** /**
* Resize the internal vector.
* \param __n new size
*/
inline void resize(size_t __n, value_type __x = PdfArrayBaseClass::valu
e_type());
/**
* Returns a read/write iterator that points to the first * Returns a read/write iterator that points to the first
* element in the array. Iteration is done in ordinary * element in the array. Iteration is done in ordinary
* element order. * element order.
*/ */
inline iterator begin(); inline iterator begin();
/** /**
* Returns a read-only (constant) iterator that points to the * Returns a read-only (constant) iterator that points to the
* first element in the array. Iteration is done in ordinary * first element in the array. Iteration is done in ordinary
* element order. * element order.
skipping to change at line 331 skipping to change at line 337
// //
// ----------------------------------------------------- // -----------------------------------------------------
const PdfObject& PdfArray::operator[](size_type __n) const const PdfObject& PdfArray::operator[](size_type __n) const
{ {
return PdfArrayBaseClass::operator[](__n); return PdfArrayBaseClass::operator[](__n);
} }
// ----------------------------------------------------- // -----------------------------------------------------
// //
// ----------------------------------------------------- // -----------------------------------------------------
void PdfArray::resize(size_t __n, value_type __x)
{
return PdfArrayBaseClass::resize(__n, __x);
}
// -----------------------------------------------------
//
// -----------------------------------------------------
PdfArray::iterator PdfArray::begin() PdfArray::iterator PdfArray::begin()
{ {
return PdfArrayBaseClass::begin(); return PdfArrayBaseClass::begin();
} }
// ----------------------------------------------------- // -----------------------------------------------------
// //
// ----------------------------------------------------- // -----------------------------------------------------
PdfArray::const_iterator PdfArray::begin() const PdfArray::const_iterator PdfArray::begin() const
{ {
 End of changes. 2 change blocks. 
0 lines changed or deleted 15 lines changed or added


 PdfFontMetricsObject.h   PdfFontMetricsObject.h 
skipping to change at line 232 skipping to change at line 232
double m_dAscent; double m_dAscent;
double m_dDescent; double m_dDescent;
double m_dLineSpacing; double m_dLineSpacing;
double m_dUnderlineThickness; double m_dUnderlineThickness;
double m_dUnderlinePosition; double m_dUnderlinePosition;
double m_dStrikeOutThickness; double m_dStrikeOutThickness;
double m_dStrikeOutPosition; double m_dStrikeOutPosition;
bool m_bSymbol; ///< Internal member to singnal a symbol font bool m_bSymbol; ///< Internal member to singnal a symbol font
double m_dDefWidth; ///< default width
}; };
}; };
#endif // _PDF_FONT_METRICS_OBJECT_H_ #endif // _PDF_FONT_METRICS_OBJECT_H_
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 PdfFontType1.h   PdfFontType1.h 
skipping to change at line 44 skipping to change at line 44
public: public:
/** Create a new Type1 font object. /** Create a new Type1 font object.
* *
* \param pMetrics pointer to a font metrics object. The font in the P DF * \param pMetrics pointer to a font metrics object. The font in the P DF
* file will match this fontmetrics object. The metrics object is * file will match this fontmetrics object. The metrics object is
* deleted along with the font. * deleted along with the font.
* \param pEncoding the encoding of this font. The font will not take ownership of this object. * \param pEncoding the encoding of this font. The font will not take ownership of this object.
* \param pParent parent of the font object * \param pParent parent of the font object
* \param bEmbed if true the font will get embedded. * \param bEmbed if true the font will get embedded.
* \param bSubsetting if true the font will use subsetting.
* *
*/ */
PdfFontType1( PdfFontMetrics* pMetrics, const PdfEncoding* const pEncod ing, PdfFontType1( PdfFontMetrics* pMetrics, const PdfEncoding* const pEncod ing,
PdfVecObjects* pParent, bool bEmbed ); PdfVecObjects* pParent, bool bEmbed, bool bSubsetting = f alse );
/** Create a PdfFont based on an existing PdfObject /** Create a PdfFont based on an existing PdfObject
* \param pMetrics pointer to a font metrics object. The font in the P DF * \param pMetrics pointer to a font metrics object. The font in the P DF
* file will match this fontmetrics object. The metrics object is * file will match this fontmetrics object. The metrics object is
* deleted along with the font. * deleted along with the font.
* \param pEncoding the encoding of this font. The font will not take ownership of this object. * \param pEncoding the encoding of this font. The font will not take ownership of this object.
* \param pObject an existing PdfObject * \param pObject an existing PdfObject
*/ */
PdfFontType1( PdfFontMetrics* pMetrics, const PdfEncoding* const pEncod ing, PdfFontType1( PdfFontMetrics* pMetrics, const PdfEncoding* const pEncod ing,
PdfObject* pObject ); PdfObject* pObject );
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 PdfShadingPattern.h   PdfShadingPattern.h 
skipping to change at line 152 skipping to change at line 152
*/ */
class PODOFO_DOC_API PdfFunctionBaseShadingPattern : public PdfShadingPatte rn { class PODOFO_DOC_API PdfFunctionBaseShadingPattern : public PdfShadingPatte rn {
public: public:
/** Create an 2D shading pattern /** Create an 2D shading pattern
* *
* \param rLL the color on lower left corner * \param rLL the color on lower left corner
* \param rUL the color on upper left corner * \param rUL the color on upper left corner
* \param rLR the color on lower right corner * \param rLR the color on lower right corner
* \param rUR the color on upper right corner * \param rUR the color on upper right corner
* \param rMatrix the transformation matrix mapping the coordinate spa ce * \param rMatrix the transformation matrix mapping the coordinate spa ce
* specified by the Domain entry into the shading * specified by the Domain entry into the shadings target coord inate space
* \param pParent the parent * \param pParent the parent
*/ */
PdfFunctionBaseShadingPattern( const PdfColor & rLL, const PdfColor & r UL, const PdfColor & rLR, const PdfColor & rUR, const PdfArray & rMatrix, P dfVecObjects* pParent ); PdfFunctionBaseShadingPattern( const PdfColor & rLL, const PdfColor & r UL, const PdfColor & rLR, const PdfColor & rUR, const PdfArray & rMatrix, P dfVecObjects* pParent );
/** Create an 2D shading pattern /** Create an 2D shading pattern
* *
* \param rLL the color on lower left corner * \param rLL the color on lower left corner
* \param rUL the color on upper left corner * \param rUL the color on upper left corner
* \param rLR the color on lower right corner * \param rLR the color on lower right corner
* \param rUR the color on upper right corner * \param rUR the color on upper right corner
* \param rMatrix the transformation matrix mapping the coordinate spa ce * \param rMatrix the transformation matrix mapping the coordinate spa ce
* specified by the Domain entry into the shading * specified by the Domain entry into the shading's target coor dinate space
* \param pParent the parent * \param pParent the parent
*/ */
PdfFunctionBaseShadingPattern( const PdfColor & rLL, const PdfColor & r UL, const PdfColor & rLR, const PdfColor & rUR, const PdfArray & rMatrix, P dfDocument* pParent ); PdfFunctionBaseShadingPattern( const PdfColor & rLL, const PdfColor & r UL, const PdfColor & rLR, const PdfColor & rUR, const PdfArray & rMatrix, P dfDocument* pParent );
private: private:
/** Initialize an 2D shading pattern /** Initialize an 2D shading pattern
* *
* \param rLL the color on lower left corner * \param rLL the color on lower left corner
* \param rUL the color on upper left corner * \param rUL the color on upper left corner
* \param rLR the color on lower right corner * \param rLR the color on lower right corner
* \param rUR the color on upper right corner * \param rUR the color on upper right corner
* \param rMatrix the transformation matrix mapping the coordinate spa ce * \param rMatrix the transformation matrix mapping the coordinate spa ce
* specified by the Domain entry into the shading * specified by the Domain entry into the shading's target coor dinate space
*/ */
void Init( const PdfColor & rLL, const PdfColor & rUL, const PdfColor & rLR, const PdfColor & rUR, const PdfArray & rMatrix ); void Init( const PdfColor & rLL, const PdfColor & rUL, const PdfColor & rLR, const PdfColor & rUR, const PdfArray & rMatrix );
}; };
/** A shading pattern that is a simple radial /** A shading pattern that is a simple radial
* shading between two colors. * shading between two colors.
*/ */
class PODOFO_DOC_API PdfRadialShadingPattern : public PdfShadingPattern { class PODOFO_DOC_API PdfRadialShadingPattern : public PdfShadingPattern {
public: public:
/** Create an radial shading pattern /** Create an radial shading pattern
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 PdfVecObjects.h   PdfVecObjects.h 
skipping to change at line 274 skipping to change at line 274
void RenumberObjects( PdfObject* pTrailer, TPdfReferenceSet* pNotDelete = NULL, bool bDoGarbageCollection = false ); void RenumberObjects( PdfObject* pTrailer, TPdfReferenceSet* pNotDelete = NULL, bool bDoGarbageCollection = false );
/** Insert a object into this vector. /** Insert a object into this vector.
* Overwritten from std::vector so that * Overwritten from std::vector so that
* m_bObjectCount can be increased for each object. * m_bObjectCount can be increased for each object.
* *
* \param pObj pointer to the object you want to insert * \param pObj pointer to the object you want to insert
*/ */
void push_back( PdfObject* pObj ); void push_back( PdfObject* pObj );
/** Insert an object into this vector so that
* the vector remains sorted w.r.t.
* the ordering based on object and generation numbers
* m_bObjectCount will be increased for the object.
*
* Note: Assumes the vector is sorted, otherwise
* equivalent to push_back
*
* \param pObj pointer to the object you want to insert
*/
void insert_sorted( PdfObject *pObj );
/** /**
* Sort the objects in the vector based on their object and generation numbers * Sort the objects in the vector based on their object and generation numbers
*/ */
void Sort(); void Sort();
/** /**
* Causes the internal vector to reserve space for size elements. * Causes the internal vector to reserve space for size elements.
* \param size reserve space for that much elements in the internal vec tor * \param size reserve space for that much elements in the internal vec tor
*/ */
inline void Reserve( size_t size ); inline void Reserve( size_t size );
skipping to change at line 386 skipping to change at line 398
* Deletes all objects that are not references by other objects * Deletes all objects that are not references by other objects
* besides the trailer (which references the root dictionary, which in * besides the trailer (which references the root dictionary, which in
* turn should reference all other objects). * turn should reference all other objects).
* *
* \param pTrailer trailer object of the PDF * \param pTrailer trailer object of the PDF
* *
* Warning this might be slow! * Warning this might be slow!
*/ */
void CollectGarbage( PdfObject* pTrailer ); void CollectGarbage( PdfObject* pTrailer );
/** Get next unique subset-prefix
*
* \returns a string to use as subset-prefix.
*/
std::string GetNextSubsetPrefix();
private: private:
/** /**
* \returns the next free object reference * \returns the next free object reference
*/ */
PdfReference GetNextFreeObject(); PdfReference GetNextFreeObject();
/** /**
* Create a list of all references that point to the object * Create a list of all references that point to the object
* for each object in this vector. * for each object in this vector.
* \param pList write all references to this list * \param pList write all references to this list
skipping to change at line 432 skipping to change at line 450
size_t m_nObjectCount; size_t m_nObjectCount;
bool m_bSorted; bool m_bSorted;
TVecObjects m_vector; TVecObjects m_vector;
TVecObservers m_vecObservers; TVecObservers m_vecObservers;
TPdfReferenceList m_lstFreeObjects; TPdfReferenceList m_lstFreeObjects;
PdfDocument* m_pDocument; PdfDocument* m_pDocument;
StreamFactory* m_pStreamFactory; StreamFactory* m_pStreamFactory;
std::string m_sSubsetPrefix; ///
< Prefix for BaseFont and FontName of subsetted font
}; };
// ----------------------------------------------------- // -----------------------------------------------------
// //
// ----------------------------------------------------- // -----------------------------------------------------
inline size_t PdfVecObjects::GetSize() const inline size_t PdfVecObjects::GetSize() const
{ {
return m_vector.size(); return m_vector.size();
} }
 End of changes. 3 change blocks. 
0 lines changed or deleted 21 lines changed or added


 podofo_config.h   podofo_config.h 
skipping to change at line 13 skipping to change at line 13
/* /*
* *** THIS HEADER IS INCLUDED BY PdfCompilerCompat.h *** * *** THIS HEADER IS INCLUDED BY PdfCompilerCompat.h ***
* *** DO NOT INCLUDE DIRECTLY *** * *** DO NOT INCLUDE DIRECTLY ***
*/ */
#ifndef _PDF_COMPILERCOMPAT_H #ifndef _PDF_COMPILERCOMPAT_H
#error Please include PdfDefines.h instead #error Please include PdfDefines.h instead
#endif #endif
#define PODOFO_VERSION_MAJOR 0 #define PODOFO_VERSION_MAJOR 0
#define PODOFO_VERSION_MINOR 9 #define PODOFO_VERSION_MINOR 9
#define PODOFO_VERSION_PATCH 0 #define PODOFO_VERSION_PATCH 1
/* PoDoFo configuration options */ /* PoDoFo configuration options */
#define PODOFO_MULTI_THREAD #define PODOFO_MULTI_THREAD
/* somewhat platform-specific headers */ /* somewhat platform-specific headers */
#define PODOFO_HAVE_STRINGS_H 1 #define PODOFO_HAVE_STRINGS_H 1
#define PODOFO_HAVE_ARPA_INET_H 1 #define PODOFO_HAVE_ARPA_INET_H 1
/* #undef PODOFO_HAVE_WINSOCK2_H */ /* #undef PODOFO_HAVE_WINSOCK2_H */
/* #undef PODOFO_HAVE_MEM_H */ /* #undef PODOFO_HAVE_MEM_H */
/* #undef PODOFO_HAVE_CTYPE_H */ /* #undef PODOFO_HAVE_CTYPE_H */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/