aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2020-04-03 18:03:07 +0200
committerJay Berkenbilt <ejb@ql.org>2020-04-03 18:17:57 +0200
commit5806e5c60c177ecccf498a06bb2937fbf661e60b (patch)
tree06cdca95a61b952f51629ec7c77956362ace6c96
parent97de12343b908d937f4bb0562cd739896ce66d34 (diff)
downloadqpdf-5806e5c60c177ecccf498a06bb2937fbf661e60b.tar.zst
QPDFPageObjectHelper::placeFormXObject: use std::string const& (fixes #374)
-rw-r--r--TODO3
-rw-r--r--include/qpdf/QPDFPageObjectHelper.hh2
-rw-r--r--libqpdf/QPDFPageObjectHelper.cc3
3 files changed, 2 insertions, 6 deletions
diff --git a/TODO b/TODO
index e720e713..7ca0db92 100644
--- a/TODO
+++ b/TODO
@@ -19,9 +19,6 @@ ABI Changes
This is a list of changes to make next time there is an ABI change.
Comments appear in the code prefixed by "ABI"
-* QPDFPageObjectHelper::placeFormXObject: name should be std::string
- const& (issue #374)
-
* (Source compatibility) As somewhat discussed in issue 219, the
original pipeStreamData in QPDF_Stream has various logic for
reporting warnings and letting the caller retry. This logic is not
diff --git a/include/qpdf/QPDFPageObjectHelper.hh b/include/qpdf/QPDFPageObjectHelper.hh
index e1409b56..47794a5c 100644
--- a/include/qpdf/QPDFPageObjectHelper.hh
+++ b/include/qpdf/QPDFPageObjectHelper.hh
@@ -227,7 +227,7 @@ class QPDFPageObjectHelper: public QPDFObjectHelper
// examples/pdf-overlay-page.cc for an example.
QPDF_DLL
std::string placeFormXObject(
- QPDFObjectHandle fo, std::string name,
+ QPDFObjectHandle fo, std::string const& name,
QPDFObjectHandle::Rectangle rect,
bool invert_transformations = true);
diff --git a/libqpdf/QPDFPageObjectHelper.cc b/libqpdf/QPDFPageObjectHelper.cc
index d5579c72..d6f1516e 100644
--- a/libqpdf/QPDFPageObjectHelper.cc
+++ b/libqpdf/QPDFPageObjectHelper.cc
@@ -720,10 +720,9 @@ QPDFPageObjectHelper::getFormXObjectForPage(bool handle_transformations)
return result;
}
-// ABI: name should be std:string const&
std::string
QPDFPageObjectHelper::placeFormXObject(
- QPDFObjectHandle fo, std::string name,
+ QPDFObjectHandle fo, std::string const& name,
QPDFObjectHandle::Rectangle rect,
bool invert_transformations)
{