diff options
author | Jay Berkenbilt <ejb@ql.org> | 2022-04-09 20:49:10 +0200 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2022-04-09 23:33:29 +0200 |
commit | ba0ef7a124e9aecc2d0113598c851bae4710b887 (patch) | |
tree | 5dec35b3d51effc43e55ff3ba0b1ca3f274eea17 /examples/pdf-invert-images.cc | |
parent | a68703b07e928be0eeb909c0e777e13e88cbf86d (diff) | |
download | qpdf-ba0ef7a124e9aecc2d0113598c851bae4710b887.tar.zst |
Replace PointerHolder with std::shared_ptr in the rest of the code
Increase to POINTERHOLDER_TRANSITION=3
patrepl s/PointerHolder/std::shared_ptr/g **/*.cc **/*.hh
patrepl s/make_pointer_holder/std::make_shared/g **/*.cc
patrepl s/make_array_pointer_holder/QUtil::make_shared_array/g **/*.cc
patrepl s,qpdf/std::shared_ptr,qpdf/PointerHolder, **/*.cc **/*.hh
git restore include/qpdf/PointerHolder.hh
git restore libtests/pointer_holder.cc
cleanpatch
./format-code
Diffstat (limited to 'examples/pdf-invert-images.cc')
-rw-r--r-- | examples/pdf-invert-images.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/pdf-invert-images.cc b/examples/pdf-invert-images.cc index df9e7362..033e3622 100644 --- a/examples/pdf-invert-images.cc +++ b/examples/pdf-invert-images.cc @@ -41,7 +41,7 @@ class ImageInverter: public QPDFObjectHandle::StreamDataProvider void registerImage( QPDFObjectHandle image, - PointerHolder<QPDFObjectHandle::StreamDataProvider> self); + std::shared_ptr<QPDFObjectHandle::StreamDataProvider> self); private: std::map<QPDFObjGen, QPDFObjectHandle> copied_images; @@ -50,14 +50,14 @@ class ImageInverter: public QPDFObjectHandle::StreamDataProvider void ImageInverter::registerImage( QPDFObjectHandle image, - PointerHolder<QPDFObjectHandle::StreamDataProvider> self) + std::shared_ptr<QPDFObjectHandle::StreamDataProvider> self) { // replaceStreamData requires a pointer holder to the stream data // provider, but there's no way for us to generate one ourselves, // so we have to have it handed to us. Don't be tempted to have - // the class contain a PointerHolder to itself as a member. Doing + // the class contain a std::shared_ptr to itself as a member. Doing // this will prevent the class from ever being deleted since the - // reference count will never drop to zero (and PointerHolder + // reference count will never drop to zero (and std::shared_ptr // doesn't have weak references). QPDFObjGen og(image.getObjGen()); @@ -90,7 +90,7 @@ ImageInverter::provideStreamData(int objid, int generation, Pipeline* pipeline) // image data. Then invert the image data and write the inverted // data to the pipeline. QPDFObjGen og(objid, generation); - PointerHolder<Buffer> data = + std::shared_ptr<Buffer> data = this->copied_images[og].getStreamData(qpdf_dl_all); size_t size = data->getSize(); unsigned char* buf = data->getBuffer(); @@ -128,7 +128,7 @@ main(int argc, char* argv[]) qpdf.processFile(infilename, password); ImageInverter* inv = new ImageInverter; - auto p = PointerHolder<QPDFObjectHandle::StreamDataProvider>(inv); + auto p = std::shared_ptr<QPDFObjectHandle::StreamDataProvider>(inv); // For each page... std::vector<QPDFPageObjectHelper> pages = |