Enhance QPDFMatrix API

Jay Berkenbilt
1 parent 05eb5826
Showing 4 changed files with 35 additions and 3 deletions
ChangeLog
include/qpdf/QPDFMatrix.hh
include/qpdf/QPDFObjectHandle.hh
libqpdf/QPDFObjectHandle.cc
+2021-02-21  Jay Berkenbilt  <ejb@ql.org>
+
+	* Allow QPDFObjectHandle::newArray and
+	QPDFObjectHandle::newFromMatrix take QPDFMatrix as well as
+	QPDFObjectHandle::Matrix
+
+	* Make member variables a--f of QPDFMatrix public
+
 2021-02-20  Jay Berkenbilt  <ejb@ql.org>
 	* Allow --rotate=0 to clear rotation from a page.
@@ -90,7 +90,6 @@ class QPDFMatrix
     QPDFObjectHandle::Rectangle transformRectangle(
         QPDFObjectHandle::Rectangle r);
-  private:
     double a;
     double b;
     double c;
@@ -47,6 +47,7 @@ class QPDF_Array;
 class QPDFTokenizer;
 class QPDFExc;
 class Pl_QPDFTokenizer;
+class QPDFMatrix;
 class QPDFObjectHandle
 {
@@ -522,6 +523,8 @@ class QPDFObjectHandle
     QPDF_DLL
     static QPDFObjectHandle newArray(Matrix const&);
     QPDF_DLL
+    static QPDFObjectHandle newArray(QPDFMatrix const&);
+    QPDF_DLL
     static QPDFObjectHandle newDictionary();
     QPDF_DLL
     static QPDFObjectHandle newDictionary(
@@ -535,6 +538,8 @@ class QPDFObjectHandle
     // form of newArray.
     QPDF_DLL
     static QPDFObjectHandle newFromMatrix(Matrix const&);
+    QPDF_DLL
+    static QPDFObjectHandle newFromMatrix(QPDFMatrix const&);
     // Create a new stream and associate it with the given qpdf
     // object.  A subsequent call must be made to replaceStreamData()
@@ -19,6 +19,7 @@
 #include <qpdf/QPDFExc.hh>
 #include <qpdf/QPDFPageObjectHelper.hh>
 #include <qpdf/SparseOHArray.hh>
+#include <qpdf/QPDFMatrix.hh>
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
@@ -2567,15 +2568,34 @@ QPDFObjectHandle::newArray(Matrix const&amp; matrix)
 }
 QPDFObjectHandle
+QPDFObjectHandle::newArray(QPDFMatrix const& matrix)
+{
+    std::vector<QPDFObjectHandle> items;
+    items.push_back(newReal(matrix.a));
+    items.push_back(newReal(matrix.b));
+    items.push_back(newReal(matrix.c));
+    items.push_back(newReal(matrix.d));
+    items.push_back(newReal(matrix.e));
+    items.push_back(newReal(matrix.f));
+    return newArray(items);
+}
+
+QPDFObjectHandle
 QPDFObjectHandle::newFromRectangle(Rectangle const& rect)
 {
     return newArray(rect);
 }
 QPDFObjectHandle
-QPDFObjectHandle::newFromMatrix(Matrix const& rect)
+QPDFObjectHandle::newFromMatrix(Matrix const& m)
 {
-    return newArray(rect);
+    return newArray(m);
+}
+
+QPDFObjectHandle
+QPDFObjectHandle::newFromMatrix(QPDFMatrix const& m)
+{
+    return newArray(m);
 }
 QPDFObjectHandle