Skip to content

tiff: Prefer the ADOBE version of the DEFLATE tag

Lucas Chollet requested to merge lucaaas/krita:deflate_tag into master

The COMPRESSION_DEFLATE was first introduced as a private tag, and then as been standardized by Adobe as the COMPRESSION_ADOBE_DEFLATE. The former is now considered as non-standard and deprecated, libtiff issues a warning when encoding an image with it.

This patch replaces all occurrences of the old tag by the new one and has been generated with the following command:

find . -not -path '*/\.git/*' -type f -exec \
sed -i 's/COMPRESSION_DEFLATE/COMPRESSION_ADOBE_DEFLATE/g' '{}' \;

Test Plan

Tag of an exported image on master:

ImageWidth(UnsignedShort): 400
ImageHeight(UnsignedShort): 300
BitsPerSample(UnsignedShort): [8, 8, 8]
Compression(UnsignedShort): PixarDeflate                     <----- Look here
PhotometricInterpretation(UnsignedShort): RGB
StripOffsets(UnsignedLong): 8
SamplesPerPixel(UnsignedShort): 3
StripByteCounts(UnsignedLong): 7235
XResolution(UnsignedRational): 300 (300/1)
YResolution(UnsignedRational): 300 (300/1)
PlanarConfiguration(UnsignedShort): Chunky
ResolutionUnit(UnsignedShort): Inch
Predictor(UnsignedShort): NoPrediction
SampleFormat(UnsignedShort): [Unsigned, Unsigned, Unsigned]

Tag after the patch:

ImageWidth(UnsignedShort): 400
ImageHeight(UnsignedShort): 300
BitsPerSample(UnsignedShort): [8, 8, 8]
Compression(UnsignedShort): AdobeDeflate                     <----- Look here
PhotometricInterpretation(UnsignedShort): RGB
StripOffsets(UnsignedLong): 7446
SamplesPerPixel(UnsignedShort): 3
StripByteCounts(UnsignedLong): 7235
XResolution(UnsignedRational): 300 (300/1)
YResolution(UnsignedRational): 300 (300/1)
PlanarConfiguration(UnsignedShort): Chunky
ResolutionUnit(UnsignedShort): Inch
Predictor(UnsignedShort): NoPrediction
SampleFormat(UnsignedShort): [Unsigned, Unsigned, Unsigned]

Formalities Checklist

  • I confirmed this builds.
  • I confirmed Krita ran and the relevant functions work.
  • I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!)
  • I made sure my commits build individually and have good descriptions as per KDE guidelines.
  • I made sure my code conforms to the standards set in the HACKING file.
  • I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per KDE Licensing Policy.

Reminder: the reviewer is responsible for merging the patch, this is to ensure at the least two people can build the patch. In case a patch breaks the build, both the author and the reviewer should be contacted to fix the build. If this is not possible, the commits shall be reverted, and a notification with the reasoning and any relevant logs shall be sent to the mailing list, kimageshop@kde.org.

Merge request reports