From 97e5d9c20bb79d0caacff698508b29fe2b064243 Mon Sep 17 00:00:00 2001
From: Wan-Teh Chang <wtc@google.com>
Date: Thu, 23 Jul 2026 18:41:29 -0700
Subject: [PATCH] Remove unneeded clamping of y to max_y

Change-Id: If02f0e789757e156737ea3cf8ffb822b7e8a938a
---
 source/scale.cc      | 18 ++++++------------
 source/scale_argb.cc |  9 +++------
 source/scale_uv.cc   |  9 +++------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/source/scale.cc b/source/scale.cc
index 4b7b2d3bc..e8dc1e476 100644
--- a/source/scale.cc
+++ b/source/scale.cc
@@ -1133,11 +1133,11 @@ static int ScalePlaneBilinearDown(int src_width,
     }
   }
 #endif
-  if (y > max_y) {
-    y = max_y;
-  }
 
   for (j = 0; j < dst_height; ++j) {
+    if (y > max_y) {
+      y = max_y;
+    }
     int yi = y >> 16;
     const uint8_t* src = src_ptr + yi * src_stride;
     if (filtering == kFilterLinear) {
@@ -1149,9 +1149,6 @@ static int ScalePlaneBilinearDown(int src_width,
     }
     dst_ptr += dst_stride;
     y += dy;
-    if (y > max_y) {
-      y = max_y;
-    }
   }
   free_aligned_buffer_64(row);
   return 0;
@@ -1224,11 +1221,11 @@ static int ScalePlaneBilinearDown_16(int src_width,
     ScaleFilterCols = ScaleFilterCols_16_SSSE3;
   }
 #endif
-  if (y > max_y) {
-    y = max_y;
-  }
 
   for (j = 0; j < dst_height; ++j) {
+    if (y > max_y) {
+      y = max_y;
+    }
     int yi = y >> 16;
     const uint16_t* src = src_ptr + yi * src_stride;
     if (filtering == kFilterLinear) {
@@ -1240,9 +1237,6 @@ static int ScalePlaneBilinearDown_16(int src_width,
     }
     dst_ptr += dst_stride;
     y += dy;
-    if (y > max_y) {
-      y = max_y;
-    }
   }
   free_aligned_buffer_64(row);
   return 0;
diff --git a/source/scale_argb.cc b/source/scale_argb.cc
index 8758d79c2..6eb5c9758 100644
--- a/source/scale_argb.cc
+++ b/source/scale_argb.cc
@@ -400,10 +400,10 @@ static int ScaleARGBBilinearDown(int src_width,
       return 1;
 
     const int max_y = (src_height - 1) << 16;
-    if (y > max_y) {
-      y = max_y;
-    }
     for (j = 0; j < dst_height; ++j) {
+      if (y > max_y) {
+        y = max_y;
+      }
       int yi = y >> 16;
       const uint8_t* src = src_argb + yi * src_stride;
       if (filtering == kFilterLinear) {
@@ -415,9 +415,6 @@ static int ScaleARGBBilinearDown(int src_width,
       }
       dst_argb += dst_stride;
       y += dy;
-      if (y > max_y) {
-        y = max_y;
-      }
     }
     free_aligned_buffer_64(row);
   }
diff --git a/source/scale_uv.cc b/source/scale_uv.cc
index 43a464732..e28528e4f 100644
--- a/source/scale_uv.cc
+++ b/source/scale_uv.cc
@@ -418,10 +418,10 @@ static int ScaleUVBilinearDown(int src_width,
     align_buffer_64(row, clip_src_width * 2);
     if (!row)
       return 1;
-    if (y > max_y) {
-      y = max_y;
-    }
     for (j = 0; j < dst_height; ++j) {
+      if (y > max_y) {
+        y = max_y;
+      }
       int yi = y >> 16;
       const uint8_t* src = src_uv + yi * src_stride;
       if (filtering == kFilterLinear) {
@@ -433,9 +433,6 @@ static int ScaleUVBilinearDown(int src_width,
       }
       dst_uv += dst_stride;
       y += dy;
-      if (y > max_y) {
-        y = max_y;
-      }
     }
     free_aligned_buffer_64(row);
   }