diff --git a/PIL/McIdasImagePlugin.py b/PIL/McIdasImagePlugin.py index 08eeec39f..06da33f77 100644 --- a/PIL/McIdasImagePlugin.py +++ b/PIL/McIdasImagePlugin.py @@ -66,6 +66,7 @@ class McIdasImageFile(ImageFile.ImageFile): self.tile = [("raw", (0, 0) + self.size, offset, (rawmode, stride, 1))] + # -------------------------------------------------------------------- # registry diff --git a/Tests/images/cmx3g8_wv_1998.260_0745_mcidas.ara b/Tests/images/cmx3g8_wv_1998.260_0745_mcidas.ara new file mode 100644 index 000000000..4cdc741d7 Binary files /dev/null and b/Tests/images/cmx3g8_wv_1998.260_0745_mcidas.ara differ diff --git a/Tests/images/cmx3g8_wv_1998.260_0745_mcidas.png b/Tests/images/cmx3g8_wv_1998.260_0745_mcidas.png new file mode 100644 index 000000000..2b84283b7 Binary files /dev/null and b/Tests/images/cmx3g8_wv_1998.260_0745_mcidas.png differ diff --git a/Tests/test_file_mcidas.py b/Tests/test_file_mcidas.py index cd601cca3..6785ac4d9 100644 --- a/Tests/test_file_mcidas.py +++ b/Tests/test_file_mcidas.py @@ -1,6 +1,6 @@ from helper import unittest, PillowTestCase -from PIL import McIdasImagePlugin +from PIL import Image, McIdasImagePlugin class TestFileMcIdas(PillowTestCase): @@ -12,6 +12,24 @@ class TestFileMcIdas(PillowTestCase): lambda: McIdasImagePlugin.McIdasImageFile(invalid_file)) + def test_valid_file(self): + # Arrange + # https://ghrc.nsstc.nasa.gov/hydro/details/cmx3g8 + # https://ghrc.nsstc.nasa.gov/pub/fieldCampaigns/camex3/cmx3g8/browse/ + test_file = "Tests/images/cmx3g8_wv_1998.260_0745_mcidas.ara" + saved_file = "Tests/images/cmx3g8_wv_1998.260_0745_mcidas.png" + + # Act + im = Image.open(test_file) + im.load() + + # Assert + self.assertEqual(im.format, "MCIDAS") + self.assertEqual(im.mode, "I") + self.assertEqual(im.size, (1800, 400)) + im2 = Image.open(saved_file) + self.assert_image_equal(im, im2) + if __name__ == '__main__': unittest.main()