Skip to content
This repository has been archived by the owner on Nov 14, 2023. It is now read-only.

Commit

Permalink
Fixed error for non-jpeg compressed images in original chunks (cvat-a…
Browse files Browse the repository at this point in the history
  • Loading branch information
bsekachev authored and mikhail-treskin committed Oct 25, 2023
1 parent 036c1c9 commit 099e54c
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Zooming canvas when scrooling comments list in an issue (<https://github.com/opencv/cvat/pull/6758>)
- Issues can be created many times when initial submit (<https://github.com/opencv/cvat/pull/6758>)
- Running deep learning models on non-jpeg compressed tif images (<https://github.com/opencv/cvat/pull/6789>)
- Paddings on tasks/projects/models pages (<https://github.com/opencv/cvat/pull/6778>)
- Memory leak in the logging system (<https://github.com/opencv/cvat/pull/6804>)

Expand Down
22 changes: 19 additions & 3 deletions cvat/apps/engine/media_extractors.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ def image_size_within_orientation(img: Image):
return img.height, img.width
return img.width, img.height

def has_exif_rotation(img: Image):
return img.getexif().get(ORIENTATION_EXIF_TAG, ORIENTATION.NORMAL_HORIZONTAL) != ORIENTATION.NORMAL_HORIZONTAL

def rotate_within_exif(img: Image):
orientation = img.getexif().get(ORIENTATION_EXIF_TAG, ORIENTATION.NORMAL_HORIZONTAL)
if orientation in [ORIENTATION.NORMAL_180_ROTATED, ORIENTATION.MIRROR_VERTICAL]:
Expand Down Expand Up @@ -661,12 +664,25 @@ def save_as_chunk(self, images, chunk_path):
ext = os.path.splitext(path)[1].replace('.', '')
output = io.BytesIO()
if self._dimension == DimensionType.DIM_2D:
pil_image = rotate_within_exif(Image.open(image))
pil_image.save(output, format=pil_image.format if pil_image.format else self.IMAGE_EXT, quality=100, subsampling=0)
pil_image = Image.open(image)
if has_exif_rotation(pil_image):
rot_image = rotate_within_exif(pil_image)
if rot_image.format == 'TIFF':
# https://pillow.readthedocs.io/en/stable/handbook/image-file-formats.html
# use loseless lzw compression for tiff images
rot_image.save(output, format='TIFF', compression='tiff_lzw')
else:
rot_image.save(output, format=rot_image.format if rot_image.format else self.IMAGE_EXT, quality=100, subsampling=0)
else:
output = image
else:
output, ext = self._write_pcd_file(image)[0:2]
arcname = '{:06d}.{}'.format(idx, ext)
zip_chunk.writestr(arcname, output.getvalue())

if isinstance(output, io.BytesIO):
zip_chunk.writestr(arcname, output.getvalue())
else:
zip_chunk.write(filename=output, arcname=arcname)
# return empty list because ZipChunkWriter write files as is
# and does not decode it to know img size.
return []
Expand Down

0 comments on commit 099e54c

Please sign in to comment.