Author: sebb
Date: Mon Dec 29 13:45:23 2014
New Revision: 1648343
URL: http://svn.apache.org/r1648343
Log:
IMAGING-117 Use getter rather than allowing arbitrary access
Modified:
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/App2Segment.java
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=1648343&r1=1648342&r2=1648343&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 Dec 29 13:45:23 2014
@@ -241,15 +241,15 @@ public class JpegImageParser extends Ima
+ "].numMarkers: " + segment.numMarkers + ".");
}
- total += segment.iccBytes.length;
+ total += segment.getIccBytes().length;
}
final byte[] result = new byte[total];
int progress = 0;
for (App2Segment segment : segments) {
- System.arraycopy(segment.iccBytes, 0, result, progress,
segment.iccBytes.length);
- progress += segment.iccBytes.length;
+ System.arraycopy(segment.getIccBytes(), 0, result, progress,
segment.getIccBytes().length);
+ progress += segment.getIccBytes().length;
}
return result;
@@ -283,7 +283,7 @@ public class JpegImageParser extends Ima
// throw away non-icc profile app2 segments.
for (Segment s : segments) {
final App2Segment segment = (App2Segment) s;
- if (segment.iccBytes != null) {
+ if (segment.getIccBytes() != null) {
filtered.add(segment);
}
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App2Segment.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App2Segment.java?rev=1648343&r1=1648342&r2=1648343&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App2Segment.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App2Segment.java
Mon Dec 29 13:45:23 2014
@@ -26,7 +26,7 @@ import org.apache.commons.imaging.format
import static org.apache.commons.imaging.common.BinaryFunctions.*;
public class App2Segment extends AppnSegment implements
Comparable<App2Segment> {
- public final byte[] iccBytes;
+ private final byte[] iccBytes;
public final int curMarker;
public final int numMarkers;
@@ -79,6 +79,13 @@ public class App2Segment extends AppnSeg
return curMarker - other.curMarker;
}
+ /**
+ * @return the iccBytes
+ */
+ public byte[] getIccBytes() {
+ return iccBytes;
+ }
+
// public String getDescription()
// {
// return "APPN (APP"