svn commit: r1763980 - in /commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg: iptc/JpegIptcRewriter.java xmp/JpegRewriter.java

[sebb]

Author: sebb
Date: Sun Oct  9 13:43:56 2016
New Revision: 1763980

URL: http://svn.apache.org/viewvc?rev=1763980&view=rev
Log:
Don't expose mutable data unnecessarily

Modified:
    
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java
    
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java

Modified: 
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java?rev=1763980&r1=1763979&r2=1763980&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java
 (original)
+++ 
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java
 Sun Oct  9 13:43:56 2016
@@ -194,7 +194,7 @@ public class JpegIptcRewriter extends Jp
         if (!removeSegment && photoshopApp13Segments.size() == 1) {
             final JFIFPieceSegment oldSegment = (JFIFPieceSegment) 
photoshopApp13Segments.get(0);
             final Map<String, Object> params = new HashMap<>();
-            final PhotoshopApp13Data oldData = new 
IptcParser().parsePhotoshopSegment(oldSegment.segmentData, params);
+            final PhotoshopApp13Data oldData = new 
IptcParser().parsePhotoshopSegment(oldSegment.getSegmentData(), params);
             final List<IptcBlock> newBlocks = oldData.getNonIptcBlocks();
             final List<IptcRecord> newRecords = new ArrayList<>();
             final PhotoshopApp13Data newData = new 
PhotoshopApp13Data(newRecords,

Modified: 
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java?rev=1763980&r1=1763979&r2=1763980&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
 (original)
+++ 
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
 Sun Oct  9 13:43:56 2016
@@ -89,9 +89,9 @@ public class JpegRewriter extends Binary
 
     protected static class JFIFPieceSegment extends JFIFPiece {
         public final int marker;
-        public final byte[] markerBytes;
-        public final byte[] segmentLengthBytes;
-        public final byte[] segmentData;
+        private final byte[] markerBytes;
+        private final byte[] segmentLengthBytes;
+        private final byte[] segmentData;
 
         public JFIFPieceSegment(final int marker, final byte[] segmentData) {
             this(marker,
@@ -100,12 +100,12 @@ public class JpegRewriter extends Binary
                     segmentData);
         }
 
-        public JFIFPieceSegment(final int marker, final byte[] markerBytes,
+        JFIFPieceSegment(final int marker, final byte[] markerBytes,
                 final byte[] segmentLengthBytes, final byte[] segmentData) {
             this.marker = marker;
             this.markerBytes = markerBytes;
             this.segmentLengthBytes = segmentLengthBytes;
-            this.segmentData = segmentData;
+            this.segmentData = segmentData; // TODO clone?
         }
 
         @Override
@@ -159,13 +159,17 @@ public class JpegRewriter extends Binary
             return true;
         }
 
+        public byte[] getSegmentData() {
+            return segmentData; // TODO clone?
+        }
+
     }
 
-    protected static class JFIFPieceImageData extends JFIFPiece {
-        public final byte[] markerBytes;
-        public final byte[] imageData;
+    static class JFIFPieceImageData extends JFIFPiece {
+        private final byte[] markerBytes;
+        private final byte[] imageData;
 
-        public JFIFPieceImageData(final byte[] markerBytes, final byte[] 
imageData) {
+        JFIFPieceImageData(final byte[] markerBytes, final byte[] imageData) {
             super();
             this.markerBytes = markerBytes;
             this.imageData = imageData;