From 2a7d2b63c2a7284d1b1179eefbf64f5dd29aa510 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Fri, 15 Apr 2022 19:54:34 -0400
Subject: Make ABI-breaking changes that don't modify API at all

* Merge overloaded functions by adding default values
* Remove non-const methods that are identical to const methods
---
 libqpdf/QPDFMatrix.cc           | 12 ------------
 libqpdf/QPDFObjectHandle.cc     | 25 -------------------------
 libqpdf/QPDFPageObjectHelper.cc | 12 ------------
 libqpdf/QPDF_optimization.cc    |  6 ------
 libqpdf/QUtil.cc                |  6 ------
 5 files changed, 61 deletions(-)

(limited to 'libqpdf')

diff --git a/libqpdf/QPDFMatrix.cc b/libqpdf/QPDFMatrix.cc
index 75049130..9fb24888 100644
--- a/libqpdf/QPDFMatrix.cc
+++ b/libqpdf/QPDFMatrix.cc
@@ -109,12 +109,6 @@ QPDFMatrix::rotatex90(int angle)
     }
 }
 
-void
-QPDFMatrix::transform(double x, double y, double& xp, double& yp)
-{
-    const_cast<QPDFMatrix const*>(this)->transform(x, y, xp, yp);
-}
-
 void
 QPDFMatrix::transform(double x, double y, double& xp, double& yp) const
 {
@@ -122,12 +116,6 @@ QPDFMatrix::transform(double x, double y, double& xp, double& yp) const
     yp = (this->b * x) + (this->d * y) + this->f;
 }
 
-QPDFObjectHandle::Rectangle
-QPDFMatrix::transformRectangle(QPDFObjectHandle::Rectangle r)
-{
-    return const_cast<QPDFMatrix const*>(this)->transformRectangle(r);
-}
-
 QPDFObjectHandle::Rectangle
 QPDFMatrix::transformRectangle(QPDFObjectHandle::Rectangle r) const
 {
diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc
index d6fe8b9e..59b4942d 100644
--- a/libqpdf/QPDFObjectHandle.cc
+++ b/libqpdf/QPDFObjectHandle.cc
@@ -1094,12 +1094,6 @@ QPDFObjectHandle::makeResourcesIndirect(QPDF& owning_qpdf)
     }
 }
 
-void
-QPDFObjectHandle::mergeResources(QPDFObjectHandle other)
-{
-    mergeResources(other, nullptr);
-}
-
 void
 QPDFObjectHandle::mergeResources(
     QPDFObjectHandle other,
@@ -1224,13 +1218,6 @@ QPDFObjectHandle::getResourceNames()
     return result;
 }
 
-std::string
-QPDFObjectHandle::getUniqueResourceName(
-    std::string const& prefix, int& min_suffix)
-{
-    return getUniqueResourceName(prefix, min_suffix, nullptr);
-}
-
 std::string
 QPDFObjectHandle::getUniqueResourceName(
     std::string const& prefix, int& min_suffix, std::set<std::string>* namesp)
@@ -2539,12 +2526,6 @@ QPDFObjectHandle::newReal(std::string const& value)
     return QPDFObjectHandle(new QPDF_Real(value));
 }
 
-QPDFObjectHandle
-QPDFObjectHandle::newReal(double value, int decimal_places)
-{
-    return QPDFObjectHandle(new QPDF_Real(value, decimal_places, true));
-}
-
 QPDFObjectHandle
 QPDFObjectHandle::newReal(
     double value, int decimal_places, bool trim_trailing_zeroes)
@@ -2915,12 +2896,6 @@ QPDFObjectHandle::copyStream()
     return result;
 }
 
-void
-QPDFObjectHandle::makeDirect()
-{
-    makeDirect(false);
-}
-
 void
 QPDFObjectHandle::makeDirect(bool allow_streams)
 {
diff --git a/libqpdf/QPDFPageObjectHelper.cc b/libqpdf/QPDFPageObjectHelper.cc
index 4706cb27..5ad67dea 100644
--- a/libqpdf/QPDFPageObjectHelper.cc
+++ b/libqpdf/QPDFPageObjectHelper.cc
@@ -410,12 +410,6 @@ QPDFPageObjectHelper::getFormXObjects()
     return result;
 }
 
-void
-QPDFPageObjectHelper::externalizeInlineImages(size_t min_size)
-{
-    externalizeInlineImages(min_size, false);
-}
-
 void
 QPDFPageObjectHelper::externalizeInlineImages(size_t min_size, bool shallow)
 {
@@ -929,12 +923,6 @@ QPDFPageObjectHelper::placeFormXObject(
     return ("q\n" + cm.unparse() + " cm\n" + name + " Do\n" + "Q\n");
 }
 
-void
-QPDFPageObjectHelper::flattenRotation()
-{
-    flattenRotation(nullptr);
-}
-
 void
 QPDFPageObjectHelper::flattenRotation(QPDFAcroFormDocumentHelper* afdh)
 {
diff --git a/libqpdf/QPDF_optimization.cc b/libqpdf/QPDF_optimization.cc
index 3d262b03..c76e255d 100644
--- a/libqpdf/QPDF_optimization.cc
+++ b/libqpdf/QPDF_optimization.cc
@@ -52,12 +52,6 @@ QPDF::ObjUser::operator<(ObjUser const& rhs) const
     return false;
 }
 
-void
-QPDF::optimize(std::map<int, int> const& object_stream_data, bool allow_changes)
-{
-    optimize(object_stream_data, allow_changes, nullptr);
-}
-
 void
 QPDF::optimize(
     std::map<int, int> const& object_stream_data,
diff --git a/libqpdf/QUtil.cc b/libqpdf/QUtil.cc
index 711065df..6b9acb6d 100644
--- a/libqpdf/QUtil.cc
+++ b/libqpdf/QUtil.cc
@@ -326,12 +326,6 @@ QUtil::uint_to_string_base(unsigned long long num, int base, int length)
     return int_to_string_base_internal(num, base, length);
 }
 
-std::string
-QUtil::double_to_string(double num, int decimal_places)
-{
-    return double_to_string(num, decimal_places, true);
-}
-
 std::string
 QUtil::double_to_string(
     double num, int decimal_places, bool trim_trailing_zeroes)
-- 
cgit v1.2.3-54-g00ecf