summaryrefslogtreecommitdiff
path: root/fpdfsdk/src
diff options
context:
space:
mode:
Diffstat (limited to 'fpdfsdk/src')
-rw-r--r--fpdfsdk/src/formfiller/FFL_FormFiller.cpp40
-rw-r--r--fpdfsdk/src/formfiller/FFL_IFormFiller.cpp2
-rw-r--r--fpdfsdk/src/formfiller/FFL_PushButton.cpp2
-rw-r--r--fpdfsdk/src/fpdf_flatten.cpp16
-rw-r--r--fpdfsdk/src/fpdf_transformpage.cpp8
-rw-r--r--fpdfsdk/src/fpdfeditpage.cpp8
-rw-r--r--fpdfsdk/src/fpdfformfill.cpp2
-rw-r--r--fpdfsdk/src/fpdfview.cpp8
-rw-r--r--fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp8
-rw-r--r--fpdfsdk/src/fsdk_annothandler.cpp6
-rw-r--r--fpdfsdk/src/fsdk_baseannot.cpp8
-rw-r--r--fpdfsdk/src/fsdk_baseform.cpp16
-rw-r--r--fpdfsdk/src/fsdk_mgr.cpp6
-rw-r--r--fpdfsdk/src/fxedit/fxet_pageobjs.cpp10
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Caret.cpp2
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp2
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Edit.cpp2
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp2
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Icon.cpp6
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_IconList.cpp2
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Label.cpp2
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_ListBox.cpp2
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp10
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Note.cpp10
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp4
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Signature.cpp4
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Utils.cpp18
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Wnd.cpp36
28 files changed, 121 insertions, 121 deletions
diff --git a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp
index 6989ed8a23..8b030a51a2 100644
--- a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp
+++ b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp
@@ -73,12 +73,12 @@ FX_RECT CFFL_FormFiller::GetViewBBox(CPDFSDK_PageView* pPageView,
void CFFL_FormFiller::OnDraw(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
FX_DWORD dwFlags) {
ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, FALSE)) {
- CPDF_Matrix mt = GetCurMatrix();
+ CFX_Matrix mt = GetCurMatrix();
mt.Concat(*pUser2Device);
pWnd->DrawAppearance(pDevice, &mt);
} else {
@@ -91,7 +91,7 @@ void CFFL_FormFiller::OnDraw(CPDFSDK_PageView* pPageView,
void CFFL_FormFiller::OnDrawDeactive(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
FX_DWORD dwFlags) {
CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, NULL);
@@ -398,22 +398,22 @@ void CFFL_FormFiller::DestroyPDFWindow(CPDFSDK_PageView* pPageView) {
m_Maps.erase(it);
}
-CPDF_Matrix CFFL_FormFiller::GetWindowMatrix(void* pAttachedData) {
+CFX_Matrix CFFL_FormFiller::GetWindowMatrix(void* pAttachedData) {
if (CFFL_PrivateData* pPrivateData = (CFFL_PrivateData*)pAttachedData) {
if (pPrivateData->pPageView) {
- CPDF_Matrix mtPageView;
+ CFX_Matrix mtPageView;
pPrivateData->pPageView->GetCurrentMatrix(mtPageView);
- CPDF_Matrix mt = GetCurMatrix();
+ CFX_Matrix mt = GetCurMatrix();
mt.Concat(mtPageView);
return mt;
}
}
- return CPDF_Matrix(1, 0, 0, 1, 0, 0);
+ return CFX_Matrix(1, 0, 0, 1, 0, 0);
}
-CPDF_Matrix CFFL_FormFiller::GetCurMatrix() {
- CPDF_Matrix mt;
+CFX_Matrix CFFL_FormFiller::GetCurMatrix() {
+ CFX_Matrix mt;
ASSERT(m_pWidget != NULL);
@@ -423,17 +423,17 @@ CPDF_Matrix CFFL_FormFiller::GetCurMatrix() {
switch (m_pWidget->GetRotate()) {
default:
case 0:
- mt = CPDF_Matrix(1, 0, 0, 1, 0, 0);
+ mt = CFX_Matrix(1, 0, 0, 1, 0, 0);
break;
case 90:
- mt = CPDF_Matrix(0, 1, -1, 0, rcDA.right - rcDA.left, 0);
+ mt = CFX_Matrix(0, 1, -1, 0, rcDA.right - rcDA.left, 0);
break;
case 180:
- mt = CPDF_Matrix(-1, 0, 0, -1, rcDA.right - rcDA.left,
- rcDA.top - rcDA.bottom);
+ mt = CFX_Matrix(-1, 0, 0, -1, rcDA.right - rcDA.left,
+ rcDA.top - rcDA.bottom);
break;
case 270:
- mt = CPDF_Matrix(0, -1, 1, 0, 0, rcDA.top - rcDA.bottom);
+ mt = CFX_Matrix(0, -1, 1, 0, 0, rcDA.top - rcDA.bottom);
break;
}
mt.e += rcDA.left;
@@ -477,7 +477,7 @@ CPDF_Rect CFFL_FormFiller::GetFocusBox(CPDFSDK_PageView* pPageView) {
}
CPDF_Rect CFFL_FormFiller::FFLtoPWL(const CPDF_Rect& rect) {
- CPDF_Matrix mt;
+ CFX_Matrix mt;
mt.SetReverse(GetCurMatrix());
CPDF_Rect temp = rect;
@@ -487,7 +487,7 @@ CPDF_Rect CFFL_FormFiller::FFLtoPWL(const CPDF_Rect& rect) {
}
CPDF_Rect CFFL_FormFiller::PWLtoFFL(const CPDF_Rect& rect) {
- CPDF_Matrix mt = GetCurMatrix();
+ CFX_Matrix mt = GetCurMatrix();
CPDF_Rect temp = rect;
mt.TransformRect(temp);
@@ -496,7 +496,7 @@ CPDF_Rect CFFL_FormFiller::PWLtoFFL(const CPDF_Rect& rect) {
}
CPDF_Point CFFL_FormFiller::FFLtoPWL(const CPDF_Point& point) {
- CPDF_Matrix mt;
+ CFX_Matrix mt;
mt.SetReverse(GetCurMatrix());
CPDF_Point pt = point;
@@ -506,7 +506,7 @@ CPDF_Point CFFL_FormFiller::FFLtoPWL(const CPDF_Point& point) {
}
CPDF_Point CFFL_FormFiller::PWLtoFFL(const CPDF_Point& point) {
- CPDF_Matrix mt = GetCurMatrix();
+ CFX_Matrix mt = GetCurMatrix();
CPDF_Point pt = point;
mt.Transform(pt.x, pt.y);
@@ -689,7 +689,7 @@ FX_BOOL CFFL_Button::OnMouseMove(CPDFSDK_PageView* pPageView,
void CFFL_Button::OnDraw(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
FX_DWORD dwFlags) {
ASSERT(pPageView != NULL);
CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
@@ -720,7 +720,7 @@ void CFFL_Button::OnDraw(CPDFSDK_PageView* pPageView,
void CFFL_Button::OnDrawDeactive(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
FX_DWORD dwFlags) {
OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags);
}
diff --git a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp
index a41fa4074d..352097d2ff 100644
--- a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp
+++ b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp
@@ -57,7 +57,7 @@ FX_RECT CFFL_IFormFiller::GetViewBBox(CPDFSDK_PageView* pPageView,
void CFFL_IFormFiller::OnDraw(CPDFSDK_PageView* pPageView,
/*HDC hDC,*/ CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
/*const CRect& rcWindow,*/ FX_DWORD dwFlags) {
ASSERT(pPageView != NULL);
CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
diff --git a/fpdfsdk/src/formfiller/FFL_PushButton.cpp b/fpdfsdk/src/formfiller/FFL_PushButton.cpp
index 66ae68b211..fbf782e99d 100644
--- a/fpdfsdk/src/formfiller/FFL_PushButton.cpp
+++ b/fpdfsdk/src/formfiller/FFL_PushButton.cpp
@@ -34,7 +34,7 @@ FX_BOOL CFFL_PushButton::OnChar(CPDFSDK_Annot* pAnnot,
void CFFL_PushButton::OnDraw(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
FX_DWORD dwFlags) {
CFFL_Button::OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags);
}
diff --git a/fpdfsdk/src/fpdf_flatten.cpp b/fpdfsdk/src/fpdf_flatten.cpp
index 3943e9d636..76ffec3e26 100644
--- a/fpdfsdk/src/fpdf_flatten.cpp
+++ b/fpdfsdk/src/fpdf_flatten.cpp
@@ -252,11 +252,11 @@ void SetPageContents(CFX_ByteString key,
}
}
-CFX_AffineMatrix GetMatrix(CPDF_Rect rcAnnot,
- CPDF_Rect rcStream,
- CFX_AffineMatrix matrix) {
+CFX_Matrix GetMatrix(CPDF_Rect rcAnnot,
+ CPDF_Rect rcStream,
+ const CFX_Matrix& matrix) {
if (rcStream.IsEmpty())
- return CFX_AffineMatrix();
+ return CFX_Matrix();
matrix.TransformRect(rcStream);
rcStream.Normalize();
@@ -266,7 +266,7 @@ CFX_AffineMatrix GetMatrix(CPDF_Rect rcAnnot,
FX_FLOAT e = rcAnnot.left - rcStream.left * a;
FX_FLOAT f = rcAnnot.bottom - rcStream.bottom * d;
- return CFX_AffineMatrix(a, 0, 0, d, e, f);
+ return CFX_Matrix(a, 0, 0, d, e, f);
}
void GetOffset(FX_FLOAT& fa,
@@ -275,7 +275,7 @@ void GetOffset(FX_FLOAT& fa,
FX_FLOAT& ff,
CPDF_Rect rcAnnot,
CPDF_Rect rcStream,
- CFX_AffineMatrix matrix) {
+ const CFX_Matrix& matrix) {
FX_FLOAT fStreamWidth = 0.0f;
FX_FLOAT fStreamHeight = 0.0f;
@@ -458,7 +458,7 @@ DLLEXPORT int STDCALL FPDFPage_Flatten(FPDF_PAGE page, int nFlag) {
continue;
CPDF_Dictionary* pAPDic = pAPStream->GetDict();
- CFX_AffineMatrix matrix = pAPDic->GetMatrix("Matrix");
+ CFX_Matrix matrix = pAPDic->GetMatrix("Matrix");
CPDF_Rect rcStream;
if (pAPDic->KeyExist("Rect"))
@@ -506,7 +506,7 @@ DLLEXPORT int STDCALL FPDFPage_Flatten(FPDF_PAGE page, int nFlag) {
matrix.f = 0.0f;
}
- CFX_AffineMatrix m = GetMatrix(rcAnnot, rcStream, matrix);
+ CFX_Matrix m = GetMatrix(rcAnnot, rcStream, matrix);
sTemp.Format("q %f 0 0 %f %f %f cm /%s Do Q\n", m.a, m.d, m.e, m.f,
sFormName.c_str());
sStream += sTemp;
diff --git a/fpdfsdk/src/fpdf_transformpage.cpp b/fpdfsdk/src/fpdf_transformpage.cpp
index 50a3a3266d..05be360088 100644
--- a/fpdfsdk/src/fpdf_transformpage.cpp
+++ b/fpdfsdk/src/fpdf_transformpage.cpp
@@ -175,8 +175,8 @@ DLLEXPORT FPDF_BOOL STDCALL FPDFPage_TransFormWithClip(FPDF_PAGE page,
else
continue;
- CFX_AffineMatrix m = pDict->GetMatrix(FX_BSTRC("Matrix"));
- CFX_AffineMatrix t = *(CFX_AffineMatrix*)matrix;
+ CFX_Matrix m = pDict->GetMatrix(FX_BSTRC("Matrix"));
+ CFX_Matrix t = *(CFX_Matrix*)matrix;
m.Concat(t);
pDict->SetAtMatrix(FX_BSTRC("Matrix"), m);
}
@@ -197,8 +197,8 @@ FPDFPageObj_TransformClipPath(FPDF_PAGEOBJECT page_object,
CPDF_PageObject* pPageObj = (CPDF_PageObject*)page_object;
if (pPageObj == NULL)
return;
- CFX_AffineMatrix matrix((FX_FLOAT)a, (FX_FLOAT)b, (FX_FLOAT)c, (FX_FLOAT)d,
- (FX_FLOAT)e, (FX_FLOAT)f);
+ CFX_Matrix matrix((FX_FLOAT)a, (FX_FLOAT)b, (FX_FLOAT)c, (FX_FLOAT)d,
+ (FX_FLOAT)e, (FX_FLOAT)f);
// Special treatment to shading object, because the ClipPath for shading
// object is already transformed.
diff --git a/fpdfsdk/src/fpdfeditpage.cpp b/fpdfsdk/src/fpdfeditpage.cpp
index aff74d1601..a1d5440b1e 100644
--- a/fpdfsdk/src/fpdfeditpage.cpp
+++ b/fpdfsdk/src/fpdfeditpage.cpp
@@ -259,8 +259,8 @@ DLLEXPORT void STDCALL FPDFPageObj_Transform(FPDF_PAGEOBJECT page_object,
if (!pPageObj)
return;
- CFX_AffineMatrix matrix((FX_FLOAT)a, (FX_FLOAT)b, (FX_FLOAT)c, (FX_FLOAT)d,
- (FX_FLOAT)e, (FX_FLOAT)f);
+ CFX_Matrix matrix((FX_FLOAT)a, (FX_FLOAT)b, (FX_FLOAT)c, (FX_FLOAT)d,
+ (FX_FLOAT)e, (FX_FLOAT)f);
pPageObj->Transform(matrix);
}
DLLEXPORT void STDCALL FPDFPage_TransformAnnots(FPDF_PAGE page,
@@ -279,8 +279,8 @@ DLLEXPORT void STDCALL FPDFPage_TransformAnnots(FPDF_PAGE page,
// transformAnnots Rectangle
CPDF_Rect rect;
pAnnot->GetRect(rect);
- CFX_AffineMatrix matrix((FX_FLOAT)a, (FX_FLOAT)b, (FX_FLOAT)c, (FX_FLOAT)d,
- (FX_FLOAT)e, (FX_FLOAT)f);
+ CFX_Matrix matrix((FX_FLOAT)a, (FX_FLOAT)b, (FX_FLOAT)c, (FX_FLOAT)d,
+ (FX_FLOAT)e, (FX_FLOAT)f);
rect.Transform(&matrix);
CPDF_Array* pRectArray = NULL;
pRectArray = pAnnot->GetAnnotDict()->GetArray("Rect");
diff --git a/fpdfsdk/src/fpdfformfill.cpp b/fpdfsdk/src/fpdfformfill.cpp
index 3f826ebe0f..966d404a8e 100644
--- a/fpdfsdk/src/fpdfformfill.cpp
+++ b/fpdfsdk/src/fpdfformfill.cpp
@@ -334,7 +334,7 @@ DLLEXPORT void STDCALL FPDF_FFLDraw(FPDF_FORMHANDLE hHandle,
return;
#endif // PDF_ENABLE_XFA
- CFX_AffineMatrix matrix;
+ CFX_Matrix matrix;
pPage->GetDisplayMatrix(matrix, start_x, start_y, size_x, size_y, rotate);
FX_RECT clip;
diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp
index 35915395fb..9e481a2ca1 100644
--- a/fpdfsdk/src/fpdfview.cpp
+++ b/fpdfsdk/src/fpdfview.cpp
@@ -770,10 +770,10 @@ DLLEXPORT void STDCALL FPDF_DeviceToPage(FPDF_PAGE page,
pPage->DeviceToPage(start_x, start_y, size_x, size_y, rotate, device_x,
device_y, page_x, page_y);
#else // PDF_ENABLE_XFA
- CPDF_Matrix page2device;
+ CFX_Matrix page2device;
pPage->GetDisplayMatrix(page2device, start_x, start_y, size_x, size_y,
rotate);
- CPDF_Matrix device2page;
+ CFX_Matrix device2page;
device2page.SetReverse(page2device);
FX_FLOAT page_x_f, page_y_f;
device2page.Transform((FX_FLOAT)(device_x), (FX_FLOAT)(device_y), page_x_f,
@@ -802,7 +802,7 @@ DLLEXPORT void STDCALL FPDF_PageToDevice(FPDF_PAGE page,
pPage->PageToDevice(start_x, start_y, size_x, size_y, rotate, page_x, page_y,
device_x, device_y);
#else // PDF_ENABLE_XFA
- CPDF_Matrix page2device;
+ CFX_Matrix page2device;
pPage->GetDisplayMatrix(page2device, start_x, start_y, size_x, size_y,
rotate);
FX_FLOAT device_x_f, device_y_f;
@@ -945,7 +945,7 @@ void FPDF_RenderPage_Retail(CRenderContext* pContext,
pContext->m_pOptions->m_pOCContext =
new CPDF_OCContext(pPage->m_pDocument, usage);
- CFX_AffineMatrix matrix;
+ CFX_Matrix matrix;
pPage->GetDisplayMatrix(matrix, start_x, start_y, size_x, size_y, rotate);
FX_RECT clip;
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp
index 8b0db71ad0..f78eb9b27d 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp
@@ -185,8 +185,8 @@ void CPDFXFA_Page::DeviceToPage(int start_x,
if (!m_pPDFPage && !m_pXFAPageView)
return;
- CPDF_Matrix page2device;
- CPDF_Matrix device2page;
+ CFX_Matrix page2device;
+ CFX_Matrix device2page;
FX_FLOAT page_x_f, page_y_f;
GetDisplayMatrix(page2device, start_x, start_y, size_x, size_y, rotate);
@@ -211,7 +211,7 @@ void CPDFXFA_Page::PageToDevice(int start_x,
if (!m_pPDFPage && !m_pXFAPageView)
return;
- CPDF_Matrix page2device;
+ CFX_Matrix page2device;
FX_FLOAT device_x_f, device_y_f;
GetDisplayMatrix(page2device, start_x, start_y, size_x, size_y, rotate);
@@ -223,7 +223,7 @@ void CPDFXFA_Page::PageToDevice(int start_x,
*device_y = FXSYS_round(device_y_f);
}
-void CPDFXFA_Page::GetDisplayMatrix(CFX_AffineMatrix& matrix,
+void CPDFXFA_Page::GetDisplayMatrix(CFX_Matrix& matrix,
int xPos,
int yPos,
int xSize,
diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp
index d66de828d4..ae6b5f2fc8 100644
--- a/fpdfsdk/src/fsdk_annothandler.cpp
+++ b/fpdfsdk/src/fsdk_annothandler.cpp
@@ -143,7 +143,7 @@ IPDFSDK_AnnotHandler* CPDFSDK_AnnotHandlerMgr::GetAnnotHandler(
void CPDFSDK_AnnotHandlerMgr::Annot_OnDraw(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
FX_DWORD dwFlags) {
ASSERT(pAnnot);
@@ -467,7 +467,7 @@ void CPDFSDK_BFAnnotHandler::ReleaseAnnot(CPDFSDK_Annot* pAnnot) {
void CPDFSDK_BFAnnotHandler::OnDraw(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
FX_DWORD dwFlags) {
CFX_ByteString sSubType = pAnnot->GetSubType();
@@ -774,7 +774,7 @@ FX_BOOL CPDFSDK_XFAAnnotHandler::CanAnswer(CPDFSDK_Annot* pAnnot) {
void CPDFSDK_XFAAnnotHandler::OnDraw(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
FX_DWORD dwFlags) {
ASSERT(pPageView != NULL);
ASSERT(pAnnot != NULL);
diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/src/fsdk_baseannot.cpp
index c2036a5ba8..82bbeb11ac 100644
--- a/fpdfsdk/src/fsdk_baseannot.cpp
+++ b/fpdfsdk/src/fsdk_baseannot.cpp
@@ -564,7 +564,7 @@ CFX_ByteString CPDFSDK_BAAnnot::GetSubType() const {
}
void CPDFSDK_BAAnnot::DrawAppearance(CFX_RenderDevice* pDevice,
- const CPDF_Matrix* pUser2Device,
+ const CFX_Matrix* pUser2Device,
CPDF_Annot::AppearanceMode mode,
const CPDF_RenderOptions* pOptions) {
ASSERT(m_pPageView != NULL);
@@ -601,7 +601,7 @@ FX_BOOL CPDFSDK_BAAnnot::IsAppearanceValid(CPDF_Annot::AppearanceMode mode) {
}
void CPDFSDK_BAAnnot::DrawBorder(CFX_RenderDevice* pDevice,
- const CPDF_Matrix* pUser2Device,
+ const CFX_Matrix* pUser2Device,
const CPDF_RenderOptions* pOptions) {
ASSERT(m_pAnnot != NULL);
m_pAnnot->DrawBorder(pDevice, pUser2Device, pOptions);
@@ -849,7 +849,7 @@ FX_BOOL CPDFSDK_BAAnnot::GetColor(FX_COLORREF& color) const {
void CPDFSDK_BAAnnot::WriteAppearance(const CFX_ByteString& sAPType,
const CPDF_Rect& rcBBox,
- const CPDF_Matrix& matrix,
+ const CFX_Matrix& matrix,
const CFX_ByteString& sContents,
const CFX_ByteString& sAPState) {
CPDF_Dictionary* pAPDict = m_pAnnot->GetAnnotDict()->GetDict("AP");
@@ -977,7 +977,7 @@ FX_BOOL CPDFSDK_BAAnnot::IsXFAField() {
#endif // PDF_ENABLE_XFA
void CPDFSDK_BAAnnot::Annot_OnDraw(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
CPDF_RenderOptions* pOptions) {
m_pAnnot->GetAPForm(m_pPageView->GetPDFPage(), CPDF_Annot::Normal);
m_pAnnot->DrawAppearance(m_pPageView->GetPDFPage(), pDevice, pUser2Device,
diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp
index c86bbc8601..be20ab47ed 100644
--- a/fpdfsdk/src/fsdk_baseform.cpp
+++ b/fpdfsdk/src/fsdk_baseform.cpp
@@ -840,7 +840,7 @@ void CPDFSDK_Widget::ResetFieldAppearance(FX_BOOL bValueChanged) {
}
void CPDFSDK_Widget::DrawAppearance(CFX_RenderDevice* pDevice,
- const CPDF_Matrix* pUser2Device,
+ const CFX_Matrix* pUser2Device,
CPDF_Annot::AppearanceMode mode,
const CPDF_RenderOptions* pOptions) {
int nFieldType = GetFieldType();
@@ -889,7 +889,7 @@ void CPDFSDK_Widget::DrawShadow(CFX_RenderDevice* pDevice,
CPDFDoc_Environment* pEnv = m_pInterForm->GetDocument()->GetEnv();
if (!pEnv)
return;
- CFX_AffineMatrix page2device;
+ CFX_Matrix page2device;
pPageView->GetCurrentMatrix(page2device);
page2device.Transform(((FX_FLOAT)rc.left), ((FX_FLOAT)rc.bottom),
rcDevice.left, rcDevice.bottom);
@@ -1831,8 +1831,8 @@ CFX_ByteString CPDFSDK_Widget::GetBorderAppStream() const {
dsBorder);
}
-CPDF_Matrix CPDFSDK_Widget::GetMatrix() const {
- CPDF_Matrix mt;
+CFX_Matrix CPDFSDK_Widget::GetMatrix() const {
+ CFX_Matrix mt;
CPDF_FormControl* pControl = GetFormControl();
ASSERT(pControl != NULL);
@@ -1843,16 +1843,16 @@ CPDF_Matrix CPDFSDK_Widget::GetMatrix() const {
switch (abs(pControl->GetRotation() % 360)) {
case 0:
default:
- mt = CPDF_Matrix(1, 0, 0, 1, 0, 0);
+ mt = CFX_Matrix(1, 0, 0, 1, 0, 0);
break;
case 90:
- mt = CPDF_Matrix(0, 1, -1, 0, fWidth, 0);
+ mt = CFX_Matrix(0, 1, -1, 0, fWidth, 0);
break;
case 180:
- mt = CPDF_Matrix(-1, 0, 0, -1, fWidth, fHeight);
+ mt = CFX_Matrix(-1, 0, 0, -1, fWidth, fHeight);
break;
case 270:
- mt = CPDF_Matrix(0, -1, 1, 0, 0, fHeight);
+ mt = CFX_Matrix(0, -1, 1, 0, 0, fHeight);
break;
}
diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp
index 4d2dbc166c..62a37e30dc 100644
--- a/fpdfsdk/src/fsdk_mgr.cpp
+++ b/fpdfsdk/src/fsdk_mgr.cpp
@@ -102,9 +102,9 @@ void CFX_SystemHandler::InvalidateRect(FX_HWND hWnd, FX_RECT rect) {
UnderlyingPageType* pPage = pSDKAnnot->GetUnderlyingPage();
if (!pPage || !pPageView)
return;
- CPDF_Matrix page2device;
+ CFX_Matrix page2device;
pPageView->GetCurrentMatrix(page2device);
- CPDF_Matrix device2page;
+ CFX_Matrix device2page;
device2page.SetReverse(page2device);
FX_FLOAT left, top, right, bottom;
device2page.Transform((FX_FLOAT)rect.left, (FX_FLOAT)rect.top, left, top);
@@ -657,7 +657,7 @@ CPDFSDK_PageView::~CPDFSDK_PageView() {
}
void CPDFSDK_PageView::PageView_OnDraw(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
#ifdef PDF_ENABLE_XFA
CPDF_RenderOptions* pOptions,
const FX_RECT& pClip) {
diff --git a/fpdfsdk/src/fxedit/fxet_pageobjs.cpp b/fpdfsdk/src/fxedit/fxet_pageobjs.cpp
index 88f97da7f8..fefa42bdfd 100644
--- a/fpdfsdk/src/fxedit/fxet_pageobjs.cpp
+++ b/fpdfsdk/src/fxedit/fxet_pageobjs.cpp
@@ -29,7 +29,7 @@ static void DrawTextString(CFX_RenderDevice* pDevice,
const CPDF_Point& pt,
CPDF_Font* pFont,
FX_FLOAT fFontSize,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
const CFX_ByteString& str,
FX_ARGB crTextFill,
FX_ARGB crTextStroke,
@@ -39,7 +39,7 @@ static void DrawTextString(CFX_RenderDevice* pDevice,
if (pFont) {
if (nHorzScale != 100) {
- CPDF_Matrix mt(nHorzScale / 100.0f, 0, 0, 1, 0, 0);
+ CFX_Matrix mt(nHorzScale / 100.0f, 0, 0, 1, 0, 0);
mt.Concat(*pUser2Device);
CPDF_RenderOptions ro;
@@ -85,7 +85,7 @@ static void DrawTextString(CFX_RenderDevice* pDevice,
}
void IFX_Edit::DrawUnderline(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
IFX_Edit* pEdit,
FX_COLORREF color,
const CPDF_Rect& rcClip,
@@ -138,7 +138,7 @@ void IFX_Edit::DrawUnderline(CFX_RenderDevice* pDevice,
}
void IFX_Edit::DrawEdit(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
IFX_Edit* pEdit,
FX_COLORREF crTextFill,
FX_COLORREF crTextStroke,
@@ -277,7 +277,7 @@ void IFX_Edit::DrawEdit(CFX_RenderDevice* pDevice,
}
void IFX_Edit::DrawRichEdit(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
IFX_Edit* pEdit,
const CPDF_Rect& rcClip,
const CPDF_Point& ptOffset,
diff --git a/fpdfsdk/src/pdfwindow/PWL_Caret.cpp b/fpdfsdk/src/pdfwindow/PWL_Caret.cpp
index adb296d8e1..d129c2c7d3 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Caret.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Caret.cpp
@@ -33,7 +33,7 @@ void CPWL_Caret::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
}
void CPWL_Caret::DrawThisAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
if (IsVisible() && m_bFlash) {
CPDF_Rect rcRect = GetCaretRect();
CPDF_Rect rcClip = GetClipRect();
diff --git a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp
index 395f764872..71994ea27d 100644
--- a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp
@@ -143,7 +143,7 @@ void CPWL_CBButton::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
}
void CPWL_CBButton::DrawThisAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
CPDF_Rect rectWnd = CPWL_Wnd::GetWindowRect();
diff --git a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
index 29e7c2eea7..6d32b7270f 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
@@ -370,7 +370,7 @@ void CPWL_Edit::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
}
void CPWL_Edit::DrawThisAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
CPDF_Rect rcClient = GetClientRect();
diff --git a/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp
index 0794be653c..1c69f18b9f 100644
--- a/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp
@@ -47,7 +47,7 @@ void CPWL_EditCtrl::OnCreated() {
}
FX_BOOL CPWL_EditCtrl::IsWndHorV() {
- CPDF_Matrix mt = GetWindowMatrix();
+ CFX_Matrix mt = GetWindowMatrix();
CPDF_Point point1(0, 1);
CPDF_Point point2(1, 1);
diff --git a/fpdfsdk/src/pdfwindow/PWL_Icon.cpp b/fpdfsdk/src/pdfwindow/PWL_Icon.cpp
index 166b4e7ba1..61ad1f6913 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Icon.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Icon.cpp
@@ -21,7 +21,7 @@ CFX_ByteString CPWL_Image::GetImageAppStream() {
CFX_ByteString sAlias = GetImageAlias();
CPDF_Rect rcPlate = GetClientRect();
- CPDF_Matrix mt;
+ CFX_Matrix mt;
mt.SetReverse(GetImageMatrix());
FX_FLOAT fHScale = 1.0f;
@@ -72,14 +72,14 @@ void CPWL_Image::GetImageSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight) {
}
}
-CPDF_Matrix CPWL_Image::GetImageMatrix() {
+CFX_Matrix CPWL_Image::GetImageMatrix() {
if (m_pPDFStream) {
if (CPDF_Dictionary* pDict = m_pPDFStream->GetDict()) {
return pDict->GetMatrix("Matrix");
}
}
- return CPDF_Matrix();
+ return CFX_Matrix();
}
CFX_ByteString CPWL_Image::GetImageAlias() {
diff --git a/fpdfsdk/src/pdfwindow/PWL_IconList.cpp b/fpdfsdk/src/pdfwindow/PWL_IconList.cpp
index cc8b352af1..6a627d7e92 100644
--- a/fpdfsdk/src/pdfwindow/PWL_IconList.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_IconList.cpp
@@ -33,7 +33,7 @@ FX_FLOAT CPWL_IconList_Item::GetItemHeight(FX_FLOAT fLimitWidth) {
}
void CPWL_IconList_Item::DrawThisAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
CPDF_Rect rcClient = GetClientRect();
if (m_bSelected) {
diff --git a/fpdfsdk/src/pdfwindow/PWL_Label.cpp b/fpdfsdk/src/pdfwindow/PWL_Label.cpp
index 4beeada721..23be536766 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Label.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Label.cpp
@@ -86,7 +86,7 @@ void CPWL_Label::SetParamByFlag() {
}
void CPWL_Label::DrawThisAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
GetClientRect();
diff --git a/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp
index 229c1dd81e..9b62c471d7 100644
--- a/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp
@@ -159,7 +159,7 @@ void CPWL_ListBox::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
}
void CPWL_ListBox::DrawThisAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
if (m_pList) {
diff --git a/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp b/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp
index e578f9b860..f7c1ef12fd 100644
--- a/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp
@@ -95,9 +95,9 @@ void CPWL_ListCtrl::ResetAll(FX_BOOL bMove, int32_t nStart) {
FX_FLOAT fLeft = pChild->GetItemLeftMargin();
FX_FLOAT fRight = pChild->GetItemRightMargin();
- pChild->SetChildMatrix(CPDF_Matrix(1, 0, 0, 1,
- rcClient.left - m_ptScroll.x,
- rcClient.top - m_ptScroll.y));
+ pChild->SetChildMatrix(CFX_Matrix(1, 0, 0, 1,
+ rcClient.left - m_ptScroll.x,
+ rcClient.top - m_ptScroll.y));
if (bMove) {
FX_FLOAT fItemHeight = pChild->GetItemHeight(fWidth - fLeft - fRight);
@@ -138,7 +138,7 @@ void CPWL_ListCtrl::RePosChildWnd() {
}
void CPWL_ListCtrl::DrawChildAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
pDevice->SaveState();
CPDF_Rect rcClient = GetClientRect();
CPDF_Rect rcTemp = rcClient;
@@ -152,7 +152,7 @@ void CPWL_ListCtrl::DrawChildAppearance(CFX_RenderDevice* pDevice,
if (CPWL_Wnd* pChild = m_aChildren.GetAt(i)) {
CPDF_Rect rcChild = pChild->ChildToParent(pChild->GetWindowRect());
if (!(rcChild.top < rcClient.bottom || rcChild.bottom > rcClient.top)) {
- CPDF_Matrix mt = pChild->GetChildMatrix();
+ CFX_Matrix mt = pChild->GetChildMatrix();
if (mt.IsIdentity()) {
pChild->DrawAppearance(pDevice, pUser2Device);
} else {
diff --git a/fpdfsdk/src/pdfwindow/PWL_Note.cpp b/fpdfsdk/src/pdfwindow/PWL_Note.cpp
index 553a20f1dd..f15004dcd6 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Note.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Note.cpp
@@ -75,7 +75,7 @@ void CPWL_Note_Options::SetText(const CFX_WideString& sText) {
}
void CPWL_Note_Options::DrawThisAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
CPDF_Rect rcClient = GetClientRect();
@@ -246,7 +246,7 @@ CPWL_Note_LBBox::CPWL_Note_LBBox() {}
CPWL_Note_LBBox::~CPWL_Note_LBBox() {}
void CPWL_Note_LBBox::DrawThisAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
CPDF_Rect rcClient = GetClientRect();
CFX_GraphStateData gsd;
@@ -276,7 +276,7 @@ CPWL_Note_RBBox::CPWL_Note_RBBox() {}
CPWL_Note_RBBox::~CPWL_Note_RBBox() {}
void CPWL_Note_RBBox::DrawThisAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
CPDF_Rect rcClient = GetClientRect();
CFX_GraphStateData gsd;
@@ -310,7 +310,7 @@ void CPWL_Note_Icon::SetIconType(int32_t nType) {
}
void CPWL_Note_Icon::DrawThisAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
CPWL_Utils::DrawIconAppStream(pDevice, pUser2Device, m_nType, GetClientRect(),
GetBackgroundColor(), PWL_DEFAULT_BLACKCOLOR,
GetTransparency());
@@ -324,7 +324,7 @@ CPWL_Note_CloseBox::CPWL_Note_CloseBox() : m_bMouseDown(FALSE) {}
CPWL_Note_CloseBox::~CPWL_Note_CloseBox() {}
void CPWL_Note_CloseBox::DrawThisAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
CPWL_Button::DrawThisAppearance(pDevice, pUser2Device);
CPDF_Rect rcClient = GetClientRect();
diff --git a/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp b/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp
index 94f14fd3b8..f4d4baf6e9 100644
--- a/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp
@@ -244,7 +244,7 @@ void CPWL_SBButton::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
}
void CPWL_SBButton::DrawThisAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
if (!IsVisible())
return;
@@ -696,7 +696,7 @@ void CPWL_ScrollBar::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
}
void CPWL_ScrollBar::DrawThisAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
CPDF_Rect rectWnd = GetWindowRect();
if (IsVisible() && !rectWnd.IsEmpty()) {
diff --git a/fpdfsdk/src/pdfwindow/PWL_Signature.cpp b/fpdfsdk/src/pdfwindow/PWL_Signature.cpp
index f872bb4a62..dead655da0 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Signature.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Signature.cpp
@@ -27,7 +27,7 @@ CFX_DIBSource* CPWL_Signature_Image::GetImage() {
}
void CPWL_Signature_Image::DrawThisAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
if (m_pImage) {
@@ -166,7 +166,7 @@ void CPWL_Signature::CreateChildWnd(const PWL_CREATEPARAM& cp) {
}
void CPWL_Signature::DrawThisAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
if (m_bFlagExist)
diff --git a/fpdfsdk/src/pdfwindow/PWL_Utils.cpp b/fpdfsdk/src/pdfwindow/PWL_Utils.cpp
index fafdf1e7cf..85593e11d4 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Utils.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Utils.cpp
@@ -1389,7 +1389,7 @@ FX_COLORREF CPWL_Utils::PWLColorToFXColor(const CPWL_Color& color,
}
void CPWL_Utils::DrawFillRect(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
const CPDF_Rect& rect,
const FX_COLORREF& color) {
CFX_PathData path;
@@ -1399,7 +1399,7 @@ void CPWL_Utils::DrawFillRect(CFX_RenderDevice* pDevice,
}
void CPWL_Utils::DrawFillArea(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
const CPDF_Point* pPts,
int32_t nCount,
const FX_COLORREF& color) {
@@ -1414,7 +1414,7 @@ void CPWL_Utils::DrawFillArea(CFX_RenderDevice* pDevice,
}
void CPWL_Utils::DrawStrokeRect(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
const CPDF_Rect& rect,
const FX_COLORREF& color,
FX_FLOAT fWidth) {
@@ -1429,7 +1429,7 @@ void CPWL_Utils::DrawStrokeRect(CFX_RenderDevice* pDevice,
}
void CPWL_Utils::DrawStrokeLine(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
const CPDF_Point& ptMoveTo,
const CPDF_Point& ptLineTo,
const FX_COLORREF& color,
@@ -1446,7 +1446,7 @@ void CPWL_Utils::DrawStrokeLine(CFX_RenderDevice* pDevice,
}
void CPWL_Utils::DrawFillRect(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
const CPDF_Rect& rect,
const CPWL_Color& color,
int32_t nTransparancy) {
@@ -1455,7 +1455,7 @@ void CPWL_Utils::DrawFillRect(CFX_RenderDevice* pDevice,
}
void CPWL_Utils::DrawShadow(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
FX_BOOL bVertical,
FX_BOOL bHorizontal,
CPDF_Rect rect,
@@ -1490,7 +1490,7 @@ void CPWL_Utils::DrawShadow(CFX_RenderDevice* pDevice,
}
void CPWL_Utils::DrawBorder(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
const CPDF_Rect& rect,
FX_FLOAT fWidth,
const CPWL_Color& color,
@@ -1697,7 +1697,7 @@ static void AddSpellCheckObj(CFX_PathData& PathData,
}
void CPWL_Utils::DrawEditSpellCheck(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
IFX_Edit* pEdit,
const CPDF_Rect& rcClip,
const CPDF_Point& ptOffset,
@@ -1920,7 +1920,7 @@ CFX_ByteString CPWL_Utils::GetIconAppStream(int32_t nType,
}
void CPWL_Utils::DrawIconAppStream(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
+ CFX_Matrix* pUser2Device,
int32_t nType,
const CPDF_Rect& rect,
const CPWL_Color& crFill,
diff --git a/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp b/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp
index d8f3904021..002fc051af 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp
@@ -224,7 +224,7 @@ void CPWL_Wnd::Create(const PWL_CREATEPARAM& cp) {
PWL_CREATEPARAM ccp = m_sPrivateParam;
ccp.dwFlags &= 0xFFFF0000L; // remove sub styles
- ccp.mtChild = CPDF_Matrix(1, 0, 0, 1, 0, 0);
+ ccp.mtChild = CFX_Matrix(1, 0, 0, 1, 0, 0);
CreateScrollBar(ccp);
CreateChildWnd(ccp);
@@ -344,7 +344,7 @@ void CPWL_Wnd::GetChildAppearanceStream(CFX_ByteTextBuf& sAppStream) {
}
void CPWL_Wnd::DrawAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
if (IsValid() && IsVisible()) {
DrawThisAppearance(pDevice, pUser2Device);
DrawChildAppearance(pDevice, pUser2Device);
@@ -352,7 +352,7 @@ void CPWL_Wnd::DrawAppearance(CFX_RenderDevice* pDevice,
}
void CPWL_Wnd::DrawThisAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
CPDF_Rect rectWnd = GetWindowRect();
if (!rectWnd.IsEmpty()) {
if (HasFlag(PWS_BACKGROUND)) {
@@ -372,10 +372,10 @@ void CPWL_Wnd::DrawThisAppearance(CFX_RenderDevice* pDevice,
}
void CPWL_Wnd::DrawChildAppearance(CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device) {
+ CFX_Matrix* pUser2Device) {
for (int32_t i = 0, sz = m_aChildren.GetSize(); i < sz; i++) {
if (CPWL_Wnd* pChild = m_aChildren.GetAt(i)) {
- CPDF_Matrix mt = pChild->GetChildMatrix();
+ CFX_Matrix mt = pChild->GetChildMatrix();
if (mt.IsIdentity()) {
pChild->DrawAppearance(pDevice, pUser2Device);
} else {
@@ -918,8 +918,8 @@ void CPWL_Wnd::SetTransparency(int32_t nTransparency) {
m_sPrivateParam.nTransparency = nTransparency;
}
-CPDF_Matrix CPWL_Wnd::GetWindowMatrix() const {
- CPDF_Matrix mt = GetChildToRoot();
+CFX_Matrix CPWL_Wnd::GetWindowMatrix() const {
+ CFX_Matrix mt = GetChildToRoot();
if (IPWL_Provider* pProvider = GetProvider()) {
mt.Concat(pProvider->GetWindowMatrix(GetAttachedData()));
@@ -930,7 +930,7 @@ CPDF_Matrix CPWL_Wnd::GetWindowMatrix() const {
}
void CPWL_Wnd::PWLtoWnd(const CPDF_Point& point, int32_t& x, int32_t& y) const {
- CPDF_Matrix mt = GetWindowMatrix();
+ CFX_Matrix mt = GetWindowMatrix();
CPDF_Point pt = point;
mt.Transform(pt.x, pt.y);
x = (int32_t)(pt.x + 0.5);
@@ -939,7 +939,7 @@ void CPWL_Wnd::PWLtoWnd(const CPDF_Point& point, int32_t& x, int32_t& y) const {
FX_RECT CPWL_Wnd::PWLtoWnd(const CPDF_Rect& rect) const {
CPDF_Rect rcTemp = rect;
- CPDF_Matrix mt = GetWindowMatrix();
+ CFX_Matrix mt = GetWindowMatrix();
mt.TransformRect(rcTemp);
return FX_RECT((int32_t)(rcTemp.left + 0.5), (int32_t)(rcTemp.bottom + 0.5),
(int32_t)(rcTemp.right + 0.5), (int32_t)(rcTemp.top + 0.5));
@@ -950,7 +950,7 @@ FX_HWND CPWL_Wnd::GetAttachedHWnd() const {
}
CPDF_Point CPWL_Wnd::ChildToParent(const CPDF_Point& point) const {
- CPDF_Matrix mt = GetChildMatrix();
+ CFX_Matrix mt = GetChildMatrix();
if (mt.IsIdentity())
return point;
@@ -960,7 +960,7 @@ CPDF_Point CPWL_Wnd::ChildToParent(const CPDF_Point& point) const {
}
CPDF_Rect CPWL_Wnd::ChildToParent(const CPDF_Rect& rect) const {
- CPDF_Matrix mt = GetChildMatrix();
+ CFX_Matrix mt = GetChildMatrix();
if (mt.IsIdentity())
return rect;
@@ -970,7 +970,7 @@ CPDF_Rect CPWL_Wnd::ChildToParent(const CPDF_Rect& rect) const {
}
CPDF_Point CPWL_Wnd::ParentToChild(const CPDF_Point& point) const {
- CPDF_Matrix mt = GetChildMatrix();
+ CFX_Matrix mt = GetChildMatrix();
if (mt.IsIdentity())
return point;
@@ -981,7 +981,7 @@ CPDF_Point CPWL_Wnd::ParentToChild(const CPDF_Point& point) const {
}
CPDF_Rect CPWL_Wnd::ParentToChild(const CPDF_Rect& rect) const {
- CPDF_Matrix mt = GetChildMatrix();
+ CFX_Matrix mt = GetChildMatrix();
if (mt.IsIdentity())
return rect;
@@ -991,8 +991,8 @@ CPDF_Rect CPWL_Wnd::ParentToChild(const CPDF_Rect& rect) const {
return rc;
}
-CPDF_Matrix CPWL_Wnd::GetChildToRoot() const {
- CPDF_Matrix mt(1, 0, 0, 1, 0, 0);
+CFX_Matrix CPWL_Wnd::GetChildToRoot() const {
+ CFX_Matrix mt(1, 0, 0, 1, 0, 0);
if (HasFlag(PWS_CHILD)) {
const CPWL_Wnd* pParent = this;
while (pParent) {
@@ -1003,14 +1003,14 @@ CPDF_Matrix CPWL_Wnd::GetChildToRoot() const {
return mt;
}
-CPDF_Matrix CPWL_Wnd::GetChildMatrix() const {
+CFX_Matrix CPWL_Wnd::GetChildMatrix() const {
if (HasFlag(PWS_CHILD))
return m_sPrivateParam.mtChild;
- return CPDF_Matrix(1, 0, 0, 1, 0, 0);
+ return CFX_Matrix(1, 0, 0, 1, 0, 0);
}
-void CPWL_Wnd::SetChildMatrix(const CPDF_Matrix& mt) {
+void CPWL_Wnd::SetChildMatrix(const CFX_Matrix& mt) {
m_sPrivateParam.mtChild = mt;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 02:32:16 +0000