Pass rect by const reference in SetClip_Rect().

fpdfsdk/src/fxedit/fxet_pageobjs.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/include/fpdfapi/fpdf_pageobj.h"
 #include "core/include/fpdfapi/fpdf_render.h"
 #include "fpdfsdk/include/fx_systemhandler.h"
 #include "fpdfsdk/include/fxedit/fx_edit.h"
@@ skipping 82 matching lines @@
                              IFX_Edit* pEdit,
                              FX_COLORREF color,
                              const CFX_FloatRect& rcClip,
                              const CFX_FloatPoint& ptOffset,
                              const CPVT_WordRange* pRange) {
   pDevice->SaveState();
 
   if (!rcClip.IsEmpty()) {
     CFX_FloatRect rcTemp = rcClip;
     pUser2Device->TransformRect(rcTemp);
-    FX_RECT rcDevClip;
-    rcDevClip.left = (int32_t)rcTemp.left;
-    rcDevClip.right = (int32_t)rcTemp.right;
-    rcDevClip.top = (int32_t)rcTemp.top;
-    rcDevClip.bottom = (int32_t)rcTemp.bottom;
-    pDevice->SetClip_Rect(&rcDevClip);
+    pDevice->SetClip_Rect(FX_RECT((int32_t)rcTemp.left, (int32_t)rcTemp.top,
+                                  (int32_t)rcTemp.right,
+                                  (int32_t)rcTemp.bottom));
   }
 
   if (IFX_Edit_Iterator* pIterator = pEdit->GetIterator()) {
     if (pEdit->GetFontMap()) {
       if (pRange)
         pIterator->SetAt(pRange->BeginPos);
       else
         pIterator->SetAt(0);
 
       while (pIterator->NextWord()) {
@@ skipping 48 matching lines @@
 
   CFX_ByteTextBuf sTextBuf;
   int32_t nFontIndex = -1;
   CFX_FloatPoint ptBT(0.0f, 0.0f);
 
   pDevice->SaveState();
 
   if (!rcClip.IsEmpty()) {
     CFX_FloatRect rcTemp = rcClip;
     pUser2Device->TransformRect(rcTemp);
-    FX_RECT rcDevClip;
-    rcDevClip.left = (int32_t)rcTemp.left;
-    rcDevClip.right = (int32_t)rcTemp.right;
-    rcDevClip.top = (int32_t)rcTemp.top;
-    rcDevClip.bottom = (int32_t)rcTemp.bottom;
-    pDevice->SetClip_Rect(&rcDevClip);
+    pDevice->SetClip_Rect(FX_RECT((int32_t)rcTemp.left, (int32_t)rcTemp.top,
+                                  (int32_t)rcTemp.right,
+                                  (int32_t)rcTemp.bottom));
   }
 
   if (IFX_Edit_Iterator* pIterator = pEdit->GetIterator()) {
     if (IFX_Edit_FontMap* pFontMap = pEdit->GetFontMap()) {
       if (pRange)
         pIterator->SetAt(pRange->BeginPos);
       else
         pIterator->SetAt(0);
 
       CPVT_WordPlace oldplace;
@@ skipping 99 matching lines @@
 
   CFX_ByteTextBuf sTextBuf;
   CPVT_WordProps wp;
   CFX_FloatPoint ptBT(0.0f, 0.0f);
 
   pDevice->SaveState();
 
   if (!rcClip.IsEmpty()) {
     CFX_FloatRect rcTemp = rcClip;
     pUser2Device->TransformRect(rcTemp);
-    FX_RECT rcDevClip;
-    rcDevClip.left = (int32_t)rcTemp.left;
-    rcDevClip.right = (int32_t)rcTemp.right;
-    rcDevClip.top = (int32_t)rcTemp.top;
-    rcDevClip.bottom = (int32_t)rcTemp.bottom;
-    pDevice->SetClip_Rect(&rcDevClip);
+    pDevice->SetClip_Rect(FX_RECT((int32_t)rcTemp.left, (int32_t)rcTemp.right,

[dsinclair, 2016/02/29 21:15:26]

This should be left, top, right bottom?

[Tom Sepez, 2016/02/29 21:17:45]

Yup. Just noticed that.

+                                  (int32_t)rcTemp.top, (int32_t)rcTemp.bottom));
   }
 
   if (IFX_Edit_Iterator* pIterator = pEdit->GetIterator()) {
     if (IFX_Edit_FontMap* pFontMap = pEdit->GetFontMap()) {
       if (pRange)
         pIterator->SetAt(pRange->BeginPos);
       else
         pIterator->SetAt(0);
 
       CPVT_WordPlace oldplace;
@@ skipping 328 matching lines @@
           rcUnderline.left += ptOffset.x;
           rcUnderline.right += ptOffset.x;
           rcUnderline.top += ptOffset.y;
           rcUnderline.bottom += ptOffset.y;
           AddRectToPageObjects(pObjectHolder, color, rcUnderline);
         }
       }
     }
   }
 }