You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2016/10/10 16:45:37 UTC
svn commit: r1764151 - in /commons/proper/imaging/trunk/src: changes/
main/java/org/apache/commons/imaging/formats/bmp/
main/java/org/apache/commons/imaging/formats/gif/
main/java/org/apache/commons/imaging/formats/psd/
main/java/org/apache/commons/ima...
Author: sebb
Date: Mon Oct 10 16:45:37 2016
New Revision: 1764151
URL: http://svn.apache.org/viewvc?rev=1764151&view=rev
Log:
IMAGING-193 - Duplicate class names
Added:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageContents.java
- copied, changed from r1764150, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/ImageContents.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageContents.java
- copied, changed from r1764150, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageContents.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageContents.java
- copied, changed from r1764150, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageContents.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java
- copied, changed from r1764150, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java
Removed:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/ImageContents.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageContents.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageContents.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java
Modified:
commons/proper/imaging/trunk/src/changes/changes.xml
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmyk.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLab.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserStub.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/DataReader.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.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=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/changes/changes.xml (original)
+++ commons/proper/imaging/trunk/src/changes/changes.xml Mon Oct 10 16:45:37 2016
@@ -46,6 +46,9 @@ The <action> type attribute can be add,u
<body>
<release version="1.0" date="TBA" description="First major release">
+ <action issue="IMAGING-193" dev="sebb" type="fix">
+ Duplicate class names
+ </action>
<action issue="IMAGING-189" dev="sebb" type="fix">
parseXpmValuesSection uses && instead of ||
</action>
Copied: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageContents.java (from r1764150, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/ImageContents.java)
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageContents.java?p2=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageContents.java&p1=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/ImageContents.java&r1=1764150&r2=1764151&rev=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/ImageContents.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageContents.java Mon Oct 10 16:45:37 2016
@@ -16,14 +16,14 @@
*/
package org.apache.commons.imaging.formats.bmp;
-class ImageContents {
+class BmpImageContents {
final BmpHeaderInfo bhi;
final byte[] colorTable;
final byte[] imageData;
final PixelParser pixelParser;
- public ImageContents(BmpHeaderInfo bhi, byte[] colorTable, byte[] imageData, PixelParser pixelParser) {
+ public BmpImageContents(BmpHeaderInfo bhi, byte[] colorTable, byte[] imageData, PixelParser pixelParser) {
this.bhi = bhi;
this.colorTable = colorTable;
this.imageData = imageData;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java?rev=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java Mon Oct 10 16:45:37 2016
@@ -299,7 +299,7 @@ public class BmpImageParser extends Imag
return baos.toByteArray();
}
- private ImageContents readImageContents(final InputStream is,
+ private BmpImageContents readImageContents(final InputStream is,
final FormatCompliance formatCompliance, final boolean verbose)
throws ImageReadException, IOException {
final BmpHeaderInfo bhi = readBmpHeaderInfo(is, formatCompliance, verbose);
@@ -471,7 +471,7 @@ public class BmpImageParser extends Imag
+ bhi.compression);
}
- return new ImageContents(bhi, colorTable, imageData, pixelParser);
+ return new BmpImageContents(bhi, colorTable, imageData, pixelParser);
}
private BmpHeaderInfo readBmpHeaderInfo(final ByteSource byteSource,
@@ -563,7 +563,7 @@ public class BmpImageParser extends Imag
throw new ImageReadException("Unknown parameter: " + firstKey);
}
- ImageContents ic = null;
+ BmpImageContents ic = null;
try (InputStream is = byteSource.getInputStream()) {
ic = readImageContents(is, FormatCompliance.getDefault(), verbose);
}
@@ -676,7 +676,7 @@ public class BmpImageParser extends Imag
throw new ImageReadException("Unknown parameter: " + firstKey);
}
- final ImageContents ic = readImageContents(inputStream,
+ final BmpImageContents ic = readImageContents(inputStream,
FormatCompliance.getDefault(), verbose);
if (ic == null) {
throw new ImageReadException("Couldn't read BMP Data");
Copied: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageContents.java (from r1764150, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageContents.java)
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageContents.java?p2=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageContents.java&p1=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageContents.java&r1=1764150&r2=1764151&rev=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageContents.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageContents.java Mon Oct 10 16:45:37 2016
@@ -18,13 +18,13 @@ package org.apache.commons.imaging.forma
import java.util.List;
-class ImageContents {
+class GifImageContents {
final GifHeaderInfo gifHeaderInfo;
final List<GifBlock> blocks;
final byte[] globalColorTable;
- ImageContents(final GifHeaderInfo gifHeaderInfo, final byte[] globalColorTable,
+ GifImageContents(final GifHeaderInfo gifHeaderInfo, final byte[] globalColorTable,
final List<GifBlock> blocks) {
this.gifHeaderInfo = gifHeaderInfo;
this.globalColorTable = globalColorTable;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java?rev=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java Mon Oct 10 16:45:37 2016
@@ -435,13 +435,13 @@ public class GifImageParser extends Imag
return null;
}
- private ImageContents readFile(final ByteSource byteSource,
+ private GifImageContents readFile(final ByteSource byteSource,
final boolean stopBeforeImageData) throws ImageReadException, IOException {
return readFile(byteSource, stopBeforeImageData,
FormatCompliance.getDefault());
}
- private ImageContents readFile(final ByteSource byteSource,
+ private GifImageContents readFile(final ByteSource byteSource,
final boolean stopBeforeImageData, final FormatCompliance formatCompliance)
throws ImageReadException, IOException {
try (InputStream is = byteSource.getInputStream()) {
@@ -456,7 +456,7 @@ public class GifImageParser extends Imag
final List<GifBlock> blocks = readBlocks(ghi, is, stopBeforeImageData,
formatCompliance);
- final ImageContents result = new ImageContents(ghi, globalColorTable,
+ final GifImageContents result = new GifImageContents(ghi, globalColorTable,
blocks);
return result;
}
@@ -471,7 +471,7 @@ public class GifImageParser extends Imag
@Override
public Dimension getImageSize(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
- final ImageContents blocks = readFile(byteSource, false);
+ final GifImageContents blocks = readFile(byteSource, false);
if (blocks == null) {
throw new ImageReadException("GIF: Couldn't read blocks");
@@ -518,7 +518,7 @@ public class GifImageParser extends Imag
@Override
public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
- final ImageContents blocks = readFile(byteSource, false);
+ final GifImageContents blocks = readFile(byteSource, false);
if (blocks == null) {
throw new ImageReadException("GIF: Couldn't read blocks");
@@ -590,7 +590,7 @@ public class GifImageParser extends Imag
imageData.toString(pw, "");
- final ImageContents blocks = readFile(byteSource, false);
+ final GifImageContents blocks = readFile(byteSource, false);
pw.println("gif.blocks: " + blocks.blocks.size());
for (int i = 0; i < blocks.blocks.size(); i++) {
@@ -642,7 +642,7 @@ public class GifImageParser extends Imag
@Override
public BufferedImage getBufferedImage(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
- final ImageContents imageContents = readFile(byteSource, false);
+ final GifImageContents imageContents = readFile(byteSource, false);
if (imageContents == null) {
throw new ImageReadException("GIF: Couldn't read blocks");
Copied: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageContents.java (from r1764150, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageContents.java)
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageContents.java?p2=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageContents.java&p1=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageContents.java&r1=1764150&r2=1764151&rev=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageContents.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageContents.java Mon Oct 10 16:45:37 2016
@@ -20,7 +20,7 @@ import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.nio.charset.Charset;
-public class ImageContents {
+public class PsdImageContents {
public final PsdHeaderInfo header;
public final int ColorModeDataLength;
@@ -28,7 +28,7 @@ public class ImageContents {
public final int LayerAndMaskDataLength;
public final int Compression;
- public ImageContents(final PsdHeaderInfo header,
+ public PsdImageContents(final PsdHeaderInfo header,
final int ColorModeDataLength, final int ImageResourcesLength,
final int LayerAndMaskDataLength, final int Compression) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java?rev=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java Mon Oct 10 16:45:37 2016
@@ -115,7 +115,7 @@ public class PsdImageParser extends Imag
return new PsdHeaderInfo(version, reserved, channels, rows, columns, depth, mode);
}
- private ImageContents readImageContents(final InputStream is)
+ private PsdImageContents readImageContents(final InputStream is)
throws ImageReadException, IOException {
final PsdHeaderInfo header = readHeader(is);
@@ -148,7 +148,7 @@ public class PsdImageParser extends Imag
// System.out.println("Compression: " + Compression);
- return new ImageContents(header, ColorModeDataLength,
+ return new PsdImageContents(header, ColorModeDataLength,
// ColorModeData,
ImageResourcesLength,
// ImageResources,
@@ -240,7 +240,7 @@ public class PsdImageParser extends Imag
try (InputStream imageStream = byteSource.getInputStream();
InputStream resourceStream = this.getInputStream(byteSource, PSD_SECTION_IMAGE_RESOURCES)) {
- final ImageContents imageContents = readImageContents(imageStream);
+ final PsdImageContents imageContents = readImageContents(imageStream);
final byte[] ImageResources = readBytes("ImageResources",
resourceStream, imageContents.ImageResourcesLength,
@@ -374,10 +374,10 @@ public class PsdImageParser extends Imag
+ section);
}
- private ImageContents readImageContents(final ByteSource byteSource)
+ private PsdImageContents readImageContents(final ByteSource byteSource)
throws ImageReadException, IOException {
try (InputStream is = byteSource.getInputStream()) {
- final ImageContents imageContents = readImageContents(is);
+ final PsdImageContents imageContents = readImageContents(is);
return imageContents;
}
}
@@ -445,7 +445,7 @@ public class PsdImageParser extends Imag
@Override
public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
- final ImageContents imageContents = readImageContents(byteSource);
+ final PsdImageContents imageContents = readImageContents(byteSource);
// ImageContents imageContents = readImage(byteSource, false);
if (imageContents == null) {
@@ -533,7 +533,7 @@ public class PsdImageParser extends Imag
}
fImageData.toString(pw, "");
- final ImageContents imageContents = readImageContents(byteSource);
+ final PsdImageContents imageContents = readImageContents(byteSource);
imageContents.dump(pw);
imageContents.header.dump(pw);
@@ -569,7 +569,7 @@ public class PsdImageParser extends Imag
@Override
public BufferedImage getBufferedImage(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
- final ImageContents imageContents = readImageContents(byteSource);
+ final PsdImageContents imageContents = readImageContents(byteSource);
// ImageContents imageContents = readImage(byteSource, false);
if (imageContents == null) {
@@ -688,7 +688,7 @@ public class PsdImageParser extends Imag
public String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
- final ImageContents imageContents = readImageContents(byteSource);
+ final PsdImageContents imageContents = readImageContents(byteSource);
if (imageContents == null) {
throw new ImageReadException("PSD: Couldn't read blocks");
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParser.java?rev=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParser.java Mon Oct 10 16:45:37 2016
@@ -19,12 +19,12 @@ package org.apache.commons.imaging.forma
import java.awt.image.BufferedImage;
import java.awt.image.DataBuffer;
-import org.apache.commons.imaging.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.PsdImageContents;
import org.apache.commons.imaging.formats.psd.PsdHeaderInfo;
public abstract class DataParser {
public final void parseData(final int[][][] data, final BufferedImage bi,
- final ImageContents imageContents) {
+ final PsdImageContents imageContents) {
final DataBuffer buffer = bi.getRaster().getDataBuffer();
final PsdHeaderInfo header = imageContents.header;
@@ -39,7 +39,7 @@ public abstract class DataParser {
}
}
- protected abstract int getRGB(int[][][] data, int x, int y, ImageContents imageContents);
+ protected abstract int getRGB(int[][][] data, int x, int y, PsdImageContents imageContents);
public abstract int getBasicChannelsCount();
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java?rev=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java Mon Oct 10 16:45:37 2016
@@ -16,13 +16,13 @@
*/
package org.apache.commons.imaging.formats.psd.dataparsers;
-import org.apache.commons.imaging.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.PsdImageContents;
public class DataParserBitmap extends DataParser {
@Override
protected int getRGB(final int[][][] data, final int x, final int y,
- final ImageContents imageContents) {
+ final PsdImageContents imageContents) {
int sample = 0xff & data[0][y][x];
if (sample == 0) {
sample = 255;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmyk.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmyk.java?rev=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmyk.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmyk.java Mon Oct 10 16:45:37 2016
@@ -17,12 +17,12 @@
package org.apache.commons.imaging.formats.psd.dataparsers;
import org.apache.commons.imaging.color.ColorConversions;
-import org.apache.commons.imaging.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.PsdImageContents;
public class DataParserCmyk extends DataParser {
@Override
protected int getRGB(final int[][][] data, final int x, final int y,
- final ImageContents imageContents) {
+ final PsdImageContents imageContents) {
int sc = 0xff & data[0][y][x];
int sm = 0xff & data[1][y][x];
int sy = 0xff & data[2][y][x];
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java?rev=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java Mon Oct 10 16:45:37 2016
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.psd.dataparsers;
-import org.apache.commons.imaging.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.PsdImageContents;
public class DataParserGrayscale extends DataParser {
@Override
protected int getRGB(final int[][][] data, final int x, final int y,
- final ImageContents imageContents) {
+ final PsdImageContents imageContents) {
final int sample = 0xff & data[0][y][x];
final int alpha = 0xff;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java?rev=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java Mon Oct 10 16:45:37 2016
@@ -16,7 +16,7 @@
*/
package org.apache.commons.imaging.formats.psd.dataparsers;
-import org.apache.commons.imaging.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.PsdImageContents;
public class DataParserIndexed extends DataParser {
private final int[] colorTable;
@@ -37,7 +37,7 @@ public class DataParserIndexed extends D
}
@Override
- protected int getRGB(final int[][][] data, final int x, final int y, final ImageContents imageContents) {
+ protected int getRGB(final int[][][] data, final int x, final int y, final PsdImageContents imageContents) {
final int sample = 0xff & data[0][y][x];
return colorTable[sample];
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLab.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLab.java?rev=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLab.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLab.java Mon Oct 10 16:45:37 2016
@@ -17,12 +17,12 @@
package org.apache.commons.imaging.formats.psd.dataparsers;
import org.apache.commons.imaging.color.ColorConversions;
-import org.apache.commons.imaging.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.PsdImageContents;
public class DataParserLab extends DataParser {
@Override
- protected int getRGB(final int[][][] data, final int x, final int y, final ImageContents imageContents) {
+ protected int getRGB(final int[][][] data, final int x, final int y, final PsdImageContents imageContents) {
final int cieL = 0xff & data[0][y][x];
int cieA = 0xff & data[1][y][x];
int cieB = 0xff & data[2][y][x];
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java?rev=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java Mon Oct 10 16:45:37 2016
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.psd.dataparsers;
-import org.apache.commons.imaging.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.PsdImageContents;
public class DataParserRgb extends DataParser {
@Override
protected int getRGB(final int[][][] data, final int x, final int y,
- final ImageContents imageContents) {
+ final PsdImageContents imageContents) {
final int red = 0xff & data[0][y][x];
final int green = 0xff & data[1][y][x];
final int blue = 0xff & data[2][y][x];
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserStub.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserStub.java?rev=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserStub.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserStub.java Mon Oct 10 16:45:37 2016
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.psd.dataparsers;
-import org.apache.commons.imaging.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.PsdImageContents;
public class DataParserStub extends DataParser {
@Override
protected int getRGB(final int[][][] data, final int x, final int y,
- final ImageContents imageContents) {
+ final PsdImageContents imageContents) {
return 0;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java?rev=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java Mon Oct 10 16:45:37 2016
@@ -28,7 +28,7 @@ import org.apache.commons.imaging.common
import org.apache.commons.imaging.common.PackBits;
import org.apache.commons.imaging.common.mylzw.BitsToByteInputStream;
import org.apache.commons.imaging.common.mylzw.MyBitInputStream;
-import org.apache.commons.imaging.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.PsdImageContents;
import org.apache.commons.imaging.formats.psd.PsdHeaderInfo;
import org.apache.commons.imaging.formats.psd.dataparsers.DataParser;
@@ -42,7 +42,7 @@ public class CompressedDataReader implem
@Override
public void readData(final InputStream is, final BufferedImage bi,
- final ImageContents imageContents, final BinaryFileParser bfp)
+ final PsdImageContents imageContents, final BinaryFileParser bfp)
throws ImageReadException, IOException {
final PsdHeaderInfo header = imageContents.header;
final int width = header.columns;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/DataReader.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/DataReader.java?rev=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/DataReader.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/DataReader.java Mon Oct 10 16:45:37 2016
@@ -22,12 +22,12 @@ import java.io.InputStream;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.BinaryFileParser;
-import org.apache.commons.imaging.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.PsdImageContents;
public interface DataReader {
void readData(InputStream is, BufferedImage bi,
- ImageContents imageContents, BinaryFileParser bfp)
+ PsdImageContents imageContents, BinaryFileParser bfp)
throws ImageReadException, IOException;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java?rev=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java Mon Oct 10 16:45:37 2016
@@ -25,7 +25,7 @@ import org.apache.commons.imaging.ImageR
import org.apache.commons.imaging.common.BinaryFileParser;
import org.apache.commons.imaging.common.mylzw.BitsToByteInputStream;
import org.apache.commons.imaging.common.mylzw.MyBitInputStream;
-import org.apache.commons.imaging.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.PsdImageContents;
import org.apache.commons.imaging.formats.psd.PsdHeaderInfo;
import org.apache.commons.imaging.formats.psd.dataparsers.DataParser;
@@ -39,7 +39,7 @@ public class UncompressedDataReader impl
@Override
public void readData(final InputStream is, final BufferedImage bi,
- final ImageContents imageContents, final BinaryFileParser bfp)
+ final PsdImageContents imageContents, final BinaryFileParser bfp)
throws ImageReadException, IOException {
final PsdHeaderInfo header = imageContents.header;
final int width = header.columns;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java?rev=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java Mon Oct 10 16:45:37 2016
@@ -22,7 +22,7 @@ import java.nio.ByteOrder;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
-import org.apache.commons.imaging.formats.tiff.datareaders.DataReader;
+import org.apache.commons.imaging.formats.tiff.datareaders.ImageDataReader;
import org.apache.commons.imaging.formats.tiff.datareaders.DataReaderStrips;
import org.apache.commons.imaging.formats.tiff.datareaders.DataReaderTiled;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreter;
@@ -52,7 +52,7 @@ public abstract class TiffImageData {
}
@Override
- public DataReader getDataReader(final TiffDirectory directory,
+ public ImageDataReader getDataReader(final TiffDirectory directory,
final PhotometricInterpreter photometricInterpreter,
final int bitsPerPixel, final int[] bitsPerSample, final int predictor,
final int samplesPerPixel, final int width, final int height, final int compression,
@@ -118,7 +118,7 @@ public abstract class TiffImageData {
}
@Override
- public DataReader getDataReader(final TiffDirectory directory,
+ public ImageDataReader getDataReader(final TiffDirectory directory,
final PhotometricInterpreter photometricInterpreter,
final int bitsPerPixel, final int[] bitsPerSample, final int predictor,
final int samplesPerPixel, final int width, final int height, final int compression,
@@ -136,7 +136,7 @@ public abstract class TiffImageData {
public abstract boolean stripsNotTiles();
- public abstract DataReader getDataReader(TiffDirectory directory,
+ public abstract ImageDataReader getDataReader(TiffDirectory directory,
PhotometricInterpreter photometricInterpreter, int bitsPerPixel,
int[] bitsPerSample, int predictor, int samplesPerPixel, int width,
int height, int compression, ByteOrder byteOrder) throws IOException,
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java?rev=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java Mon Oct 10 16:45:37 2016
@@ -42,7 +42,7 @@ import org.apache.commons.imaging.format
import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
import org.apache.commons.imaging.formats.tiff.constants.TiffEpTagConstants;
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
-import org.apache.commons.imaging.formats.tiff.datareaders.DataReader;
+import org.apache.commons.imaging.formats.tiff.datareaders.ImageDataReader;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreter;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreterBiLevel;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreterCieLab;
@@ -639,7 +639,7 @@ public class TiffImageParser extends Ima
final TiffImageData imageData = directory.getTiffImageData();
- final DataReader dataReader = imageData.getDataReader(directory,
+ final ImageDataReader dataReader = imageData.getDataReader(directory,
photometricInterpreter, bitsPerPixel, bitsPerSample, predictor,
samplesPerPixel, width, height, compression, byteOrder);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java?rev=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java Mon Oct 10 16:45:37 2016
@@ -29,7 +29,7 @@ import org.apache.commons.imaging.format
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreter;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreterRgb;
-public final class DataReaderStrips extends DataReader {
+public final class DataReaderStrips extends ImageDataReader {
private final int bitsPerPixel;
private final int compression;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java?rev=1764151&r1=1764150&r2=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java Mon Oct 10 16:45:37 2016
@@ -30,7 +30,7 @@ import org.apache.commons.imaging.format
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreter;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreterRgb;
-public final class DataReaderTiled extends DataReader {
+public final class DataReaderTiled extends ImageDataReader {
private final int tileWidth;
private final int tileLength;
Copied: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java (from r1764150, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java)
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java?p2=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java&p1=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java&r1=1764150&r2=1764151&rev=1764151&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java Mon Oct 10 16:45:37 2016
@@ -45,7 +45,7 @@ import org.apache.commons.imaging.format
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreter;
-public abstract class DataReader {
+public abstract class ImageDataReader {
protected final TiffDirectory directory;
protected final PhotometricInterpreter photometricInterpreter;
private final int[] bitsPerSample;
@@ -57,7 +57,7 @@ public abstract class DataReader {
protected final int width;
protected final int height;
- public DataReader(final TiffDirectory directory,
+ public ImageDataReader(final TiffDirectory directory,
final PhotometricInterpreter photometricInterpreter, final int[] bitsPerSample,
final int predictor, final int samplesPerPixel, final int width, final int height) {
this.directory = directory;