From 5806e5c60c177ecccf498a06bb2937fbf661e60b Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Fri, 3 Apr 2020 12:03:07 -0400 Subject: QPDFPageObjectHelper::placeFormXObject: use std::string const& (fixes #374) --- TODO | 3 --- include/qpdf/QPDFPageObjectHelper.hh | 2 +- libqpdf/QPDFPageObjectHelper.cc | 3 +-- 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) { -- cgit v1.2.3-70-g09d2