octoleo
/
qpdf
mirror of https://github.com/qpdf/qpdf.git
2
1
Fork 0
Code Issues Releases Wiki Activity

Enhance QPDFMatrix API

This commit is contained in:
Jay Berkenbilt 2021-02-21 05:11:31 -05:00
parent 05eb5826d8
commit 901f1a788c
4 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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.

1
include/qpdf/QPDFMatrix.hh
View File

@ -90,7 +90,6 @@ class QPDFMatrix
QPDFObjectHandle::Rectangle transformRectangle(
QPDFObjectHandle::Rectangle r);
private:
double a;
double b;
double c;

5
include/qpdf/QPDFObjectHandle.hh
View File

@ -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()

24
libqpdf/QPDFObjectHandle.cc
View File

@ -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>
@ -2566,6 +2567,19 @@ QPDFObjectHandle::newArray(Matrix const& matrix)
return newArray(items);
}
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)
{
@ -2573,9 +2587,15 @@ QPDFObjectHandle::newFromRectangle(Rectangle const& 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