From 71a452f8ce12e31cc4e0d8c7878567b0c7fc63c2 Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Fri, 13 May 2016 17:51:27 -0700
Subject: Make CFX_ByteString(const CFX_ByteStringC&) explicit.

Add missing helper function to CFX_ByteTextBuf to avoid the
anti-pattern CFX_ByteString(sBuf.AsStringC()), using the name
"Make" to indicate there's an allocation going on in this case.

Change some method arguments to take pre-existing ByteStrings where
possible.

Review-Url: https://codereview.chromium.org/1977093002
---
 fpdfsdk/fpdf_transformpage.cpp | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'fpdfsdk/fpdf_transformpage.cpp')

diff --git a/fpdfsdk/fpdf_transformpage.cpp b/fpdfsdk/fpdf_transformpage.cpp
index d47cb02b1d..5fe6e4ebcc 100644
--- a/fpdfsdk/fpdf_transformpage.cpp
+++ b/fpdfsdk/fpdf_transformpage.cpp
@@ -20,36 +20,34 @@
 namespace {
 
 void SetBoundingBox(CPDF_Page* page,
-                    const CFX_ByteStringC& key,
+                    const CFX_ByteString& key,
                     float left,
                     float bottom,
                     float right,
                     float top) {
-  CPDF_Dictionary* pPageDict = page->m_pFormDict;
   CPDF_Array* pBoundingBoxArray = new CPDF_Array;
   pBoundingBoxArray->Add(new CPDF_Number(left));
   pBoundingBoxArray->Add(new CPDF_Number(bottom));
   pBoundingBoxArray->Add(new CPDF_Number(right));
   pBoundingBoxArray->Add(new CPDF_Number(top));
-  pPageDict->SetAt(key, pBoundingBoxArray);
+  page->m_pFormDict->SetAt(key, pBoundingBoxArray);
 }
 
-FPDF_BOOL GetBoundingBox(CPDF_Page* page,
-                         const CFX_ByteStringC& key,
-                         float* left,
-                         float* bottom,
-                         float* right,
-                         float* top) {
-  CPDF_Dictionary* pPageDict = page->m_pFormDict;
-  CPDF_Array* pArray = pPageDict->GetArrayBy(key);
+bool GetBoundingBox(CPDF_Page* page,
+                    const CFX_ByteString& key,
+                    float* left,
+                    float* bottom,
+                    float* right,
+                    float* top) {
+  CPDF_Array* pArray = page->m_pFormDict->GetArrayBy(key);
   if (!pArray)
-    return FALSE;
+    return false;
 
   *left = pArray->GetFloatAt(0);
   *bottom = pArray->GetFloatAt(1);
   *right = pArray->GetFloatAt(2);
   *top = pArray->GetFloatAt(3);
-  return TRUE;
+  return true;
 }
 
 }  // namespace
-- 
cgit v1.2.3