Change API/ABI and withdraw 4.2.0

4.2.0 was binary incompatible in spite of there being no deletions or
changes to any public methods.  As such, we have to bump the ABI and
are fixing some API breakage while we're at it.

Previous 4.3.0 target is now 5.1.0.

2 files changed, 7 insertions, 30 deletions

diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index 2bdfa963..1126b5fa 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -1952,30 +1952,6 @@ QPDF::getObjectStreamData(std::map<int, int>& omap)
     }
 }
 
-std::vector<int>
-QPDF::getCompressibleObjects()
-{
-    std::vector<QPDFObjGen> objects = getCompressibleObjGens();
-    std::vector<int> result;
-    for (std::vector<QPDFObjGen>::iterator iter = objects.begin();
-         iter != objects.end(); ++iter)
-    {
-        if ((*iter).getGen() != 0)
-        {
-            throw std::logic_error(
-                "QPDF::getCompressibleObjects() would return an object ID"
-                " for an object with generation != 0.  Use"
-                " QPDF::getCompressibleObjGens() instead."
-                "  See comments in QPDF.hh.");
-        }
-        else
-        {
-            result.push_back((*iter).getObj());
-        }
-    }
-    return result;
-}
-
 std::vector<QPDFObjGen>
 QPDF::getCompressibleObjGens()
 {
diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc
index 499129b1..863e753b 100644
--- a/libqpdf/QPDFWriter.cc
+++ b/libqpdf/QPDFWriter.cc
@@ -1913,7 +1913,7 @@ QPDFWriter::preserveObjectStreams()
     // must have generation 0 because the PDF spec does not provide
     // any way to do otherwise.
     std::map<int, int> omap;
-    this->pdf.getObjectStreamData(omap);
+    QPDF::Writer::getObjectStreamData(this->pdf, omap);
     for (std::map<int, int>::iterator iter = omap.begin();
          iter != omap.end(); ++iter)
     {
@@ -1936,7 +1936,7 @@ QPDFWriter::generateObjectStreams()
     // This code doesn't do anything with /Extends.
 
     std::vector<QPDFObjGen> const& eligible =
-        this->pdf.getCompressibleObjGens();
+        QPDF::Writer::getCompressibleObjGens(this->pdf);
     unsigned int n_object_streams = (eligible.size() + 99) / 100;
     unsigned int n_per = eligible.size() / n_object_streams;
     if (n_per * n_object_streams < eligible.size())
@@ -2339,8 +2339,8 @@ QPDFWriter::writeHintStream(int hint_id)
     PointerHolder<Buffer> hint_buffer;
     int S = 0;
     int O = 0;
-    pdf.generateHintStream(
-	this->xref, this->lengths, this->obj_renumber_no_gen,
+    QPDF::Writer::generateHintStream(
+        this->pdf, this->xref, this->lengths, this->obj_renumber_no_gen,
         hint_buffer, S, O);
 
     openObject(hint_id);
@@ -2610,8 +2610,9 @@ QPDFWriter::writeLinearized()
     std::vector<QPDFObjectHandle> part7;
     std::vector<QPDFObjectHandle> part8;
     std::vector<QPDFObjectHandle> part9;
-    pdf.getLinearizedParts(this->object_to_object_stream_no_gen,
-			   part4, part6, part7, part8, part9);
+    QPDF::Writer::getLinearizedParts(
+        this->pdf, this->object_to_object_stream_no_gen,
+        part4, part6, part7, part8, part9);
 
     // Object number sequence:
     //