commit 1a084021c5d93aef0f726d4fbc2598476409982c
author Jane Liu <janeliulwq@google.com> Thu Jun 29 19:47:12 2017 -0400
committer Chromium commit bot <commit-bot@chromium.org> Fri Jun 30 01:13:08 2017 +0000
tree 825599c8a4cb779cf842427c34fe1d6db466358a
parent baa7ff4390b8b36c2d58c1b1f8d9775c76da656a

Replaced static casts with CPDFPageObjectFromFPDFPageObject()

Change-Id: I6296928a1dbd5a8dffaf949ac4c8d7e8336c4448
Reviewed-on: https://pdfium-review.googlesource.com/7170
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

fpdfsdk/fpdfeditpage.cpp

diff --git a/fpdfsdk/fpdfeditpage.cpp b/fpdfsdk/fpdfeditpage.cpp
index 699e030..a7ee212 100644
--- a/fpdfsdk/fpdfeditpage.cpp
+++ b/fpdfsdk/fpdfeditpage.cpp
@@ -168,7 +168,7 @@
 
 DLLEXPORT void STDCALL FPDFPage_InsertObject(FPDF_PAGE page,
                                              FPDF_PAGEOBJECT page_obj) {
-  CPDF_PageObject* pPageObj = static_cast<CPDF_PageObject*>(page_obj);
+  CPDF_PageObject* pPageObj = CPDFPageObjectFromFPDFPageObject(page_obj);
   if (!pPageObj)
     return;
 
@@ -206,7 +206,7 @@
   if (!pageObject)
     return false;
 
-  CPDF_PageObject* pPageObj = static_cast<CPDF_PageObject*>(pageObject);
+  CPDF_PageObject* pPageObj = CPDFPageObjectFromFPDFPageObject(pageObject);
   int blend_type = pPageObj->m_GeneralState.GetBlendType();
   if (blend_type != FXDIB_BLEND_NORMAL)
     return true;
@@ -239,7 +239,7 @@
   if (!pageObject)
     return FPDF_PAGEOBJ_UNKNOWN;
 
-  CPDF_PageObject* pPageObj = static_cast<CPDF_PageObject*>(pageObject);
+  CPDF_PageObject* pPageObj = CPDFPageObjectFromFPDFPageObject(pageObject);
   return pPageObj->GetType();
 }
 
@@ -260,7 +260,7 @@
                                              double d,
                                              double e,
                                              double f) {
-  CPDF_PageObject* pPageObj = static_cast<CPDF_PageObject*>(page_object);
+  CPDF_PageObject* pPageObj = CPDFPageObjectFromFPDFPageObject(page_object);
   if (!pPageObj)
     return;
 
@@ -270,7 +270,7 @@
 
 DLLEXPORT void STDCALL FPDFPageObj_SetBlendMode(FPDF_PAGEOBJECT page_object,
                                                 FPDF_BYTESTRING blend_mode) {
-  CPDF_PageObject* pPageObj = static_cast<CPDF_PageObject*>(page_object);
+  CPDF_PageObject* pPageObj = CPDFPageObjectFromFPDFPageObject(page_object);
   if (!pPageObj)
     return;
 
@@ -331,7 +331,7 @@
     return false;
 
   float rgb[3] = {R / 255.f, G / 255.f, B / 255.f};
-  auto* pPageObj = static_cast<CPDF_PageObject*>(page_object);
+  auto* pPageObj = CPDFPageObjectFromFPDFPageObject(page_object);
   pPageObj->m_GeneralState.SetFillAlpha(A / 255.f);
   pPageObj->m_ColorState.SetFillColor(
       CPDF_ColorSpace::GetStockCS(PDFCS_DEVICERGB), rgb, 3);
@@ -347,7 +347,7 @@
   if (!pageObject)
     return false;
 
-  CPDF_PageObject* pPageObj = static_cast<CPDF_PageObject*>(pageObject);
+  CPDF_PageObject* pPageObj = CPDFPageObjectFromFPDFPageObject(pageObject);
   CFX_FloatRect bbox = pPageObj->GetRect();
   *left = bbox.left;
   *bottom = bbox.bottom;

fpdfsdk/fpdfeditpath.cpp

diff --git a/fpdfsdk/fpdfeditpath.cpp b/fpdfsdk/fpdfeditpath.cpp
index 6235210..12d8a97 100644
--- a/fpdfsdk/fpdfeditpath.cpp
+++ b/fpdfsdk/fpdfeditpath.cpp
@@ -194,7 +194,7 @@
           static_cast<int>(CFX_GraphStateData::LineJoin::LineJoinBevel)) {
     return;
   }
-  auto* pPathObj = static_cast<CPDF_PageObject*>(path);
+  auto* pPathObj = CPDFPageObjectFromFPDFPageObject(path);
   CFX_GraphStateData::LineJoin lineJoin =
       static_cast<CFX_GraphStateData::LineJoin>(line_join);
   pPathObj->m_GraphState.SetLineJoin(lineJoin);
@@ -208,7 +208,7 @@
       line_cap > static_cast<int>(CFX_GraphStateData::LineCap::LineCapSquare)) {
     return;
   }
-  auto* pPathObj = static_cast<CPDF_PageObject*>(path);
+  auto* pPathObj = CPDFPageObjectFromFPDFPageObject(path);
   CFX_GraphStateData::LineCap lineCap =
       static_cast<CFX_GraphStateData::LineCap>(line_cap);
   pPathObj->m_GraphState.SetLineCap(lineCap);