Fixes #3: Saving non int data to JPEG2000

Author: PierreRaybaut

CHANGELOG.md

@@ -3,6 +3,12 @@
 See DataLab [roadmap page](https://cdlapp.readthedocs.io/en/latest/dev/roadmap.html)
 for future and past milestones.
 
+## DataLab Version 0.9.1 ##
+
+🛠️ Bug fixes:
+
+* [Issue #3](https://github.com/Codra-Ingenierie-Informatique/DataLab/issues/3) - Save image to JPEG2000: 'OSError: encoder error -2 when writing image file'
+
 ## DataLab Version 0.9.0 ##
 
 New dependencies:

cdl/__init__.py

@@ -16,7 +16,7 @@
 
 import os
 
-__version__ = "0.9.0"
+__version__ = "0.9.1"
 __docurl__ = "https://cdlapp.readthedocs.io/en/latest/"
 __homeurl__ = "https://codra-ingenierie-informatique.github.io/DataLab/"
 __supporturl__ = (

cdl/core/io/image/formats.py

@@ -25,8 +25,8 @@ class ClassicsImageFormat(ImageFormatBase):
     """Object representing classic image file types"""
 
     FORMAT_INFO = FormatInfo(
-        name="BMP, JPEG, PNG, TIFF",
-        extensions="*.bmp *.jpg *.jpeg *.png *.tif *.tiff",
+        name="BMP, JPEG, PNG, TIFF JPEG2000",
+        extensions="*.bmp *.jpg *.jpeg *.png *.tif *.tiff *.jp2",
         readable=True,
         writeable=True,
     )
@@ -39,22 +39,16 @@ def read_data(filename: str) -> np.ndarray:
     def write(self, filename: str, obj: ImageObj) -> None:
         """Write data to file"""
         data = obj.data
-        if osp.splitext(filename)[1].lower() in (".bmp", ".jpg", ".jpeg", ".png"):
-            data = obj.data.astype(np.uint8)
+        ext = osp.splitext(filename)[1].lower()
+        if ext in (".bmp", ".jpg", ".jpeg", ".png"):
+            if data.dtype is not np.uint8:
+                data = obj.data.astype(np.uint8)
+        if ext in (".jp2",):
+            if data.dtype not in (np.uint8, np.uint16):
+                data = obj.data.astype(np.uint16)
         skimage.io.imsave(filename, data, check_contrast=False)
 
 
-class JPEG2000ImageFormat(ClassicsImageFormat):
-    """Object representing JPEG2000 image file type"""
-
-    FORMAT_INFO = FormatInfo(
-        name="JPEG2000",
-        extensions="*.jp2",
-        readable=True,
-        writeable=True,
-    )
-
-
 class NumPyImageFormat(ImageFormatBase):
     """Object representing NumPy image file type"""