Author: sebb
Date: Sun Oct 9 12:50:57 2016
New Revision: 1763967
URL: http://svn.apache.org/viewvc?rev=1763967&view=rev
Log:
On further reflection (!) drop the unused data and code entirely
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DhtSegment.java
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java?rev=1763967&r1=1763966&r2=1763967&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java
Sun Oct 9 12:50:57 2016
@@ -27,21 +27,16 @@ import org.apache.commons.imaging.format
import org.apache.commons.imaging.formats.jpeg.iptc.PhotoshopApp13Data;
public class App13Segment extends AppnSegment {
- private final JpegImageParser parser; // TODO unused
-
- // public final List elements = new ArrayList();
- // public final boolean isIPTCJpegSegment;
public App13Segment(final JpegImageParser parser, final int marker, final
byte[] segmentData)
throws IOException {
- this(parser, marker, segmentData.length, new ByteArrayInputStream(
+ this(marker, segmentData.length, new ByteArrayInputStream(
segmentData));
}
- public App13Segment(final JpegImageParser parser, final int marker, final
int markerLength,
+ public App13Segment(final int marker, final int markerLength,
final InputStream is) throws IOException {
super(marker, markerLength, is);
- this.parser = parser;
// isIPTCJpegSegment = new IptcParser().isIPTCJpegSegment(bytes);
// if (isIPTCJpegSegment)
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DhtSegment.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DhtSegment.java?rev=1763967&r1=1763966&r2=1763967&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DhtSegment.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DhtSegment.java
Sun Oct 9 12:50:57 2016
@@ -32,7 +32,6 @@ public class DhtSegment extends Segment
// to avoid subtractions by one later when indexing them
public final int tableClass;
public final int destinationIdentifier;
- private final int[] bits; // 1-based TODO UNUSED?
private final int[] huffVal; // 0-based
// derived properties:
@@ -46,7 +45,7 @@ public class DhtSegment extends Segment
final int[] bits, final int[] huffVal) {
this.tableClass = tableClass;
this.destinationIdentifier = destinationIdentifier;
- this.bits = bits;
+// this.bits = bits; // 1-based; not used outside the ctor
this.huffVal = huffVal;
// "generate_size_table", section C.2, figure C.1, page 51 of ITU-T
@@ -115,22 +114,10 @@ public class DhtSegment extends Segment
}
-// public int[] getBits() { UNUSED
-// return bits;
-// }
-
public int getHuffVal(int i) {
return huffVal[i];
}
-// public int[] getHuffSize() { UNUSED
-// return huffSize;
-// }
-
-// public int[] getHuffCode() { UNUSED
-// return huffCode;
-// }
-
public int getMinCode(int i) {
return minCode[i];
}
