summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-09-02 15:45:22 -0700
committerCommit bot <commit-bot@chromium.org>2016-09-02 15:45:22 -0700
commitfc1d16f76f173b8437edc93dde8f9f82abb51298 (patch)
treeec4e9fedf08524443a6ff13d45b4e66159f8990b /fpdfsdk
parentbbee445c5a77dfbaea9041308f001c756e49c5fd (diff)
downloadpdfium-fc1d16f76f173b8437edc93dde8f9f82abb51298.tar.xz
Make CPDF_Path have a CFX_Path rather than inheriting
Review-Url: https://codereview.chromium.org/2305103002
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/fpdf_transformpage.cpp6
-rw-r--r--fpdfsdk/fxedit/fxet_edit.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/fpdfsdk/fpdf_transformpage.cpp b/fpdfsdk/fpdf_transformpage.cpp
index 712080a9de..f76cc2be8c 100644
--- a/fpdfsdk/fpdf_transformpage.cpp
+++ b/fpdfsdk/fpdf_transformpage.cpp
@@ -219,11 +219,11 @@ DLLEXPORT FPDF_CLIPPATH STDCALL FPDF_CreateClipPath(float left,
float bottom,
float right,
float top) {
- CPDF_ClipPath* pNewClipPath = new CPDF_ClipPath();
- pNewClipPath->GetPrivateCopy();
CPDF_Path Path;
- Path.GetPrivateCopy();
Path.AppendRect(left, bottom, right, top);
+
+ CPDF_ClipPath* pNewClipPath = new CPDF_ClipPath();
+ pNewClipPath->GetPrivateCopy();
pNewClipPath->AppendPath(Path, FXFILL_ALTERNATE, FALSE);
return pNewClipPath;
}
diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp
index 098ef7f10b..7d207a83ca 100644
--- a/fpdfsdk/fxedit/fxet_edit.cpp
+++ b/fpdfsdk/fxedit/fxet_edit.cpp
@@ -137,8 +137,8 @@ void AddRectToPageObjects(CPDF_PageObjectHolder* pObjectHolder,
FX_COLORREF crFill,
const CFX_FloatRect& rcFill) {
std::unique_ptr<CPDF_PathObject> pPathObj(new CPDF_PathObject);
- CFX_PathData* pPathData = pPathObj->m_Path.GetPrivateCopy();
- pPathData->AppendRect(rcFill.left, rcFill.bottom, rcFill.right, rcFill.top);
+ pPathObj->m_Path.AppendRect(rcFill.left, rcFill.bottom, rcFill.right,
+ rcFill.top);
FX_FLOAT rgb[3];
rgb[0] = FXARGB_R(crFill) / 255.0f;