Author: damjan
Date: Sun Oct 19 07:03:08 2014
New Revision: 1632877
URL: http://svn.apache.org/r1632877
Log:
Fixed "ExifReWriter always writes EXIF segment before JFIF segment."
Jira issue key: IMAGING-140
Submitted by: Gavin Shiels <shecks at gmail dot com>
Modified:
commons/proper/imaging/trunk/pom.xml
commons/proper/imaging/trunk/src/changes/changes.xml
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java
Modified: commons/proper/imaging/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/pom.xml?rev=1632877&r1=1632876&r2=1632877&view=diff
==============================================================================
--- commons/proper/imaging/trunk/pom.xml (original)
+++ commons/proper/imaging/trunk/pom.xml Sun Oct 19 07:03:08 2014
@@ -355,6 +355,9 @@
<name>Gary Lucas</name>
</contributor>
<contributor>
+ <name>Gavin Shiels</name>
+ </contributor>
+ <contributor>
<name>Peter Royal</name>
</contributor>
<contributor>
Modified: commons/proper/imaging/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/changes/changes.xml?rev=1632877&r1=1632876&r2=1632877&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/changes/changes.xml (original)
+++ commons/proper/imaging/trunk/src/changes/changes.xml Sun Oct 19 07:03:08
2014
@@ -46,6 +46,9 @@ The <action> type attribute can be add,u
<body>
<release version="1.0" date="TBA" description="TBA">
+ <action issue="IMAGING-140" dev="damjan" type="fix" due-to="Gavin
Shiels">
+ ExifReWriter always writes EXIF segment before JFIF segment.
+ </action>
<action issue="IMAGING-131" dev="damjan" type="fix">
Allow null parameters in PngImageParser.getBufferedImage(), and add
some tests for null parameters.
</action>
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java?rev=1632877&r1=1632876&r2=1632877&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java
Sun Oct 19 07:03:08 2014
@@ -525,7 +525,7 @@ public class ExifRewriter extends Binary
if (firstSegment.marker == JpegConstants.JFIF_MARKER) {
index = 1;
}
- segments.add(0, new
JFIFPieceSegmentExif(JpegConstants.JPEG_APP1_MARKER,
+ segments.add(index, new
JFIFPieceSegmentExif(JpegConstants.JPEG_APP1_MARKER,
markerBytes, markerLengthBytes, newBytes));
}
