Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IMAGING-319: Correct length calculation in EXIF rewriter #203

Closed
wants to merge 1 commit into from
Closed

IMAGING-319: Correct length calculation in EXIF rewriter #203

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
View file
Open in desktop
Expand Up @@ -237,16 +237,18 @@ private long updateOffsetsStep(final List<TiffElement> analysis,
overflowIndex += outputItemLength;
} else {
long offset = bestFit.offset;
int length = bestFit.length;
if ((offset & 1L) != 0) {
offset += 1;
length -= 1;
}
outputItem.setOffset(offset);
unusedElements.remove(bestFit);

if (bestFit.length > outputItemLength) {
if (length > outputItemLength) {
// not a perfect fit.
final long excessOffset = bestFit.offset + outputItemLength;
final int excessLength = bestFit.length - outputItemLength;
final long excessOffset = offset + outputItemLength;
final int excessLength = length - outputItemLength;
unusedElements.add(new TiffElement.Stub(excessOffset,
excessLength));
// make sure the new element is in the correct order.
Expand Down