PointerHolder: deprecate getPointer() and getRefcount()

Use get() and use_count() instead. Add #define
NO_POINTERHOLDER_DEPRECATION to remove deprecation markers for these
only.

This commit also removes all deprecated PointerHolder API calls from
qpdf's code except in PointerHolder's test suite, which must continue
to test the deprecated APIs.

1 files changed, 6 insertions, 6 deletions

diff --git a/libqpdf/Pl_TIFFPredictor.cc b/libqpdf/Pl_TIFFPredictor.cc
index 30487511..1dece9b5 100644
--- a/libqpdf/Pl_TIFFPredictor.cc
+++ b/libqpdf/Pl_TIFFPredictor.cc
@@ -39,7 +39,7 @@ Pl_TIFFPredictor::Pl_TIFFPredictor(char const* identifier, Pipeline* next,
     this->bytes_per_row = bpr & UINT_MAX;
     this->cur_row = PointerHolder<unsigned char>(
         true, new unsigned char[this->bytes_per_row]);
-    memset(this->cur_row.getPointer(), 0, this->bytes_per_row);
+    memset(this->cur_row.get(), 0, this->bytes_per_row);
 }
 
 Pl_TIFFPredictor::~Pl_TIFFPredictor()
@@ -54,20 +54,20 @@ Pl_TIFFPredictor::write(unsigned char* data, size_t len)
     while (len >= left)
     {
 	// finish off current row
-	memcpy(this->cur_row.getPointer() + this->pos, data + offset, left);
+	memcpy(this->cur_row.get() + this->pos, data + offset, left);
 	offset += left;
 	len -= left;
 
 	processRow();
 
 	// Prepare for next row
-	memset(this->cur_row.getPointer(), 0, this->bytes_per_row);
+	memset(this->cur_row.get(), 0, this->bytes_per_row);
 	left = this->bytes_per_row;
 	this->pos = 0;
     }
     if (len)
     {
-	memcpy(this->cur_row.getPointer() + this->pos, data + offset, len);
+	memcpy(this->cur_row.get() + this->pos, data + offset, len);
     }
     this->pos += len;
 }
@@ -78,7 +78,7 @@ Pl_TIFFPredictor::processRow()
     QTC::TC("libtests", "Pl_TIFFPredictor processRow",
             (action == a_decode ? 0 : 1));
     BitWriter bw(this->getNext());
-    BitStream in(this->cur_row.getPointer(), this->bytes_per_row);
+    BitStream in(this->cur_row.get(), this->bytes_per_row);
     std::vector<long long> prev;
     for (unsigned int i = 0; i < this->samples_per_pixel; ++i)
     {
@@ -117,6 +117,6 @@ Pl_TIFFPredictor::finish()
 	processRow();
     }
     this->pos = 0;
-    memset(this->cur_row.getPointer(), 0, this->bytes_per_row);
+    memset(this->cur_row.get(), 0, this->bytes_per_row);
     getNext()->finish();
 }