commit 3567c610b6e7fcb99e0ac2feb7eada484aea4042
author Lei Zhang <thestig@chromium.org> Mon Nov 18 18:10:02 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Nov 18 18:10:02 2019 +0000
tree ab4962e4c212b12f214fc784f7b297ea8bfd0d1a
parent 04db63b2e50b3ae7736dfb2d195443995e40f3fe

Make FSRECTFFromCFXFloatRect() return a FS_RECTF directly.

Instead of using an out parameter.

Change-Id: I088fd4a2393b015502031cd7620acca9eac51bf0
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/62494
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

fpdfsdk/cpdfsdk_helpers.cpp

diff --git a/fpdfsdk/cpdfsdk_helpers.cpp b/fpdfsdk/cpdfsdk_helpers.cpp
index 817cb09..1c3f306 100644
--- a/fpdfsdk/cpdfsdk_helpers.cpp
+++ b/fpdfsdk/cpdfsdk_helpers.cpp
@@ -251,11 +251,8 @@
   return CFX_FloatRect(rect.left, rect.bottom, rect.right, rect.top);
 }
 
-void FSRECTFFromCFXFloatRect(const CFX_FloatRect& rect, FS_RECTF* out_rect) {
-  out_rect->left = rect.left;
-  out_rect->top = rect.top;
-  out_rect->right = rect.right;
-  out_rect->bottom = rect.bottom;
+FS_RECTF FSRECTFFromCFXFloatRect(const CFX_FloatRect& rect) {
+  return {rect.left, rect.top, rect.right, rect.bottom};
 }
 
 CFX_Matrix CFXMatrixFromFSMatrix(const FS_MATRIX& matrix) {

fpdfsdk/cpdfsdk_helpers.h

diff --git a/fpdfsdk/cpdfsdk_helpers.h b/fpdfsdk/cpdfsdk_helpers.h
index 527a04a..4b84395 100644
--- a/fpdfsdk/cpdfsdk_helpers.h
+++ b/fpdfsdk/cpdfsdk_helpers.h
@@ -233,7 +233,7 @@
                           FS_QUADPOINTSF* quad_points);
 
 CFX_FloatRect CFXFloatRectFromFSRECTF(const FS_RECTF& rect);
-void FSRECTFFromCFXFloatRect(const CFX_FloatRect& rect, FS_RECTF* out_rect);
+FS_RECTF FSRECTFFromCFXFloatRect(const CFX_FloatRect& rect);
 
 CFX_Matrix CFXMatrixFromFSMatrix(const FS_MATRIX& matrix);
 

fpdfsdk/fpdf_annot.cpp

diff --git a/fpdfsdk/fpdf_annot.cpp b/fpdfsdk/fpdf_annot.cpp
index b1d2279..46c0106 100644
--- a/fpdfsdk/fpdf_annot.cpp
+++ b/fpdfsdk/fpdf_annot.cpp
@@ -682,8 +682,8 @@
   if (!pAnnotDict || !rect)
     return false;
 
-  FSRECTFFromCFXFloatRect(pAnnotDict->GetRectFor(pdfium::annotation::kRect),
-                          rect);
+  *rect = FSRECTFFromCFXFloatRect(
+      pAnnotDict->GetRectFor(pdfium::annotation::kRect));
   return true;
 }
 

fpdfsdk/fpdf_doc.cpp

diff --git a/fpdfsdk/fpdf_doc.cpp b/fpdfsdk/fpdf_doc.cpp
index 5b7c727..b789891 100644
--- a/fpdfsdk/fpdf_doc.cpp
+++ b/fpdfsdk/fpdf_doc.cpp
@@ -365,8 +365,9 @@
                                                           FS_RECTF* rect) {
   if (!link_annot || !rect)
     return false;
+
   CPDF_Dictionary* pAnnotDict = CPDFDictionaryFromFPDFLink(link_annot);
-  FSRECTFFromCFXFloatRect(pAnnotDict->GetRectFor("Rect"), rect);
+  *rect = FSRECTFFromCFXFloatRect(pAnnotDict->GetRectFor("Rect"));
   return true;
 }
 

fpdfsdk/fpdf_view.cpp

diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp
index 66f339d..a735554 100644
--- a/fpdfsdk/fpdf_view.cpp
+++ b/fpdfsdk/fpdf_view.cpp
@@ -371,7 +371,7 @@
   if (!pPage)
     return false;
 
-  FSRECTFFromCFXFloatRect(pPage->GetBBox(), rect);
+  *rect = FSRECTFFromCFXFloatRect(pPage->GetBBox());
   return true;
 }