numpyimage 2.4.1__tar.gz → 2.4.2__tar.gz

{numpyimage-2.4.1 → numpyimage-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: numpyimage
-Version: 2.4.1
+Version: 2.4.2
 Summary: Load, save, & manipulate image files as numpy arrays
 Author-email: Jasper Phelps <jasper.s.phelps@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{numpyimage-2.4.1 → numpyimage-2.4.2}/npimage/core.py

@@ -23,18 +23,6 @@ supported_extensions = [
     'nrrd', 'zarr', 'raw', 'vol', 'ng', 'heic'
 ]
 
-# Flag to track if HEIF opener has been registered
-_heif_opener_registered = False
-
-
-def _ensure_heif_opener_registered():
-    """Register the HEIF opener if not already registered."""
-    global _heif_opener_registered
-    if not _heif_opener_registered:
-        from pillow_heif import register_heif_opener
-        register_heif_opener()
-        _heif_opener_registered = True
-
 
 def load(filename, dim_order='zyx', **kwargs):
     """
@@ -374,6 +362,91 @@ write = save  # Function name alias
 to_file = save  # Function name alias
 
 
+def load_video(filename, force_rgb=False, progress_bar=True):
+    """
+    Load all images in a video file as a numpy array.
+
+    Parameters
+    ----------
+    filename : str
+        Path to the video file
+    force_rgb : bool, default False
+        If True, always return frames as RGB arrays (shape=(H, W, 3))
+        If False, return frames in their native format (e.g., grayscale if possible)
+    progress_bar : bool, default True
+        If True, display a progress bar
+
+    Returns
+    -------
+    data : numpy.ndarray
+        The video frames as a numpy array, shape (num_frames, height, width[, channels])
+    """
+    try:
+        import av
+    except ImportError:
+        raise ImportError('To use load_video, install PyAV: pip install av')
+    from tqdm import tqdm
+    container = av.open(filename)
+    stream = container.streams.video[0]
+    num_frames = stream.frames
+    if not num_frames or num_frames == 0:
+        # If we don't know the number of frames, we can't preallocate, so
+        # it's hard to do better than the following approach (which temporarily
+        # uses double the amount of RAM than the preallocated approach uses).
+        return np.array(list(lazy_load_video(filename, force_rgb=force_rgb)))
+    else:
+        # Load first image to get shape and dtype
+        frame_iter = container.decode(stream)
+        first_frame = next(frame_iter)
+        if force_rgb:
+            first_img = first_frame.to_ndarray(format='rgb24')
+        else:
+            first_img = first_frame.to_ndarray()
+        # Preallocate memory for the entire array
+        data = np.empty((num_frames, *first_img.shape), dtype=first_img.dtype)
+        # Then fill it up frame by frame
+        data[0] = first_img
+        for i, frame in tqdm(enumerate(frame_iter, start=1), total=num_frames,
+                             desc='Loading video', disable=not progress_bar):
+            if force_rgb:
+                img = frame.to_ndarray(format='rgb24')
+            else:
+                img = frame.to_ndarray()
+            data[i] = img
+        return data
+
+
+def lazy_load_video(filename, force_rgb=False):
+    """
+    Lazily load video frames as numpy arrays using PyAV.
+
+    Parameters
+    ----------
+    filename : str
+        Path to the video file.
+    force_rgb : bool, default False
+        If True, always return frames as RGB arrays (shape=(H, W, 3)).
+        If False, return frames in their native format (e.g., grayscale if possible).
+
+    Yields
+    ------
+    frame : np.ndarray
+        Video frame as a numpy array, shape (height, width[, colors]).
+    """
+    try:
+        import av
+    except ImportError:
+        raise ImportError('To use lazy_load_video, install PyAV: pip install av')
+    container = av.open(filename)
+    stream = container.streams.video[0]
+    for frame in container.decode(stream):
+        if force_rgb:
+            img = frame.to_ndarray(format='rgb24')
+        else:
+            img = frame.to_ndarray()
+        yield img
+
+
 def save_video(data, filename, time_axis=0, color_axis=None, overwrite=False,
                dim_order='yx', framerate=30, crf=23, compression_speed='medium'):
     """
@@ -582,86 +655,15 @@ def find_channel_axis(data, expected_channel_axis=[0, -1]):
     return None
 
 
-def load_video(filename, force_rgb=False, progress_bar=True):
-    """
-    Load all images in a video file as a numpy array.
-
-    Parameters
-    ----------
-    filename : str
-        Path to the video file
-    force_rgb : bool, default False
-        If True, always return frames as RGB arrays (shape=(H, W, 3))
-        If False, return frames in their native format (e.g., grayscale if possible)
-    progress_bar : bool, default True
-        If True, display a progress bar
-
-    Returns
-    -------
-    data : numpy.ndarray
-        The video frames as a numpy array, shape (num_frames, height, width[, channels])
-    """
-    try:
-        import av
-    except ImportError:
-        raise ImportError('To use load_video, install PyAV: pip install av')
-    from tqdm import tqdm
-    container = av.open(filename)
-    stream = container.streams.video[0]
-    num_frames = stream.frames
-    if not num_frames or num_frames == 0:
-        # If we don't know the number of frames, we can't preallocate, so
-        # it's hard to do better than the following approach (which temporarily
-        # uses double the amount of RAM than the preallocated approach uses).
-        return np.array(list(lazy_load_video(filename, force_rgb=force_rgb)))
-    else:
-        # Load first image to get shape and dtype
-        frame_iter = container.decode(stream)
-        first_frame = next(frame_iter)
-        if force_rgb:
-            first_img = first_frame.to_ndarray(format='rgb24')
-        else:
-            first_img = first_frame.to_ndarray()
-        # Preallocate memory for the entire array
-        data = np.empty((num_frames, *first_img.shape), dtype=first_img.dtype)
-        # Then fill it up frame by frame
-        data[0] = first_img
-        for i, frame in tqdm(enumerate(frame_iter, start=1), total=num_frames,
-                             desc='Loading video', disable=not progress_bar):
-            if force_rgb:
-                img = frame.to_ndarray(format='rgb24')
-            else:
-                img = frame.to_ndarray()
-            data[i] = img
-        return data
+# Flag to track if HEIF opener has been registered
+_heif_opener_registered = False
 
 
-def lazy_load_video(filename, force_rgb=False):
-    """
-    Lazily load video frames as numpy arrays using PyAV.
-
-    Parameters
-    ----------
-    filename : str
-        Path to the video file.
-    force_rgb : bool, default False
-        If True, always return frames as RGB arrays (shape=(H, W, 3)).
-        If False, return frames in their native format (e.g., grayscale if possible).
+def _ensure_heif_opener_registered():
+    """Register the HEIF opener if not already registered."""
+    global _heif_opener_registered
+    if not _heif_opener_registered:
+        from pillow_heif import register_heif_opener
+        register_heif_opener()
+        _heif_opener_registered = True
 
-    Yields
-    ------
-    frame : np.ndarray
-        Video frame as a numpy array, shape (height, width[, colors]).
-    """
-    try:
-        import av
-    except ImportError:
-        raise ImportError('To use lazy_load_video, install PyAV: pip install av')
-    container = av.open(filename)
-    stream = container.streams.video[0]
-    for frame in container.decode(stream):
-        if force_rgb:
-            img = frame.to_ndarray(format='rgb24')
-        else:
-            img = frame.to_ndarray()
-        yield img

{numpyimage-2.4.1 → numpyimage-2.4.2}/numpyimage.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: numpyimage
-Version: 2.4.1
+Version: 2.4.2
 Summary: Load, save, & manipulate image files as numpy arrays
 Author-email: Jasper Phelps <jasper.s.phelps@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{numpyimage-2.4.1 → numpyimage-2.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'numpyimage'
-version = '2.4.1'
+version = '2.4.2'
 description = 'Load, save, & manipulate image files as numpy arrays'
 readme.file = 'README.md'
 readme.content-type = 'text/markdown'

{numpyimage-2.4.1 → numpyimage-2.4.2}/tests/test_heic.py

@@ -10,29 +10,29 @@ def test_heic_load_save():
     """Test loading and saving HEIC images."""
     # Create a simple test image
     test_data = np.random.randint(0, 256, (100, 100, 3), dtype=np.uint8)
-    
+
     with tempfile.TemporaryDirectory() as tmpdir:
         # Test saving as HEIC
         heic_filename = os.path.join(tmpdir, "test_image.heic")
-        
+
         try:
             # Save the test data as HEIC
             npimage.save(test_data, heic_filename)
-            
+
             # Verify the file was created
             assert os.path.exists(heic_filename), "HEIC file was not created"
-            
+
             # Load the HEIC file back
             loaded_data = npimage.load(heic_filename)
-            
+
             # Check that the loaded data has the same shape
             assert loaded_data.shape == test_data.shape, f"Shape mismatch: expected {test_data.shape}, got {loaded_data.shape}"
-            
+
             # Check that the data type is correct
             assert loaded_data.dtype == np.uint8, f"Data type mismatch: expected uint8, got {loaded_data.dtype}"
-            
+
             print("Test passed: HEIC load/save functionality works correctly.")
-            
+
         except Exception as e:
             print(f"Test failed with error: {e}")
             raise
@@ -42,12 +42,12 @@ def test_heic_extension_support():
     """Test that HEIC extension is properly recognized."""
     # Test that HEIC is in the supported extensions
     assert 'heic' in npimage.core.supported_extensions, "HEIC extension not in supported extensions"
-    
+
     # Test that the extension is properly parsed
     filename = "test_image.heic"
     extension = filename.split('.')[-1].lower()
     assert extension == 'heic', f"Extension parsing failed: expected 'heic', got '{extension}'"
-    
+
     print("Test passed: HEIC extension is properly supported.")
 
 
@@ -58,4 +58,4 @@ if __name__ == '__main__':
         print("All HEIC tests passed!")
     except Exception as e:
         print(f"HEIC tests failed: {e}")
-        raise
+        raise