You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by eb...@apache.org on 2013/11/26 12:15:06 UTC
svn commit: r1545616 [2/2] - in /commons/proper/imaging/trunk/src:
main/java/org/apache/commons/imaging/common/
main/java/org/apache/commons/imaging/common/mylzw/
main/java/org/apache/commons/imaging/formats/bmp/
main/java/org/apache/commons/imaging/fo...
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSByte.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSByte.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSByte.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSByte.java Tue Nov 26 11:15:04 2013
@@ -16,7 +16,8 @@
*/
package org.apache.commons.imaging.formats.tiff.taginfos;
-import org.apache.commons.imaging.common.ByteOrder;
+import java.nio.ByteOrder;
+
import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSLong.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSLong.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSLong.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSLong.java Tue Nov 26 11:15:04 2013
@@ -16,8 +16,9 @@
*/
package org.apache.commons.imaging.formats.tiff.taginfos;
+import java.nio.ByteOrder;
+
import org.apache.commons.imaging.common.ByteConversions;
-import org.apache.commons.imaging.common.ByteOrder;
import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSRational.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSRational.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSRational.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSRational.java Tue Nov 26 11:15:04 2013
@@ -16,8 +16,9 @@
*/
package org.apache.commons.imaging.formats.tiff.taginfos;
+import java.nio.ByteOrder;
+
import org.apache.commons.imaging.common.ByteConversions;
-import org.apache.commons.imaging.common.ByteOrder;
import org.apache.commons.imaging.common.RationalNumber;
import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShort.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShort.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShort.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShort.java Tue Nov 26 11:15:04 2013
@@ -16,8 +16,9 @@
*/
package org.apache.commons.imaging.formats.tiff.taginfos;
+import java.nio.ByteOrder;
+
import org.apache.commons.imaging.common.ByteConversions;
-import org.apache.commons.imaging.common.ByteOrder;
import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShort.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShort.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShort.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShort.java Tue Nov 26 11:15:04 2013
@@ -16,8 +16,9 @@
*/
package org.apache.commons.imaging.formats.tiff.taginfos;
+import java.nio.ByteOrder;
+
import org.apache.commons.imaging.common.ByteConversions;
-import org.apache.commons.imaging.common.ByteOrder;
import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrLong.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrLong.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrLong.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrLong.java Tue Nov 26 11:15:04 2013
@@ -16,8 +16,9 @@
*/
package org.apache.commons.imaging.formats.tiff.taginfos;
+import java.nio.ByteOrder;
+
import org.apache.commons.imaging.common.ByteConversions;
-import org.apache.commons.imaging.common.ByteOrder;
import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrLongOrRational.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrLongOrRational.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrLongOrRational.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrLongOrRational.java Tue Nov 26 11:15:04 2013
@@ -16,8 +16,9 @@
*/
package org.apache.commons.imaging.formats.tiff.taginfos;
+import java.nio.ByteOrder;
+
import org.apache.commons.imaging.common.ByteConversions;
-import org.apache.commons.imaging.common.ByteOrder;
import org.apache.commons.imaging.common.RationalNumber;
import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrRational.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrRational.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrRational.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrRational.java Tue Nov 26 11:15:04 2013
@@ -16,8 +16,9 @@
*/
package org.apache.commons.imaging.formats.tiff.taginfos;
+import java.nio.ByteOrder;
+
import org.apache.commons.imaging.common.ByteConversions;
-import org.apache.commons.imaging.common.ByteOrder;
import org.apache.commons.imaging.common.RationalNumber;
import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoXpString.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoXpString.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoXpString.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoXpString.java Tue Nov 26 11:15:04 2013
@@ -17,10 +17,10 @@
package org.apache.commons.imaging.formats.tiff.taginfos;
import java.io.UnsupportedEncodingException;
+import java.nio.ByteOrder;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.common.ByteOrder;
import org.apache.commons.imaging.formats.tiff.TiffField;
import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java Tue Nov 26 11:15:04 2013
@@ -19,6 +19,7 @@ package org.apache.commons.imaging.forma
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -29,7 +30,6 @@ import java.util.Map;
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.PixelDensity;
import org.apache.commons.imaging.common.BinaryOutputStream;
-import org.apache.commons.imaging.common.ByteOrder;
import org.apache.commons.imaging.common.PackBits;
import org.apache.commons.imaging.common.RationalNumber;
import org.apache.commons.imaging.common.itu_t4.T4AndT6Compression;
@@ -374,7 +374,7 @@ public abstract class TiffImageWriterBas
final int LZW_MINIMUM_CODE_SIZE = 8;
final MyLzwCompressor compressor = new MyLzwCompressor(
- LZW_MINIMUM_CODE_SIZE, ByteOrder.MOTOROLA, true);
+ LZW_MINIMUM_CODE_SIZE, ByteOrder.BIG_ENDIAN, true);
final byte compressed[] = compressor.compress(uncompressed);
strips[i] = compressed;
@@ -580,7 +580,7 @@ public abstract class TiffImageWriterBas
protected void writeImageFileHeader(final BinaryOutputStream bos,
final long offsetToFirstIFD) throws IOException {
- if (byteOrder == ByteOrder.INTEL) {
+ if (byteOrder == ByteOrder.LITTLE_ENDIAN) {
bos.write('I');
bos.write('I');
} else {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java Tue Nov 26 11:15:04 2013
@@ -18,6 +18,7 @@ package org.apache.commons.imaging.forma
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -29,7 +30,6 @@ import org.apache.commons.imaging.Format
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.common.BinaryOutputStream;
-import org.apache.commons.imaging.common.ByteOrder;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.common.bytesource.ByteSourceArray;
import org.apache.commons.imaging.formats.tiff.JpegImageData;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java Tue Nov 26 11:15:04 2013
@@ -18,11 +18,11 @@ package org.apache.commons.imaging.forma
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.ByteOrder;
import java.util.List;
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.common.BinaryOutputStream;
-import org.apache.commons.imaging.common.ByteOrder;
public class TiffImageWriterLossy extends TiffImageWriterBase {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java Tue Nov 26 11:15:04 2013
@@ -17,6 +17,7 @@
package org.apache.commons.imaging.formats.tiff.write;
import java.io.IOException;
+import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -24,7 +25,6 @@ import java.util.List;
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.common.BinaryOutputStream;
-import org.apache.commons.imaging.common.ByteOrder;
import org.apache.commons.imaging.common.RationalNumber;
import org.apache.commons.imaging.formats.tiff.JpegImageData;
import org.apache.commons.imaging.formats.tiff.TiffDirectory;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java Tue Nov 26 11:15:04 2013
@@ -17,11 +17,11 @@
package org.apache.commons.imaging.formats.tiff.write;
import java.io.IOException;
+import java.nio.ByteOrder;
import java.util.Arrays;
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.common.BinaryOutputStream;
-import org.apache.commons.imaging.common.ByteOrder;
import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
import org.apache.commons.imaging.formats.tiff.taginfos.TagInfo;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java Tue Nov 26 11:15:04 2013
@@ -16,11 +16,11 @@
*/
package org.apache.commons.imaging.formats.tiff.write;
+import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.common.ByteOrder;
import org.apache.commons.imaging.common.RationalNumber;
import org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants;
import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java Tue Nov 26 11:15:04 2013
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.tiff.write;
+import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.common.ByteOrder;
import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java Tue Nov 26 11:15:04 2013
@@ -20,9 +20,9 @@ import java.awt.color.ICC_Profile;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.ByteOrder;
import org.apache.commons.imaging.common.BinaryFileParser;
-import org.apache.commons.imaging.common.ByteOrder;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.common.bytesource.ByteSourceArray;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTag.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTag.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTag.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTag.java Tue Nov 26 11:15:04 2013
@@ -20,12 +20,12 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.nio.ByteOrder;
import java.nio.charset.Charset;
import java.util.Arrays;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.BinaryInputStream;
-import org.apache.commons.imaging.common.ByteOrder;
import org.apache.commons.imaging.util.IoUtils;
public class IccTag {
@@ -52,7 +52,7 @@ public class IccTag {
boolean canThrow = false;
try {
bis = new BinaryInputStream(new ByteArrayInputStream(
- bytes), ByteOrder.NETWORK);
+ bytes), ByteOrder.BIG_ENDIAN);
data_type_signature = bis.read4Bytes("data type signature",
"ICC: corrupt tag data");
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java Tue Nov 26 11:15:04 2013
@@ -18,10 +18,10 @@ package org.apache.commons.imaging.icc;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.nio.ByteOrder;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.BinaryInputStream;
-import org.apache.commons.imaging.common.ByteOrder;
import org.apache.commons.imaging.util.IoUtils;
public enum IccTagDataTypes implements IccTagDataType {
@@ -35,7 +35,7 @@ public enum IccTagDataTypes implements I
try {
bis = new BinaryInputStream(
new ByteArrayInputStream(bytes),
- ByteOrder.NETWORK);
+ ByteOrder.BIG_ENDIAN);
bis.read4Bytes("type_signature", "ICC: corrupt tag data");
// bis.setDebug(true);
@@ -64,7 +64,7 @@ public enum IccTagDataTypes implements I
try {
bis = new BinaryInputStream(
new ByteArrayInputStream(bytes),
- ByteOrder.NETWORK);
+ ByteOrder.BIG_ENDIAN);
bis.read4Bytes("type_signature", "ICC: corrupt tag data");
canThrow = true;
} finally {
@@ -84,7 +84,7 @@ public enum IccTagDataTypes implements I
try {
bis = new BinaryInputStream(
new ByteArrayInputStream(bytes),
- ByteOrder.NETWORK);
+ ByteOrder.BIG_ENDIAN);
bis.read4Bytes("type_signature", "ICC: corrupt tag data");
canThrow = true;
} finally {
@@ -104,7 +104,7 @@ public enum IccTagDataTypes implements I
try {
bis = new BinaryInputStream(
new ByteArrayInputStream(bytes),
- ByteOrder.NETWORK);
+ ByteOrder.BIG_ENDIAN);
bis.read4Bytes("type_signature", "ICC: corrupt tag data");
bis.read4Bytes("ignore", "ICC: corrupt tag data");
final int thesignature = bis.read4Bytes("thesignature ",
@@ -137,7 +137,7 @@ public enum IccTagDataTypes implements I
try {
bis = new BinaryInputStream(
new ByteArrayInputStream(bytes),
- ByteOrder.NETWORK);
+ ByteOrder.BIG_ENDIAN);
bis.read4Bytes("type_signature", "ICC: corrupt tag data");
bis.read4Bytes("ignore", "ICC: corrupt tag data");
final String s = new String(bytes, 8, bytes.length - 8, "US-ASCII");
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java Tue Nov 26 11:15:04 2013
@@ -15,32 +15,24 @@
package org.apache.commons.imaging.common;
+import java.nio.ByteOrder;
+
import org.apache.commons.imaging.ImagingTest;
public class BinaryFileFunctionsTest extends ImagingTest {
public void testFloatToByteConversion() {
- final byte[] bytesLE = ByteConversions.toBytes(1.0f,
- ByteOrder.LITTLE_ENDIAN);
- assertEquals(
- ByteConversions.toFloat(bytesLE, ByteOrder.LITTLE_ENDIAN),
- 1.0f, 0f);
-
- final byte[] bytesBE = ByteConversions.toBytes(1.0f,
- ByteOrder.BIG_ENDIAN);
- assertEquals(ByteConversions.toFloat(bytesBE, ByteOrder.BIG_ENDIAN),
- 1.0f, 0f);
+ final byte[] bytesLE = ByteConversions.toBytes(1.0f, ByteOrder.LITTLE_ENDIAN);
+ assertEquals(ByteConversions.toFloat(bytesLE, ByteOrder.LITTLE_ENDIAN), 1.0f, 0f);
+
+ final byte[] bytesBE = ByteConversions.toBytes(1.0f, ByteOrder.BIG_ENDIAN);
+ assertEquals(ByteConversions.toFloat(bytesBE, ByteOrder.BIG_ENDIAN), 1.0f, 0f);
}
public void testDoubleToByteConversion() {
- final byte[] bytesLE = ByteConversions.toBytes(1.0,
- ByteOrder.LITTLE_ENDIAN);
- assertEquals(
- ByteConversions.toDouble(bytesLE, ByteOrder.LITTLE_ENDIAN),
- 1.0, 0);
-
- final byte[] bytesBE = ByteConversions.toBytes(1.0,
- ByteOrder.BIG_ENDIAN);
- assertEquals(ByteConversions.toDouble(bytesBE, ByteOrder.BIG_ENDIAN),
- 1.0, 0);
+ final byte[] bytesLE = ByteConversions.toBytes(1.0, ByteOrder.LITTLE_ENDIAN);
+ assertEquals(ByteConversions.toDouble(bytesLE, ByteOrder.LITTLE_ENDIAN), 1.0, 0);
+
+ final byte[] bytesBE = ByteConversions.toBytes(1.0, ByteOrder.BIG_ENDIAN);
+ assertEquals(ByteConversions.toDouble(bytesBE, ByteOrder.BIG_ENDIAN), 1.0, 0);
}
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java Tue Nov 26 11:15:04 2013
@@ -25,7 +25,7 @@ import java.io.IOException;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.BinaryOutputStream;
-import org.apache.commons.imaging.common.ByteOrder;
+import java.nio.ByteOrder;
import org.apache.commons.imaging.util.Debug;
import org.apache.commons.imaging.util.IoUtils;
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java Tue Nov 26 11:15:04 2013
@@ -28,7 +28,7 @@ import org.apache.commons.imaging.ImageR
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.BinaryOutputStream;
-import org.apache.commons.imaging.common.ByteOrder;
+import java.nio.ByteOrder;
import org.apache.commons.imaging.util.Debug;
import org.apache.commons.imaging.util.IoUtils;
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java?rev=1545616&r1=1545615&r2=1545616&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java Tue Nov 26 11:15:04 2013
@@ -23,7 +23,7 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.imaging.common.ByteOrder;
+import java.nio.ByteOrder;
import org.apache.commons.imaging.common.mylzw.MyLzwCompressor;
import org.apache.commons.imaging.common.mylzw.MyLzwDecompressor;
import org.apache.commons.imaging.util.Debug;
@@ -101,7 +101,7 @@ public class TiffLzwTest extends TiffBas
};
final MyLzwCompressor compressor = new MyLzwCompressor(LZW_MINIMUM_CODE_SIZE,
- ByteOrder.MOTOROLA, true, compressionListener);
+ ByteOrder.BIG_ENDIAN, true, compressionListener);
final byte compressed[] = compressor.compress(src);
final MyLzwDecompressor.Listener decompressionListener = new MyLzwDecompressor.Listener() {
@@ -148,7 +148,7 @@ public class TiffLzwTest extends TiffBas
};
final InputStream is = new ByteArrayInputStream(compressed);
final MyLzwDecompressor decompressor = new MyLzwDecompressor(
- LZW_MINIMUM_CODE_SIZE, ByteOrder.NETWORK,
+ LZW_MINIMUM_CODE_SIZE, ByteOrder.BIG_ENDIAN,
decompressionListener);
decompressor.setTiffLZWMode();
final byte decompressed[] = decompressor.decompress(is, src.length);
@@ -183,7 +183,7 @@ public class TiffLzwTest extends TiffBas
};
final InputStream is = new ByteArrayInputStream(src);
final MyLzwDecompressor decompressor = new MyLzwDecompressor(
- LZW_MINIMUM_CODE_SIZE, ByteOrder.NETWORK,
+ LZW_MINIMUM_CODE_SIZE, ByteOrder.BIG_ENDIAN,
decompressionListener);
decompressor.setTiffLZWMode();
final byte decompressed[] = decompressor.decompress(is, src.length);
@@ -244,7 +244,7 @@ public class TiffLzwTest extends TiffBas
};
final MyLzwCompressor compressor = new MyLzwCompressor(LZW_MINIMUM_CODE_SIZE,
- ByteOrder.MOTOROLA, true, compressionListener);
+ ByteOrder.BIG_ENDIAN, true, compressionListener);
final byte compressed[] = compressor.compress(decompressed);
assertEquals(src.length, compressed.length);