Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(473)

Unified Diff: core/fpdfapi/fpdf_page/cpdf_clippath.cpp

Issue 2291833002: Revert "Replace wrapper methods in CPDF_Path with -> operator." (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/fpdfapi/fpdf_page/cpdf_allstates.cpp ('k') | core/fpdfapi/fpdf_page/cpdf_pathobject.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fpdfapi/fpdf_page/cpdf_clippath.cpp
diff --git a/core/fpdfapi/fpdf_page/cpdf_clippath.cpp b/core/fpdfapi/fpdf_page/cpdf_clippath.cpp
index 51f3086c12a442df772f2344eb1eb89af57846d1..2c05df0d193d98e822c1385a597d53bc869d0a3f 100644
--- a/core/fpdfapi/fpdf_page/cpdf_clippath.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_clippath.cpp
@@ -38,9 +38,9 @@ CFX_FloatRect CPDF_ClipPath::GetClipBox() const {
FX_BOOL bStarted = FALSE;
int count = GetPathCount();
if (count) {
- rect = GetPath(0)->GetBoundingBox();
+ rect = GetPath(0).GetBoundingBox();
for (int i = 1; i < count; i++) {
- CFX_FloatRect path_rect = GetPath(i)->GetBoundingBox();
+ CFX_FloatRect path_rect = GetPath(i).GetBoundingBox();
rect.Intersect(path_rect);
}
bStarted = TRUE;
@@ -77,10 +77,10 @@ void CPDF_ClipPath::AppendPath(CPDF_Path path, uint8_t type, bool bAutoMerge) {
CPDF_ClipPathData* pData = GetObject();
if (!pData->m_PathAndTypeList.empty() && bAutoMerge) {
const CPDF_Path& old_path = pData->m_PathAndTypeList.back().first;
- if (old_path->IsRect()) {
- CFX_FloatRect old_rect(old_path->GetPointX(0), old_path->GetPointY(0),
- old_path->GetPointX(2), old_path->GetPointY(2));
- CFX_FloatRect new_rect = path->GetBoundingBox();
+ if (old_path.IsRect()) {
+ CFX_FloatRect old_rect(old_path.GetPointX(0), old_path.GetPointY(0),
+ old_path.GetPointX(2), old_path.GetPointY(2));
+ CFX_FloatRect new_rect = path.GetBoundingBox();
if (old_rect.Contains(new_rect))
pData->m_PathAndTypeList.pop_back();
}
« no previous file with comments | « core/fpdfapi/fpdf_page/cpdf_allstates.cpp ('k') | core/fpdfapi/fpdf_page/cpdf_pathobject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698