Overload StreamDataProvider::provideStreamData

Use 'QPDFObjGen const&' instead of 'int, int' in signature.

3 files changed, 7 insertions, 10 deletions

diff --git a/examples/pdf-create.cc b/examples/pdf-create.cc
index 5e9e4239..785021da 100644
--- a/examples/pdf-create.cc
+++ b/examples/pdf-create.cc
@@ -29,8 +29,7 @@ class ImageProvider: public QPDFObjectHandle::StreamDataProvider
   public:
     ImageProvider(std::string const& color_space, std::string const& filter);
     virtual ~ImageProvider() = default;
-    virtual void
-    provideStreamData(int objid, int generation, Pipeline* pipeline);
+    virtual void provideStreamData(QPDFObjGen const&, Pipeline* pipeline);
     size_t getWidth() const;
     size_t getHeight() const;
 
@@ -93,7 +92,7 @@ ImageProvider::getHeight() const
 }
 
 void
-ImageProvider::provideStreamData(int objid, int generation, Pipeline* pipeline)
+ImageProvider::provideStreamData(QPDFObjGen const&, Pipeline* pipeline)
 {
     std::vector<std::shared_ptr<Pipeline>> to_delete;
     Pipeline* p = pipeline;
@@ -292,7 +291,7 @@ check(
             ImageProvider* p = new ImageProvider(desired_color_space, "null");
             std::shared_ptr<QPDFObjectHandle::StreamDataProvider> provider(p);
             Pl_Buffer b_p("get image data");
-            provider->provideStreamData(0, 0, &b_p);
+            provider->provideStreamData(QPDFObjGen(), &b_p);
             std::shared_ptr<Buffer> desired_data(b_p.getBuffer());
 
             if (desired_data->getSize() != actual_data->getSize()) {
diff --git a/examples/pdf-custom-filter.cc b/examples/pdf-custom-filter.cc
index ede4a19c..e7877bea 100644
--- a/examples/pdf-custom-filter.cc
+++ b/examples/pdf-custom-filter.cc
@@ -201,7 +201,7 @@ class StreamReplacer: public QPDFObjectHandle::StreamDataProvider
     StreamReplacer(QPDF* pdf);
     virtual ~StreamReplacer() = default;
     virtual void
-    provideStreamData(int objid, int generation, Pipeline* pipeline) override;
+    provideStreamData(QPDFObjGen const& og, Pipeline* pipeline) override;
 
     void registerStream(
         QPDFObjectHandle stream,
@@ -384,9 +384,8 @@ StreamReplacer::registerStream(
 }
 
 void
-StreamReplacer::provideStreamData(int objid, int generation, Pipeline* pipeline)
+StreamReplacer::provideStreamData(QPDFObjGen const& og, Pipeline* pipeline)
 {
-    QPDFObjGen og(objid, generation);
     QPDFObjectHandle orig = this->copied_streams[og];
     // call maybeReplace again, this time with the pipeline and no
     // dict_updates. In this mode, maybeReplace doesn't make any
diff --git a/examples/pdf-invert-images.cc b/examples/pdf-invert-images.cc
index 2c9a88e7..94392ac3 100644
--- a/examples/pdf-invert-images.cc
+++ b/examples/pdf-invert-images.cc
@@ -35,7 +35,7 @@ class ImageInverter: public QPDFObjectHandle::StreamDataProvider
   public:
     virtual ~ImageInverter() = default;
     virtual void
-    provideStreamData(int objid, int generation, Pipeline* pipeline) override;
+    provideStreamData(QPDFObjGen const& og, Pipeline* pipeline) override;
 
     void registerImage(
         QPDFObjectHandle image,
@@ -82,12 +82,11 @@ ImageInverter::registerImage(
 }
 
 void
-ImageInverter::provideStreamData(int objid, int generation, Pipeline* pipeline)
+ImageInverter::provideStreamData(QPDFObjGen const& og, Pipeline* pipeline)
 {
     // Use the object and generation number supplied to look up the
     // image data.  Then invert the image data and write the inverted
     // data to the pipeline.
-    QPDFObjGen og(objid, generation);
     std::shared_ptr<Buffer> data =
         this->copied_images[og].getStreamData(qpdf_dl_all);
     size_t size = data->getSize();