Author: damjan
Date: Mon Oct 21 18:59:04 2013
New Revision: 1534322
URL: http://svn.apache.org/r1534322
Log:
Encapsulate public field.
Jira issue key: IMAGING-114
Modified:
commons/proper/imaging/trunk/src/changes/changes.xml
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/ComSegment.java
Modified: commons/proper/imaging/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/changes/changes.xml?rev=1534322&r1=1534321&r2=1534322&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/changes/changes.xml (original)
+++ commons/proper/imaging/trunk/src/changes/changes.xml Mon Oct 21 18:59:04
2013
@@ -46,8 +46,11 @@ The <action> type attribute can be add,u
<body>
<release version="1.0" date="TBA" description="TBA">
+ <action issue="IMAGING-114" dev="damjan" type="fix">
+ ComSegment.comment is a public final byte array.
+ </action>
<action issue="IMAGING-109" dev="damjan" type="fix">
- Several files contain non-UTF8 characters
+ Several files contain non-UTF8 characters.
</action>
<action issue="IMAGING-113" dev="damjan" type="fix">
Cannot read multipage tiff.
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java?rev=1534322&r1=1534321&r2=1534322&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
Mon Oct 21 18:59:04 2013
@@ -773,7 +773,7 @@ public class JpegImageParser extends Ima
final ComSegment comSegment = (ComSegment) commentSegments.get(i);
String comment = "";
try {
- comment = new String(comSegment.comment, "UTF-8");
+ comment = new String(comSegment.getComment(), "UTF-8");
} catch (final UnsupportedEncodingException cannotHappen) {
}
Comments.add(comment);
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/ComSegment.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/ComSegment.java?rev=1534322&r1=1534321&r2=1534322&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/ComSegment.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/ComSegment.java
Mon Oct 21 18:59:04 2013
@@ -22,7 +22,7 @@ import java.io.InputStream;
import java.io.UnsupportedEncodingException;
public class ComSegment extends Segment {
- public final byte[] comment;
+ private final byte[] comment;
public ComSegment(final int marker, final byte segmentData[]) throws
IOException {
this(marker, segmentData.length, new
ByteArrayInputStream(segmentData));
@@ -43,6 +43,10 @@ public class ComSegment extends Segment
System.out.println("");
}
}
+
+ public byte[] getComment() {
+ return comment;
+ }
@Override
public String getDescription() {
