commit 584308e81e837c7fb60361a02e246a4b667b4064
author Lei Zhang <thestig@chromium.org> Sat Jun 12 01:20:47 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Jun 12 01:20:47 2021 +0000
tree b65993a93b18a2b57e8ba7e3794b0f32f5cf540e
parent c1359612aace1ba85956fa6f859303e90f5017ad

Use STL algorithms in ProgressiveDecoder::WeightTable::Calc().

Also switch to static_cast, and cast to double.

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

core/fxcodec/progressive_decoder.cpp

diff --git a/core/fxcodec/progressive_decoder.cpp b/core/fxcodec/progressive_decoder.cpp
index f8649ce..427ab65 100644
--- a/core/fxcodec/progressive_decoder.cpp
+++ b/core/fxcodec/progressive_decoder.cpp
@@ -121,15 +121,10 @@
       double dest_start = ((float)j) / scale;
       double dest_end = ((float)(j + 1)) / scale;
       if (dest_start > dest_end) {
-        double temp = dest_start;
-        dest_start = dest_end;
-        dest_end = temp;
+        std::swap(dest_start, dest_end);
       }
-      double area_start =
-          dest_start > (float)(dest_pixel) ? dest_start : (float)(dest_pixel);
-      double area_end = dest_end > (float)(dest_pixel + 1)
-                            ? (float)(dest_pixel + 1)
-                            : dest_end;
+      double area_start = std::max(dest_start, static_cast<double>(dest_pixel));
+      double area_end = std::min(dest_end, static_cast<double>(dest_pixel + 1));
       double weight = area_start >= area_end ? 0.0 : area_end - area_start;
       if (weight == 0 && j == end_i) {
         pixel_weights.m_SrcEnd--;