commit 4819f8718d0a1f7a1dff7c78b79f1cb66aa5df67
author Lei Zhang <thestig@chromium.org> Wed Sep 25 12:46:56 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Sep 25 12:46:56 2019 +0000
tree c1a77d24afeb068e61456abc2253cd1f1b7a223a
parent 571f9325cf9b1c63bde0fd1d79a383b5702cfa62

Fix nits in CPDF_RenderStatus.

- Fix remaining lint errors.
- Simplify AND/OR logic in a couple places.
- Fix an inaccurate comment.

Change-Id: Ieaa717fcd81fdd9ef8c402552e323fd4c8e98938
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/61071
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

core/fpdfapi/render/cpdf_renderstatus.cpp

diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index cf7e5b2..6b7e69e 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -96,7 +96,7 @@
   CFX_FloatRect cell_bbox =
       pPattern->pattern_to_form().TransformRect(pPattern->bbox());
   cell_bbox = mtObject2Device.TransformRect(cell_bbox);
-  CFX_FloatRect bitmap_rect(0.0f, 0.0f, (float)width, (float)height);
+  CFX_FloatRect bitmap_rect(0.0f, 0.0f, width, height);
   CFX_Matrix mtAdjust;
   mtAdjust.MatchRect(bitmap_rect, cell_bbox);
 
@@ -138,14 +138,12 @@
 
 bool Type3CharMissingFillColor(const CPDF_Type3Char* pChar,
                                const CPDF_ColorState* pColorState) {
-  return pChar && (!pChar->colored() ||
-                   (pChar->colored() && MissingFillColor(pColorState)));
+  return pChar && (!pChar->colored() || MissingFillColor(pColorState));
 }
 
 bool Type3CharMissingStrokeColor(const CPDF_Type3Char* pChar,
                                  const CPDF_ColorState* pColorState) {
-  return pChar && (!pChar->colored() ||
-                   (pChar->colored() && MissingStrokeColor(pColorState)));
+  return pChar && (!pChar->colored() || MissingStrokeColor(pColorState));
 }
 
 #if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
@@ -872,7 +870,7 @@
         break;
       case TextRenderingMode::MODE_INVISIBLE:
         // Already handled above, but the compiler is not smart enough to
-        // realize it. Fall through.
+        // realize it.
         NOTREACHED();
         return true;
       case TextRenderingMode::MODE_CLIP:
@@ -1648,8 +1646,8 @@
   std::vector<uint8_t> transfers(256);
   if (pFunc) {
     std::vector<float> results(pFunc->CountOutputs());
-    for (int i = 0; i < 256; i++) {
-      float input = (float)i / 255.0f;
+    for (size_t i = 0; i < transfers.size(); ++i) {
+      float input = i / 255.0f;
       int nresult;
       pFunc->Call(&input, 1, results.data(), &nresult);
       transfers[i] = FXSYS_roundf(results[0] * 255);