Merge pull request #280 from ImagingDataCommons/fix_jpeg2000_compression

Remove JP2 wrapper from JPEG 2000 encoding
ImagingDataCommons · Apr 6, 2024 · fc1a536 · fc1a536
2 parents 445a259 + b1433f0
commit fc1a536
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/highdicom/frame.py b/src/highdicom/frame.py
@@ -50,7 +50,7 @@ def encode_frame(
         Number of bits that need to be allocated per pixel sample
     bits_stored: int
         Number of bits that are required to store a pixel sample
-    photometric_interpretation: int
+    photometric_interpretation: Union[PhotometricInterpretationValues, str]
         Photometric interpretation
     pixel_representation: Union[highdicom.PixelRepresentationValues, int, None], optional
         Whether pixel samples are represented as unsigned integers or
@@ -156,6 +156,7 @@ def encode_frame(
                     'tile_size': None,
                     'num_resolutions': 1,
                     'irreversible': False,
+                    'no_jp2': True,
                 },
             ),
             JPEGLSLossless: (

diff --git a/tests/test_frame.py b/tests/test_frame.py
@@ -171,7 +171,7 @@ def test_jpeg2000_rgb(self):
             pixel_representation=0,
             planar_configuration=0
         )
-        assert compressed_frame.startswith(b'\x00\x00\x00\x0C\x6A\x50\x20')
+        assert compressed_frame.startswith(b"\xFF\x4F\xFF\x51")
         assert compressed_frame.endswith(b'\xFF\xD9')
         decoded_frame = decode_frame(
             value=compressed_frame,
@@ -198,7 +198,7 @@ def test_jpeg2000_monochrome(self):
             photometric_interpretation='MONOCHROME2',
             pixel_representation=0,
         )
-        assert compressed_frame.startswith(b'\x00\x00\x00\x0C\x6A\x50\x20')
+        assert compressed_frame.startswith(b"\xFF\x4F\xFF\x51")
         assert compressed_frame.endswith(b'\xFF\xD9')
         decoded_frame = decode_frame(
             value=compressed_frame,