Skip to content

Commit

Permalink
Switch to imageio v3
Browse files Browse the repository at this point in the history
  • Loading branch information
bwohlberg committed Jan 5, 2024
1 parent 958839c commit a28f0f8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions scico/data/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright (C) 2021-2023 by SCICO Developers
# Copyright (C) 2021-2024 by SCICO Developers
# All rights reserved. BSD 3-clause License.
# This file is part of the SCICO package. Details of the copyright and
# user license can be found in the 'LICENSE' file distributed with the
Expand All @@ -10,7 +10,7 @@
import os.path
from typing import Optional

from imageio.v2 import imread
from imageio.v3 import imread

import scico.numpy as snp

Expand Down
6 changes: 3 additions & 3 deletions scico/flax/examples/data_preprocessing.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright (C) 2022-2023 by SCICO Developers
# Copyright (C) 2022-2024 by SCICO Developers
# All rights reserved. BSD 3-clause License.
# This file is part of the SCICO package. Details of the copyright and
# user license can be found in the 'LICENSE' file distributed with the
Expand All @@ -18,7 +18,7 @@

import jax.numpy as jnp

import imageio
import imageio.v3 as iio

from scico import util
from scico.examples import rgb2gray
Expand Down Expand Up @@ -389,7 +389,7 @@ def images_read(path: str, ext: str = "jpg") -> Array: # pragma: no cover
slices = []
shape = None
for file in sorted(glob.glob(os.path.join(path, "*." + ext))):
image = imageio.imread(file)
image = iio.imread(file)
if shape is None:
shape = image.shape[:2]
if shape != image.shape[:2]:
Expand Down
2 changes: 1 addition & 1 deletion scico/test/test_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import numpy as np

import imageio.v2 as iio
import imageio.v3 as iio
import pytest

import scico.numpy as snp
Expand Down

0 comments on commit a28f0f8

Please sign in to comment.