octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2025-01-03 07:12:28 +00:00
Code Issues Releases Wiki Activity

Add QPDFObjectHandle::getObjGen()

Browse Source 
This is safer than getObjectID() and getGeneration() for many uses.
This commit is contained in:
Jay Berkenbilt 2013-06-14 11:27:15 -04:00
parent d88231e01e
commit 5039da0b91
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2013-06-14 Jay Berkenbilt <ejb@ql.org> 2013-06-14 Jay Berkenbilt <ejb@ql.org>
* Add new QPDFObjectHandle::getObjGen() method and indiciate in
comments that its use is favored over getObjectID() and
getGeneration() for most cases.
* Add new QPDFObjGen object to represent an object ID/generation * Add new QPDFObjGen object to represent an object ID/generation
pair. pair.

13
include/qpdf/QPDFObjectHandle.hh
View File

@ -16,6 +16,7 @@
#include <set> #include <set>
#include <map> #include <map>
#include <qpdf/QPDFObjGen.hh>
#include <qpdf/PointerHolder.hh> #include <qpdf/PointerHolder.hh>
#include <qpdf/Buffer.hh> #include <qpdf/Buffer.hh>
#include <qpdf/InputSource.hh> #include <qpdf/InputSource.hh>
@ -454,7 +455,17 @@ class QPDFObjectHandle
QPDFObjectHandle const& filter, QPDFObjectHandle const& filter,
QPDFObjectHandle const& decode_parms); QPDFObjectHandle const& decode_parms);
// return 0 for direct objects // Access object ID and generation. For direct objects, return
// object ID 0.
// NOTE: Be careful about calling getObjectID() and
// getGeneration() directly as this can lead to the pattern of
// depending on object ID or generation without the other. In
// general, when keeping track of object IDs, it's better to use
// QPDFObjGen instead.
QPDF_DLL
QPDFObjGen getObjGen() const;
QPDF_DLL QPDF_DLL
int getObjectID() const; int getObjectID() const;
QPDF_DLL QPDF_DLL

6
libqpdf/QPDFObjectHandle.cc
View File

@ -535,6 +535,12 @@ QPDFObjectHandle::replaceStreamData(PointerHolder<StreamDataProvider> provider,
provider, filter, decode_parms); provider, filter, decode_parms);
} }
QPDFObjGen
QPDFObjectHandle::getObjGen() const
{
return QPDFObjGen(this->objid, this->generation);
}
int int
QPDFObjectHandle::getObjectID() const QPDFObjectHandle::getObjectID() const
{ {