Merge branch '2025.08'

1 files changed, 13 insertions, 5 deletions

diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index 5b672bf171..9350901324 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -554,11 +554,6 @@ public:
 
         }
 
-        if (!opj_setup_encoder(encoder, &parameters, image))
-        {
-            return false;
-        }
-
         U32 width_tiles = (rawImageIn.getWidth() >> 6);
         U32 height_tiles = (rawImageIn.getHeight() >> 6);
 
@@ -572,6 +567,19 @@ public:
             height_tiles = 1;
         }
 
+        if (width_tiles == 1 || height_tiles == 1)
+        {
+            // Images with either dimension less than 32 need less number of resolutions otherwise they error
+            int min_dim = rawImageIn.getWidth() < rawImageIn.getHeight() ? rawImageIn.getWidth() : rawImageIn.getHeight();
+            int max_res = 1 + (int)floor(log2(min_dim));
+            parameters.numresolution = max_res;
+        }
+
+        if (!opj_setup_encoder(encoder, &parameters, image))
+        {
+            return false;
+        }
+
         U32 tile_count = width_tiles * height_tiles;
         U32 data_size_guess = tile_count * TILE_SIZE;