summaryrefslogtreecommitdiff
path: root/core/src/fpdfdoc
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-12-10 14:49:23 -0800
committerTom Sepez <tsepez@chromium.org>2015-12-10 14:49:23 -0800
commitf32c969bce6743fca1e7ff796b54a1692d26d7f0 (patch)
treef35f0ae0c8505394b2f195f4ea849249668af170 /core/src/fpdfdoc
parent94edf0c37d1ee6a03697375b9e227071ff2ee69d (diff)
downloadpdfium-f32c969bce6743fca1e7ff796b54a1692d26d7f0.tar.xz
Remove CFX_AffineMatrix/CPDF_Matrix
These are synonyms for CFX_Matrix. Nothing but sed and manual deletion of 2 #defines in fpdf_parser.h and fx_coordinates.h R=thestig@chromium.org Review URL: https://codereview.chromium.org/1513363002 .
Diffstat (limited to 'core/src/fpdfdoc')
-rw-r--r--core/src/fpdfdoc/doc_annot.cpp12
-rw-r--r--core/src/fpdfdoc/doc_ap.cpp10
-rw-r--r--core/src/fpdfdoc/doc_formcontrol.cpp6
-rw-r--r--core/src/fpdfdoc/doc_utils.cpp4
4 files changed, 16 insertions, 16 deletions
diff --git a/core/src/fpdfdoc/doc_annot.cpp b/core/src/fpdfdoc/doc_annot.cpp
index 36494cc2ea..0765acdf6e 100644
--- a/core/src/fpdfdoc/doc_annot.cpp
+++ b/core/src/fpdfdoc/doc_annot.cpp
@@ -51,7 +51,7 @@ void CPDF_AnnotList::DisplayPass(const CPDF_Page* pPage,
CFX_RenderDevice* pDevice,
CPDF_RenderContext* pContext,
FX_BOOL bPrinting,
- CFX_AffineMatrix* pMatrix,
+ CFX_Matrix* pMatrix,
FX_BOOL bWidgetPass,
CPDF_RenderOptions* pOptions,
FX_RECT* clip_rect) {
@@ -102,7 +102,7 @@ void CPDF_AnnotList::DisplayAnnots(const CPDF_Page* pPage,
CFX_RenderDevice* pDevice,
CPDF_RenderContext* pContext,
FX_BOOL bPrinting,
- CFX_AffineMatrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
FX_DWORD dwAnnotFlags,
CPDF_RenderOptions* pOptions,
FX_RECT* pClipRect) {
@@ -206,7 +206,7 @@ CPDF_Form* CPDF_Annot::GetAPForm(const CPDF_Page* pPage, AppearanceMode mode) {
static CPDF_Form* FPDFDOC_Annot_GetMatrix(const CPDF_Page* pPage,
CPDF_Annot* pAnnot,
CPDF_Annot::AppearanceMode mode,
- const CFX_AffineMatrix* pUser2Device,
+ const CFX_Matrix* pUser2Device,
CFX_Matrix& matrix) {
CPDF_Form* pForm = pAnnot->GetAPForm(pPage, mode);
if (!pForm) {
@@ -223,7 +223,7 @@ static CPDF_Form* FPDFDOC_Annot_GetMatrix(const CPDF_Page* pPage,
}
FX_BOOL CPDF_Annot::DrawAppearance(const CPDF_Page* pPage,
CFX_RenderDevice* pDevice,
- const CFX_AffineMatrix* pUser2Device,
+ const CFX_Matrix* pUser2Device,
AppearanceMode mode,
const CPDF_RenderOptions* pOptions) {
CFX_Matrix matrix;
@@ -239,7 +239,7 @@ FX_BOOL CPDF_Annot::DrawAppearance(const CPDF_Page* pPage,
}
FX_BOOL CPDF_Annot::DrawInContext(const CPDF_Page* pPage,
const CPDF_RenderContext* pContext,
- const CFX_AffineMatrix* pUser2Device,
+ const CFX_Matrix* pUser2Device,
AppearanceMode mode) {
CFX_Matrix matrix;
CPDF_Form* pForm =
@@ -251,7 +251,7 @@ FX_BOOL CPDF_Annot::DrawInContext(const CPDF_Page* pPage,
return TRUE;
}
void CPDF_Annot::DrawBorder(CFX_RenderDevice* pDevice,
- const CFX_AffineMatrix* pUser2Device,
+ const CFX_Matrix* pUser2Device,
const CPDF_RenderOptions* pOptions) {
if (GetSubType() == "Popup") {
return;
diff --git a/core/src/fpdfdoc/doc_ap.cpp b/core/src/fpdfdoc/doc_ap.cpp
index 7fc9407c73..bbac32f404 100644
--- a/core/src/fpdfdoc/doc_ap.cpp
+++ b/core/src/fpdfdoc/doc_ap.cpp
@@ -333,25 +333,25 @@ static FX_BOOL GenerateWidgetAP(CPDF_Document* pDoc,
nRotate = pMKDict->GetInteger("R");
}
CPDF_Rect rcBBox;
- CPDF_Matrix matrix;
+ CFX_Matrix matrix;
switch (nRotate % 360) {
case 0:
rcBBox = CPDF_Rect(0, 0, rcAnnot.right - rcAnnot.left,
rcAnnot.top - rcAnnot.bottom);
break;
case 90:
- matrix = CPDF_Matrix(0, 1, -1, 0, rcAnnot.right - rcAnnot.left, 0);
+ matrix = CFX_Matrix(0, 1, -1, 0, rcAnnot.right - rcAnnot.left, 0);
rcBBox = CPDF_Rect(0, 0, rcAnnot.top - rcAnnot.bottom,
rcAnnot.right - rcAnnot.left);
break;
case 180:
- matrix = CPDF_Matrix(-1, 0, 0, -1, rcAnnot.right - rcAnnot.left,
- rcAnnot.top - rcAnnot.bottom);
+ matrix = CFX_Matrix(-1, 0, 0, -1, rcAnnot.right - rcAnnot.left,
+ rcAnnot.top - rcAnnot.bottom);
rcBBox = CPDF_Rect(0, 0, rcAnnot.right - rcAnnot.left,
rcAnnot.top - rcAnnot.bottom);
break;
case 270:
- matrix = CPDF_Matrix(0, -1, 1, 0, 0, rcAnnot.top - rcAnnot.bottom);
+ matrix = CFX_Matrix(0, -1, 1, 0, 0, rcAnnot.top - rcAnnot.bottom);
rcBBox = CPDF_Rect(0, 0, rcAnnot.top - rcAnnot.bottom,
rcAnnot.right - rcAnnot.left);
break;
diff --git a/core/src/fpdfdoc/doc_formcontrol.cpp b/core/src/fpdfdoc/doc_formcontrol.cpp
index 88b68bc7f7..9bdf13bf85 100644
--- a/core/src/fpdfdoc/doc_formcontrol.cpp
+++ b/core/src/fpdfdoc/doc_formcontrol.cpp
@@ -149,7 +149,7 @@ void CPDF_FormControl::CheckControl(FX_BOOL bChecked) {
CPDF_Stream* FPDFDOC_GetAnnotAP(CPDF_Dictionary* pAnnotDict,
CPDF_Annot::AppearanceMode mode);
void CPDF_FormControl::DrawControl(CFX_RenderDevice* pDevice,
- CFX_AffineMatrix* pMatrix,
+ CFX_Matrix* pMatrix,
CPDF_Page* pPage,
CPDF_Annot::AppearanceMode mode,
const CPDF_RenderOptions* pOptions) {
@@ -161,10 +161,10 @@ void CPDF_FormControl::DrawControl(CFX_RenderDevice* pDevice,
return;
}
CFX_FloatRect form_bbox = pStream->GetDict()->GetRect("BBox");
- CFX_AffineMatrix form_matrix = pStream->GetDict()->GetMatrix("Matrix");
+ CFX_Matrix form_matrix = pStream->GetDict()->GetMatrix("Matrix");
form_matrix.TransformRect(form_bbox);
CFX_FloatRect arect = m_pWidgetDict->GetRect("Rect");
- CFX_AffineMatrix matrix;
+ CFX_Matrix matrix;
matrix.MatchRect(arect, form_bbox);
matrix.Concat(*pMatrix);
CPDF_Form form(m_pField->m_pForm->m_pDocument,
diff --git a/core/src/fpdfdoc/doc_utils.cpp b/core/src/fpdfdoc/doc_utils.cpp
index b0eafbff20..adf523f74e 100644
--- a/core/src/fpdfdoc/doc_utils.cpp
+++ b/core/src/fpdfdoc/doc_utils.cpp
@@ -208,8 +208,8 @@ CFX_ByteString CPDF_DefaultAppearance::GetTextMatrixString() {
}
return csTM;
}
-CFX_AffineMatrix CPDF_DefaultAppearance::GetTextMatrix() {
- CFX_AffineMatrix tm;
+CFX_Matrix CPDF_DefaultAppearance::GetTextMatrix() {
+ CFX_Matrix tm;
if (m_csDA.IsEmpty()) {
return tm;
}