From af1b4c8df47c02f53124178758dd56bc75fdf005 Mon Sep 17 00:00:00 2001
From: DRC <information@libjpeg-turbo.org>
Date: Sat, 21 Jan 2023 18:31:20 -0600
Subject: [PATCH] TJBench: Unset TJ*OPT_CROP when disabling tiling

Otherwise, if the input image is a JPEG image, then an unnecessary
lossless transformation will be performed.
---
 java/TJBench.java | 3 ++-
 tjbench.c         | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/java/TJBench.java b/java/TJBench.java
index 95e27884..e95541d5 100644
--- a/java/TJBench.java
+++ b/java/TJBench.java
@@ -947,8 +947,9 @@ final class TJBench {
 
       if ((sf.getNum() != 1 || sf.getDenom() != 1) && doTile) {
         System.out.println("Disabling tiled compression/decompression tests, because those tests do not");
-        System.out.println("work when scaled decompression is enabled.");
+        System.out.println("work when scaled decompression is enabled.\n");
         doTile = false;
+        xformOpt &= (~TJTransform.OPT_CROP);
       }
 
       if (!decompOnly) {
diff --git a/tjbench.c b/tjbench.c
index c9e9e852..624127f8 100644
--- a/tjbench.c
+++ b/tjbench.c
@@ -973,14 +973,14 @@ int main(int argc, char *argv[])
 
   if ((sf.num != 1 || sf.denom != 1) && doTile) {
     printf("Disabling tiled compression/decompression tests, because those tests do not\n");
-    printf("work when scaled decompression is enabled.\n");
-    doTile = 0;
+    printf("work when scaled decompression is enabled.\n\n");
+    doTile = 0;  xformOpt &= (~TJXOPT_CROP);
   }
 
   if ((flags & TJFLAG_NOREALLOC) == 0 && doTile) {
     printf("Disabling tiled compression/decompression tests, because those tests do not\n");
     printf("work when dynamic JPEG buffer allocation is enabled.\n\n");
-    doTile = 0;
+    doTile = 0;  xformOpt &= (~TJXOPT_CROP);
   }
 
   if (!decompOnly) {