Merge branch 'main' into dev

2023-01-23 09:55:13 -06:00
parent 7ab6222cff edbb7e6d43
commit 52659f4f47
8 changed files with 48 additions and 45 deletions
--- a/java/TJBench.java
+++ b/java/TJBench.java
@@ -971,8 +971,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) {