mirror of
https://github.com/nerfstudio-project/nerfstudio.git
synced 2026-11-16 21:03:46 +08:00
Simplify Pillow encoder compatibility
This commit is contained in:
1 parent
02105c8c63
commit
0caa292600
2 files changed
+4
-32
No files matched your search
@@ -12,28 +12,11 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from unittest.mock import Mock
|
||||
|
||||
import numpy as np
|
||||
import pytest
|
||||
from packaging.version import Version
|
||||
from PIL import Image
|
||||
|
||||
from nerfstudio.data.utils import data_utils
|
||||
|
||||
|
||||
@pytest.mark.parametrize("pillow_version, uses_extents", [("12.2.0", True), ("12.1.0", False)])
|
||||
def test_set_encoder_image(monkeypatch, pillow_version, uses_extents):
|
||||
image = Image.new("L", (2, 2))
|
||||
encoder = Mock()
|
||||
monkeypatch.setattr(data_utils, "_PILLOW_VERSION", Version(pillow_version))
|
||||
|
||||
data_utils._set_encoder_image(encoder, image)
|
||||
|
||||
if uses_extents:
|
||||
encoder.setimage.assert_called_once_with(image.im, (0, 0) + image.size)
|
||||
else:
|
||||
encoder.setimage.assert_called_once_with(image.im)
|
||||
from nerfstudio.data.utils.data_utils import pil_to_numpy
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
@@ -49,7 +32,7 @@ def test_set_encoder_image(monkeypatch, pillow_version, uses_extents):
|
||||
def test_pil_to_numpy(values):
|
||||
image = Image.fromarray(values)
|
||||
|
||||
result = data_utils.pil_to_numpy(image)
|
||||
result = pil_to_numpy(image)
|
||||
|
||||
np.testing.assert_array_equal(result, values)
|
||||
assert result.flags.writeable
|
||||
Reference in new issue
Block a user