Skip to content

Commit b9128ca

Browse files
Conchylicultorcopybara-github
authored andcommitted
Fix typing annotation
PiperOrigin-RevId: 424086207
1 parent adc322b commit b9128ca

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

tensorflow_datasets/core/utils/image_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def decode_image(image_bytes: bytes) -> np.ndarray:
4545
return runner.run(tf.image.decode_image, image_bytes)
4646

4747

48-
def png_to_jpeg(image_bytes: bytes, quality: int = 100) -> np.ndarray:
48+
def png_to_jpeg(image_bytes: bytes, quality: int = 100) -> bytes:
4949
"""Converts PNG image (bytes or str) to JPEG (bytes)."""
5050
runner = _get_runner()
5151
decode_fn = lambda img: tf.image.decode_png(img, channels=3)
@@ -54,7 +54,7 @@ def png_to_jpeg(image_bytes: bytes, quality: int = 100) -> np.ndarray:
5454
return runner.run(fn, image)
5555

5656

57-
def jpeg_cmyk_to_rgb(image_bytes: bytes, quality: int = 100) -> np.ndarray:
57+
def jpeg_cmyk_to_rgb(image_bytes: bytes, quality: int = 100) -> bytes:
5858
"""Converts JPEG CMYK image (bytes) to RGB JPEG (bytes)."""
5959
runner = _get_runner()
6060
image = runner.run(tf.image.decode_jpeg, image_bytes)

tensorflow_datasets/core/utils/image_utils_test.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,14 @@ def test_png_to_jpeg(self):
5252
def test_png_4chan_to_jpeg(self):
5353
image = self._get_image('6pixels_4chan.png')
5454
jpeg = image_utils.png_to_jpeg(image)
55+
self.assertIsInstance(jpeg, bytes)
5556
image_np_jpeg = image_utils.decode_image(jpeg)
5657
np.testing.assert_array_equal(image_np_jpeg, SIX_PIXELS_JPEG)
5758

5859
def test_jpeg_cmyk_to_rgb(self):
5960
image = self._get_image('6pixels_cmyk.jpeg')
6061
new_image = image_utils.jpeg_cmyk_to_rgb(image, quality=100)
62+
self.assertIsInstance(new_image, bytes)
6163
self.assertNotEqual(image, new_image)
6264
# Converting between color systems is not bijective, so high rtol.
6365
original_np_image = image_utils.decode_image(image)

tensorflow_datasets/image_classification/imagenet.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,9 @@ def _fix_image(self, image_fname, image):
259259
if self.version < '3.0.0':
260260
return image
261261
if image_fname in CMYK_IMAGES:
262-
image = io.BytesIO(
263-
tfds.core.utils.jpeg_cmyk_to_rgb(image.read()).tobytes())
262+
image = io.BytesIO(tfds.core.utils.jpeg_cmyk_to_rgb(image.read()))
264263
elif image_fname in PNG_IMAGES:
265-
image = io.BytesIO(tfds.core.utils.png_to_jpeg(image.read()).tobytes())
264+
image = io.BytesIO(tfds.core.utils.png_to_jpeg(image.read()))
266265
return image
267266

268267
def _generate_examples(self,

0 commit comments

Comments
 (0)