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/25 11:05:41 UTC
svn commit: r1545202 - in /commons/proper/imaging/trunk/src:
main/java/org/apache/commons/imaging/color/
main/java/org/apache/commons/imaging/common/itu_t4/
main/java/org/apache/commons/imaging/formats/icns/
main/java/org/apache/commons/imaging/formats...
Author: ebourg
Date: Mon Nov 25 10:05:40 2013
New Revision: 1545202
URL: http://svn.apache.org/r1545202
Log:
Uppercased constants
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorConversions.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4_T6_Tables.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsDecoder.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsType.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/YCbCrConverter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App14Segment.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngConstants.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TagConstantsUtils.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorConversions.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorConversions.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorConversions.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorConversions.java Mon Nov 25 10:05:40 2013
@@ -18,9 +18,9 @@ package org.apache.commons.imaging.color
public final class ColorConversions {
- private static final double ref_X = 95.047; // Observer= 2°, Illuminant= D65
- private static final double ref_Y = 100.000;
- private static final double ref_Z = 108.883;
+ private static final double REF_X = 95.047; // Observer= 2°, Illuminant= D65
+ private static final double REF_Y = 100.000;
+ private static final double REF_Z = 108.883;
private ColorConversions() {
}
@@ -32,10 +32,10 @@ public final class ColorConversions {
public static ColorCieLab convertXYZtoCIELab(final double X, final double Y,
final double Z) {
- double var_X = X / ref_X; // ref_X = 95.047 Observer= 2°, Illuminant=
+ double var_X = X / REF_X; // REF_X = 95.047 Observer= 2°, Illuminant=
// D65
- double var_Y = Y / ref_Y; // ref_Y = 100.000
- double var_Z = Z / ref_Z; // ref_Z = 108.883
+ double var_Y = Y / REF_Y; // REF_Y = 100.000
+ double var_Z = Z / REF_Z; // REF_Z = 108.883
if (var_X > 0.008856) {
var_X = Math.pow(var_X, (1 / 3.0));
@@ -84,10 +84,10 @@ public final class ColorConversions {
var_Z = (var_Z - 16 / 116.0) / 7.787;
}
- final double X = ref_X * var_X; // ref_X = 95.047 Observer= 2°, Illuminant=
+ final double X = REF_X * var_X; // REF_X = 95.047 Observer= 2°, Illuminant=
// D65
- final double Y = ref_Y * var_Y; // ref_Y = 100.000
- final double Z = ref_Z * var_Z; // ref_Z = 108.883
+ final double Y = REF_Y * var_Y; // REF_Y = 100.000
+ final double Z = REF_Z * var_Z; // REF_Z = 108.883
return new ColorXyz(X, Y, Z);
}
@@ -574,21 +574,21 @@ public final class ColorConversions {
var_Z = (var_Z - 16 / 116.0) / 7.787;
}
- // double ref_X = 95.047;
- // double ref_Y = 100.000;
- // double ref_Z = 108.883;
-
- X = ref_X * var_X; // ref_X = 95.047 Observer= 2°, Illuminant= D65
- Y = ref_Y * var_Y; // ref_Y = 100.000
- Z = ref_Z * var_Z; // ref_Z = 108.883
+ // double REF_X = 95.047;
+ // double REF_Y = 100.000;
+ // double REF_Z = 108.883;
+
+ X = REF_X * var_X; // REF_X = 95.047 Observer= 2°, Illuminant= D65
+ Y = REF_Y * var_Y; // REF_Y = 100.000
+ Z = REF_Z * var_Z; // REF_Z = 108.883
}
double R, G, B;
{
- final double var_X = X / 100; // X = From 0 to ref_X
- final double var_Y = Y / 100; // Y = From 0 to ref_Y
- final double var_Z = Z / 100; // Z = From 0 to ref_Y
+ final double var_X = X / 100; // X = From 0 to REF_X
+ final double var_Y = Y / 100; // Y = From 0 to REF_Y
+ final double var_Z = Z / 100; // Z = From 0 to REF_Y
double var_R = var_X * 3.2406 + var_Y * -1.5372 + var_Z * -0.4986;
double var_G = var_X * -0.9689 + var_Y * 1.8758 + var_Z * 0.0415;
@@ -711,8 +711,8 @@ public final class ColorConversions {
// Debug.debug("var_Y", var_Y);
- final double ref_U = (4 * ref_X) / (ref_X + (15 * ref_Y) + (3 * ref_Z));
- final double ref_V = (9 * ref_Y) / (ref_X + (15 * ref_Y) + (3 * ref_Z));
+ final double ref_U = (4 * REF_X) / (REF_X + (15 * REF_Y) + (3 * REF_Z));
+ final double ref_V = (9 * REF_Y) / (REF_X + (15 * REF_Y) + (3 * REF_Z));
// Debug.debug("ref_U", ref_U);
// Debug.debug("ref_V", ref_V);
@@ -738,8 +738,8 @@ public final class ColorConversions {
var_Y = (var_Y - 16 / 116) / 7.787;
}
- final double ref_U = (4 * ref_X) / (ref_X + (15 * ref_Y) + (3 * ref_Z));
- final double ref_V = (9 * ref_Y) / (ref_X + (15 * ref_Y) + (3 * ref_Z));
+ final double ref_U = (4 * REF_X) / (REF_X + (15 * REF_Y) + (3 * REF_Z));
+ final double ref_V = (9 * REF_Y) / (REF_X + (15 * REF_Y) + (3 * REF_Z));
final double var_U = u / (13 * L) + ref_U;
final double var_V = v / (13 * L) + ref_V;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java Mon Nov 25 10:05:40 2013
@@ -37,19 +37,19 @@ public final class T4AndT6Compression {
static {
try {
- for (final Entry entry : T4_T6_Tables.whiteTerminatingCodes) {
+ for (final Entry entry : T4_T6_Tables.WHITE_TERMINATING_CODES) {
whiteRunLengths.insert(entry.bitString, entry.value);
}
- for (final Entry entry : T4_T6_Tables.whiteMakeUpCodes) {
+ for (final Entry entry : T4_T6_Tables.WHITE_MAKE_UP_CODES) {
whiteRunLengths.insert(entry.bitString, entry.value);
}
- for (final Entry entry : T4_T6_Tables.blackTerminatingCodes) {
+ for (final Entry entry : T4_T6_Tables.BLACK_TERMINATING_CODES) {
blackRunLengths.insert(entry.bitString, entry.value);
}
- for (final Entry entry : T4_T6_Tables.blackMakeUpCodes) {
+ for (final Entry entry : T4_T6_Tables.BLACK_MAKE_UP_CODES) {
blackRunLengths.insert(entry.bitString, entry.value);
}
- for (final Entry entry : T4_T6_Tables.additionalMakeUpCodes) {
+ for (final Entry entry : T4_T6_Tables.ADDITIONAL_MAKE_UP_CODES) {
whiteRunLengths.insert(entry.bitString, entry.value);
blackRunLengths.insert(entry.bitString, entry.value);
}
@@ -731,15 +731,15 @@ public final class T4AndT6Compression {
final T4_T6_Tables.Entry[] makeUpCodes;
final T4_T6_Tables.Entry[] terminatingCodes;
if (color == WHITE) {
- makeUpCodes = T4_T6_Tables.whiteMakeUpCodes;
- terminatingCodes = T4_T6_Tables.whiteTerminatingCodes;
+ makeUpCodes = T4_T6_Tables.WHITE_MAKE_UP_CODES;
+ terminatingCodes = T4_T6_Tables.WHITE_TERMINATING_CODES;
} else {
- makeUpCodes = T4_T6_Tables.blackMakeUpCodes;
- terminatingCodes = T4_T6_Tables.blackTerminatingCodes;
+ makeUpCodes = T4_T6_Tables.BLACK_MAKE_UP_CODES;
+ terminatingCodes = T4_T6_Tables.BLACK_TERMINATING_CODES;
}
while (runLength >= 1792) {
final T4_T6_Tables.Entry entry = lowerBound(
- T4_T6_Tables.additionalMakeUpCodes, runLength);
+ T4_T6_Tables.ADDITIONAL_MAKE_UP_CODES, runLength);
entry.writeBits(bitStream);
runLength -= entry.value;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4_T6_Tables.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4_T6_Tables.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4_T6_Tables.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4_T6_Tables.java Mon Nov 25 10:05:40 2013
@@ -19,7 +19,7 @@ package org.apache.commons.imaging.commo
import org.apache.commons.imaging.common.BitArrayOutputStream;
class T4_T6_Tables {
- public static final Entry[] whiteTerminatingCodes = {
+ public static final Entry[] WHITE_TERMINATING_CODES = {
new Entry("00110101", Integer.valueOf(0)),
new Entry("000111", Integer.valueOf(1)),
new Entry("0111", Integer.valueOf(2)),
@@ -85,7 +85,7 @@ class T4_T6_Tables {
new Entry("00110011", Integer.valueOf(62)),
new Entry("00110100", Integer.valueOf(63)), };
- public static final Entry[] blackTerminatingCodes = {
+ public static final Entry[] BLACK_TERMINATING_CODES = {
new Entry("0000110111", Integer.valueOf(0)),
new Entry("010", Integer.valueOf(1)),
new Entry("11", Integer.valueOf(2)),
@@ -151,7 +151,7 @@ class T4_T6_Tables {
new Entry("000001100110", Integer.valueOf(62)),
new Entry("000001100111", Integer.valueOf(63)), };
- public static final Entry[] whiteMakeUpCodes = {
+ public static final Entry[] WHITE_MAKE_UP_CODES = {
new Entry("11011", Integer.valueOf(64)),
new Entry("10010", Integer.valueOf(128)),
new Entry("010111", Integer.valueOf(192)),
@@ -180,7 +180,7 @@ class T4_T6_Tables {
new Entry("011000", Integer.valueOf(1664)),
new Entry("010011011", Integer.valueOf(1728)), };
- public static final Entry[] blackMakeUpCodes = {
+ public static final Entry[] BLACK_MAKE_UP_CODES = {
new Entry("0000001111", Integer.valueOf(64)),
new Entry("000011001000", Integer.valueOf(128)),
new Entry("000011001001", Integer.valueOf(192)),
@@ -209,7 +209,7 @@ class T4_T6_Tables {
new Entry("0000001100100", Integer.valueOf(1664)),
new Entry("0000001100101", Integer.valueOf(1728)), };
- public static final Entry[] additionalMakeUpCodes = {
+ public static final Entry[] ADDITIONAL_MAKE_UP_CODES = {
new Entry("00000001000", Integer.valueOf(1792)),
new Entry("00000001100", Integer.valueOf(1856)),
new Entry("00000001101", Integer.valueOf(1920)),
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsDecoder.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsDecoder.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsDecoder.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsDecoder.java Mon Nov 25 10:05:40 2013
@@ -25,12 +25,12 @@ import org.apache.commons.imaging.common
import org.apache.commons.imaging.formats.icns.IcnsImageParser.IcnsElement;
public final class IcnsDecoder {
- private static final int[] palette_4bpp = { 0xffffffff, 0xfffcf305,
+ private static final int[] PALETTE_4BPP = { 0xffffffff, 0xfffcf305,
0xffff6402, 0xffdd0806, 0xfff20884, 0xff4600a5, 0xff0000d4,
0xff02abea, 0xff1fb714, 0xff006411, 0xff562c05, 0xff90713a,
0xffc0c0c0, 0xff808080, 0xff404040, 0xff000000 };
- private static final int[] palette_8bpp = { 0xFFFFFFFF, 0xFFFFFFCC,
+ private static final int[] PALETTE_8BPP = { 0xFFFFFFFF, 0xFFFFFFCC,
0xFFFFFF99, 0xFFFFFF66, 0xFFFFFF33, 0xFFFFFF00, 0xFFFFCCFF,
0xFFFFCCCC, 0xFFFFCC99, 0xFFFFCC66, 0xFFFFCC33, 0xFFFFCC00,
0xFFFF99FF, 0xFFFF99CC, 0xFFFF9999, 0xFFFF9966, 0xFFFF9933,
@@ -123,7 +123,7 @@ public final class IcnsDecoder {
index = 0xf & imageData[i++];
}
visited = !visited;
- image.setRGB(x, y, palette_4bpp[index]);
+ image.setRGB(x, y, PALETTE_4BPP[index]);
}
}
}
@@ -133,7 +133,7 @@ public final class IcnsDecoder {
for (int y = 0; y < imageType.getHeight(); y++) {
for (int x = 0; x < imageType.getWidth(); x++) {
final int index = 0xff & imageData[y * imageType.getWidth() + x];
- image.setRGB(x, y, palette_8bpp[index]);
+ image.setRGB(x, y, PALETTE_8BPP[index]);
}
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsType.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsType.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsType.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsType.java Mon Nov 25 10:05:40 2013
@@ -76,7 +76,7 @@ public final class IcnsType {
public static final IcnsType ICNS_512x512_32BIT_ARGB_IMAGE = new IcnsType(
"ic09", 512, 512, 32, false);
- private static final IcnsType[] allImageTypes = {
+ private static final IcnsType[] ALL_IMAGE_TYPES = {
ICNS_16x12_1BIT_IMAGE_AND_MASK, ICNS_16x12_4BIT_IMAGE,
ICNS_16x12_8BIT_IMAGE, ICNS_16x16_1BIT_IMAGE_AND_MASK,
ICNS_16x16_4BIT_IMAGE, ICNS_16x16_8BIT_IMAGE,
@@ -87,7 +87,7 @@ public final class IcnsType {
ICNS_48x48_32BIT_IMAGE, ICNS_128x128_32BIT_IMAGE,
ICNS_256x256_32BIT_ARGB_IMAGE, ICNS_512x512_32BIT_ARGB_IMAGE };
- private static final IcnsType[] allMaskTypes = {
+ private static final IcnsType[] ALL_MASK_TYPES = {
ICNS_16x12_1BIT_IMAGE_AND_MASK, ICNS_16x16_1BIT_IMAGE_AND_MASK,
ICNS_16x16_8BIT_MASK, ICNS_32x32_1BIT_IMAGE_AND_MASK,
ICNS_32x32_8BIT_MASK, ICNS_48x48_1BIT_IMAGE_AND_MASK,
@@ -130,12 +130,12 @@ public final class IcnsType {
}
public static IcnsType findAnyType(final int type) {
- for (final IcnsType allImageType : allImageTypes) {
+ for (final IcnsType allImageType : ALL_IMAGE_TYPES) {
if (allImageType.getType() == type) {
return allImageType;
}
}
- for (final IcnsType allMaskType : allMaskTypes) {
+ for (final IcnsType allMaskType : ALL_MASK_TYPES) {
if (allMaskType.getType() == type) {
return allMaskType;
}
@@ -144,7 +144,7 @@ public final class IcnsType {
}
public static IcnsType findImageType(final int type) {
- for (final IcnsType allImageType : allImageTypes) {
+ for (final IcnsType allImageType : ALL_IMAGE_TYPES) {
if (allImageType.getType() == type) {
return allImageType;
}
@@ -153,7 +153,7 @@ public final class IcnsType {
}
public static IcnsType find8BPPMaskType(final IcnsType imageType) {
- for (final IcnsType allMaskType : allMaskTypes) {
+ for (final IcnsType allMaskType : ALL_MASK_TYPES) {
if (allMaskType.getBitsPerPixel() == 8
&& allMaskType.getWidth() == imageType.getWidth()
&& allMaskType.getHeight() == imageType.getHeight()) {
@@ -164,7 +164,7 @@ public final class IcnsType {
}
public static IcnsType find1BPPMaskType(final IcnsType imageType) {
- for (final IcnsType allMaskType : allMaskTypes) {
+ for (final IcnsType allMaskType : ALL_MASK_TYPES) {
if (allMaskType.getBitsPerPixel() == 1
&& allMaskType.getWidth() == imageType.getWidth()
&& allMaskType.getHeight() == imageType.getHeight()) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java Mon Nov 25 10:05:40 2013
@@ -39,7 +39,7 @@ import org.apache.commons.imaging.util.D
public class JpegImageMetadata implements IImageMetadata {
private final JpegPhotoshopMetadata photoshop;
private final TiffImageMetadata exif;
- private static final String newline = System.getProperty("line.separator");
+ private static final String NEWLINE = System.getProperty("line.separator");
public JpegImageMetadata(final JpegPhotoshopMetadata photoshop,
final TiffImageMetadata exif) {
@@ -218,19 +218,19 @@ public class JpegImageMetadata implement
result.append("No Exif metadata.");
} else {
result.append("Exif metadata:");
- result.append(newline);
+ result.append(NEWLINE);
result.append(exif.toString("\t"));
}
// if (null != exif && null != photoshop)
- result.append(newline);
+ result.append(NEWLINE);
result.append(prefix);
if (null == photoshop) {
result.append("No Photoshop (IPTC) metadata.");
} else {
result.append("Photoshop (IPTC) metadata:");
- result.append(newline);
+ result.append(NEWLINE);
result.append(photoshop.toString("\t"));
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java Mon Nov 25 10:05:40 2013
@@ -57,7 +57,7 @@ public final class Dct {
* transforms per second per core :-)
*/
- private static final float[] dctScalingFactors = {
+ private static final float[] DCT_SCALING_FACTORS = {
(float) (0.5 / Math.sqrt(2.0)),
(float) (0.25 / Math.cos(Math.PI / 16.0)),
(float) (0.25 / Math.cos(2.0 * Math.PI / 16.0)),
@@ -67,7 +67,7 @@ public final class Dct {
(float) (0.25 / Math.cos(6.0 * Math.PI / 16.0)),
(float) (0.25 / Math.cos(7.0 * Math.PI / 16.0)), };
- private static final float[] idctScalingFactors = {
+ private static final float[] IDCT_SCALING_FACTORS = {
(float) (2.0 * 4.0 / Math.sqrt(2.0) * 0.0625),
(float) (4.0 * Math.cos(Math.PI / 16.0) * 0.125),
(float) (4.0 * Math.cos(2.0 * Math.PI / 16.0) * 0.125),
@@ -96,21 +96,21 @@ public final class Dct {
public static void scaleQuantizationVector(final float[] vector) {
for (int x = 0; x < 8; x++) {
- vector[x] *= dctScalingFactors[x];
+ vector[x] *= DCT_SCALING_FACTORS[x];
}
}
public static void scaleDequantizationVector(final float[] vector) {
for (int x = 0; x < 8; x++) {
- vector[x] *= idctScalingFactors[x];
+ vector[x] *= IDCT_SCALING_FACTORS[x];
}
}
public static void scaleQuantizationMatrix(final float[] matrix) {
for (int y = 0; y < 8; y++) {
for (int x = 0; x < 8; x++) {
- matrix[8 * y + x] *= dctScalingFactors[y]
- * dctScalingFactors[x];
+ matrix[8 * y + x] *= DCT_SCALING_FACTORS[y]
+ * DCT_SCALING_FACTORS[x];
}
}
}
@@ -118,8 +118,8 @@ public final class Dct {
public static void scaleDequantizationMatrix(final float[] matrix) {
for (int y = 0; y < 8; y++) {
for (int x = 0; x < 8; x++) {
- matrix[8 * y + x] *= idctScalingFactors[y]
- * idctScalingFactors[x];
+ matrix[8 * y + x] *= IDCT_SCALING_FACTORS[y]
+ * IDCT_SCALING_FACTORS[x];
}
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/YCbCrConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/YCbCrConverter.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/YCbCrConverter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/YCbCrConverter.java Mon Nov 25 10:05:40 2013
@@ -16,10 +16,10 @@
package org.apache.commons.imaging.formats.jpeg.decoder;
public final class YCbCrConverter {
- private static final int[] reds = new int[256 * 256];
- private static final int[] blues = new int[256 * 256];
- private static final int[] greens1 = new int[256 * 256];
- private static final int[] greens2 = new int[256 * 512];
+ private static final int[] REDS = new int[256 * 256];
+ private static final int[] BLUES = new int[256 * 256];
+ private static final int[] GREENS1 = new int[256 * 256];
+ private static final int[] GREENS2 = new int[256 * 512];
static {
/*
@@ -37,7 +37,7 @@ public final class YCbCrConverter {
if (r > 255) {
r = 255;
}
- reds[(Cr << 8) | Y] = r << 16;
+ REDS[(Cr << 8) | Y] = r << 16;
}
}
for (int Y = 0; Y < 256; Y++) {
@@ -49,7 +49,7 @@ public final class YCbCrConverter {
if (b > 255) {
b = 255;
}
- blues[(Cb << 8) | Y] = b;
+ BLUES[(Cb << 8) | Y] = b;
}
}
// green is the hardest
@@ -83,7 +83,7 @@ public final class YCbCrConverter {
for (int Cr = 0; Cr < 256; Cr++) {
final int value = fastRound(0.34414f * (Cb - 128) + 0.71414f
* (Cr - 128));
- greens1[(Cb << 8) | Cr] = value + 135;
+ GREENS1[(Cb << 8) | Cr] = value + 135;
}
}
for (int Y = 0; Y < 256; Y++) {
@@ -94,7 +94,7 @@ public final class YCbCrConverter {
} else if (green > 255) {
green = 255;
}
- greens2[(value << 8) | Y] = green << 8;
+ GREENS2[(value << 8) | Y] = green << 8;
}
}
}
@@ -108,10 +108,10 @@ public final class YCbCrConverter {
}
public static int convertYCbCrToRGB(final int Y, final int Cb, final int Cr) {
- final int r = reds[(Cr << 8) | Y];
- final int g1 = greens1[(Cb << 8) | Cr];
- final int g = greens2[(g1 << 8) | Y];
- final int b = blues[(Cb << 8) | Y];
+ final int r = REDS[(Cr << 8) | Y];
+ final int g1 = GREENS1[(Cb << 8) | Cr];
+ final int g = GREENS2[(g1 << 8) | Y];
+ final int b = BLUES[(Cb << 8) | Y];
return r | g | b;
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App14Segment.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App14Segment.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App14Segment.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App14Segment.java Mon Nov 25 10:05:40 2013
@@ -27,7 +27,7 @@ import org.apache.commons.imaging.common
* http://www.aiim.org/documents/standards/PDF-Ref/References/Adobe/5116.DCT_Filter.pdf
*/
public class App14Segment extends AppnSegment {
- private static final byte[] adobePrefix;
+ private static final byte[] ADOBE_PREFIX;
public static final int ADOBE_COLOR_TRANSFORM_UNKNOWN = 0;
public static final int ADOBE_COLOR_TRANSFORM_YCbCr = 1;
public static final int ADOBE_COLOR_TRANSFORM_YCCK = 2;
@@ -38,7 +38,7 @@ public class App14Segment extends AppnSe
adobe = "Adobe".getBytes("US-ASCII");
} catch (final UnsupportedEncodingException cannotHappen) { // NOPMD - can't happen
}
- adobePrefix = adobe;
+ ADOBE_PREFIX = adobe;
}
public App14Segment(final int marker, final byte segmentData[])
@@ -53,7 +53,7 @@ public class App14Segment extends AppnSe
}
public boolean isAdobeJpegSegment() {
- return BinaryFileParser.startsWith(getSegmentData(), adobePrefix);
+ return BinaryFileParser.startsWith(getSegmentData(), ADOBE_PREFIX);
}
public int getAdobeColorTransform() {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngConstants.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngConstants.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngConstants.java Mon Nov 25 10:05:40 2013
@@ -84,7 +84,7 @@ public final class PngConstants {
public static final int iTXt = BinaryFunctions.charsToQuad('i', 'T',
'X', 't');
- public static final BinaryConstant PNG_Signature = new BinaryConstant(
+ public static final BinaryConstant PNG_SIGNATURE = new BinaryConstant(
new byte[] { (byte) 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, });
public static final String PARAM_KEY_PNG_BIT_DEPTH = "PNG_BIT_DEPTH";
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java Mon Nov 25 10:05:40 2013
@@ -217,7 +217,7 @@ public class PngImageParser extends Imag
public void readSignature(final InputStream is) throws ImageReadException,
IOException {
- readAndVerifyBytes(is, PngConstants.PNG_Signature,
+ readAndVerifyBytes(is, PngConstants.PNG_SIGNATURE,
"Not a Valid PNG Segment: Incorrect Signature");
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java Mon Nov 25 10:05:40 2013
@@ -496,7 +496,7 @@ public class PngWriter {
}
{
- PngConstants.PNG_Signature.writeTo(os);
+ PngConstants.PNG_SIGNATURE.writeTo(os);
}
{
// IHDR must be first
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java Mon Nov 25 10:05:40 2013
@@ -25,10 +25,10 @@ import org.apache.commons.imaging.format
import org.apache.commons.imaging.formats.png.transparencyfilters.TransparencyFilter;
public class ScanExpediterInterlaced extends ScanExpediter {
- private static final int Starting_Row[] = { 0, 0, 4, 0, 2, 0, 1 };
- private static final int Starting_Col[] = { 0, 4, 0, 2, 0, 1, 0 };
- private static final int Row_Increment[] = { 8, 8, 8, 4, 4, 2, 2 };
- private static final int Col_Increment[] = { 8, 8, 4, 4, 2, 2, 1 };
+ private static final int STARTING_ROW[] = { 0, 0, 4, 0, 2, 0, 1 };
+ private static final int STARTING_COL[] = { 0, 4, 0, 2, 0, 1, 0 };
+ private static final int ROW_INCREMENT[] = { 8, 8, 8, 4, 4, 2, 2 };
+ private static final int COL_INCREMENT[] = { 8, 8, 4, 4, 2, 2, 1 };
// private static final int Block_Height[] = { 8, 8, 4, 4, 2, 2, 1 };
// private static final int Block_Width[] = { 8, 4, 4, 2, 2, 1, 1 };
@@ -56,16 +56,16 @@ public class ScanExpediterInterlaced ext
while (pass <= 7) {
byte prev[] = null;
- int y = Starting_Row[pass - 1];
- // int y_stride = Row_Increment[pass - 1];
+ int y = STARTING_ROW[pass - 1];
+ // int y_stride = ROW_INCREMENT[pass - 1];
//final boolean rows_in_pass = (y < height);
while (y < height) {
- int x = Starting_Col[pass - 1];
+ int x = STARTING_COL[pass - 1];
int pixel_index_in_scanline = 0;
if (x < width) {
// only get data if there are pixels in this scanline/pass
- final int ColumnsInRow = 1 + ((width - Starting_Col[pass - 1] - 1) / Col_Increment[pass - 1]);
+ final int ColumnsInRow = 1 + ((width - STARTING_COL[pass - 1] - 1) / COL_INCREMENT[pass - 1]);
final int bitsPerScanLine = bitsPerPixel * ColumnsInRow;
final int pixel_bytes_per_scan_line = getBitsToBytesRoundingUp(bitsPerScanLine);
@@ -80,11 +80,11 @@ public class ScanExpediterInterlaced ext
while (x < width) {
visit(x, y, bi, fBitParser, pixel_index_in_scanline);
- x = x + Col_Increment[pass - 1];
+ x = x + COL_INCREMENT[pass - 1];
pixel_index_in_scanline++;
}
}
- y = y + Row_Increment[pass - 1];
+ y = y + ROW_INCREMENT[pass - 1];
}
pass = pass + 1;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TagConstantsUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TagConstantsUtils.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TagConstantsUtils.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TagConstantsUtils.java Mon Nov 25 10:05:40 2013
@@ -23,7 +23,7 @@ import org.apache.commons.imaging.common
import org.apache.commons.imaging.formats.tiff.taginfos.TagInfo;
public final class TagConstantsUtils implements TiffDirectoryConstants {
- private static final TiffDirectoryType[] tiffDirectoryTypes = TiffDirectoryType
+ private static final TiffDirectoryType[] TIFF_DIRECTORY_TYPES = TiffDirectoryType
.values();
public static List<TagInfo> mergeTagLists(final List<?>... tagLists) {
@@ -35,8 +35,8 @@ public final class TagConstantsUtils imp
final ArrayList<TagInfo> result = new ArrayList<TagInfo>(count);
for (final List<?> tagList : tagLists) {
- for (int j = 0; j < tagList.size(); j++) {
- result.add((TagInfo)tagList.get(j));
+ for (Object tag : tagList) {
+ result.add((TagInfo) tag);
}
}
@@ -45,7 +45,7 @@ public final class TagConstantsUtils imp
public static TiffDirectoryType getExifDirectoryType(final int type) {
- for (final TiffDirectoryType tiffDirectoryType : tiffDirectoryTypes) {
+ for (final TiffDirectoryType tiffDirectoryType : TIFF_DIRECTORY_TYPES) {
if (tiffDirectoryType.directoryType == type) {
return tiffDirectoryType;
}
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=1545202&r1=1545201&r2=1545202&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 Mon Nov 25 10:05:40 2013
@@ -34,7 +34,7 @@ public class TiffOutputField implements
private byte bytes[];
private final TiffOutputItem.Value separateValueItem;
private int sortHint = -1;
- private static final String newline = System.getProperty("line.separator");
+ private static final String NEWLINE = System.getProperty("line.separator");
public TiffOutputField(final TagInfo tagInfo, final FieldType tagtype, final int count,
final byte bytes[]) {
@@ -137,16 +137,16 @@ public class TiffOutputField implements
result.append(prefix);
result.append(tagInfo);
- result.append(newline);
+ result.append(NEWLINE);
result.append(prefix);
result.append("count: ");
result.append(count);
- result.append(newline);
+ result.append(NEWLINE);
result.append(prefix);
result.append(fieldType);
- result.append(newline);
+ result.append(NEWLINE);
return result.toString();
}
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=1545202&r1=1545201&r2=1545202&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 Mon Nov 25 10:05:40 2013
@@ -30,7 +30,7 @@ import org.apache.commons.imaging.util.D
public final class TiffOutputSet implements TiffConstants {
public final ByteOrder byteOrder;
private final List<TiffOutputDirectory> directories = new ArrayList<TiffOutputDirectory>();
- private static final String newline = System.getProperty("line.separator");
+ private static final String NEWLINE = System.getProperty("line.separator");
public TiffOutputSet() {
this(TiffConstants.DEFAULT_TIFF_BYTE_ORDER);
@@ -263,12 +263,12 @@ public final class TiffOutputSet impleme
result.append(prefix);
result.append("TiffOutputSet {");
- result.append(newline);
+ result.append(NEWLINE);
result.append(prefix);
result.append("byteOrder: ");
result.append(byteOrder);
- result.append(newline);
+ result.append(NEWLINE);
for (int i = 0; i < directories.size(); i++) {
final TiffOutputDirectory directory = directories.get(i);
@@ -280,13 +280,13 @@ public final class TiffOutputSet impleme
final TiffOutputField field = fields.get(j);
result.append(prefix);
result.append("\t\tfield " + i + ": " + field.tagInfo);
- result.append(newline);
+ result.append(NEWLINE);
}
}
result.append(prefix);
result.append('}');
- result.append(newline);
+ result.append(NEWLINE);
return result.toString();
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java Mon Nov 25 10:05:40 2013
@@ -57,7 +57,7 @@ public class XpmImageParser extends Imag
private static final String DEFAULT_EXTENSION = ".xpm";
private static final String ACCEPTED_EXTENSIONS[] = { ".xpm", };
private static Map<String, Integer> colorNames = null;
- private static final char writePalette[] = { ' ', '.', 'X', 'o', 'O', '+',
+ private static final char WRITE_PALETTE[] = { ' ', '.', 'X', 'o', 'O', '+',
'@', '#', '$', '%', '&', '*', '=', '-', ';', ':', '>', ',', '<',
'1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'q', 'w', 'e',
'r', 't', 'y', 'u', 'i', 'p', 'a', 's', 'd', 'f', 'g', 'h', 'j',
@@ -633,13 +633,13 @@ public class XpmImageParser extends Imag
final StringBuilder stringBuilder = new StringBuilder();
int highestPower = 1;
for (int i = 1; i < charsPerPixel; i++) {
- highestPower *= writePalette.length;
+ highestPower *= WRITE_PALETTE.length;
}
for (int i = 0; i < charsPerPixel; i++) {
final int multiple = index / highestPower;
index -= (multiple * highestPower);
- highestPower /= writePalette.length;
- stringBuilder.append(writePalette[multiple]);
+ highestPower /= WRITE_PALETTE.length;
+ stringBuilder.append(WRITE_PALETTE[multiple]);
}
return stringBuilder.toString();
}
@@ -676,13 +676,13 @@ public class XpmImageParser extends Imag
hasTransparency = true;
}
SimplePalette palette = null;
- int maxColors = writePalette.length;
+ int maxColors = WRITE_PALETTE.length;
int charsPerPixel = 1;
while (palette == null) {
palette = paletteFactory.makeExactRgbPaletteSimple(src,
hasTransparency ? maxColors - 1 : maxColors);
if (palette == null) {
- maxColors *= writePalette.length;
+ maxColors *= WRITE_PALETTE.length;
charsPerPixel++;
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java Mon Nov 25 10:05:40 2013
@@ -34,9 +34,9 @@ class ColorSpaceSubset {
this.precision = precision;
precision_mask = (1 << precision) - 1;
- mins = new int[PaletteFactory.components];
- maxs = new int[PaletteFactory.components];
- for (int i = 0; i < PaletteFactory.components; i++) {
+ mins = new int[PaletteFactory.COMPONENTS];
+ maxs = new int[PaletteFactory.COMPONENTS];
+ for (int i = 0; i < PaletteFactory.COMPONENTS; i++) {
mins[i] = 0;
maxs[i] = precision_mask;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java Mon Nov 25 10:05:40 2013
@@ -32,8 +32,8 @@ import org.apache.commons.imaging.ImageW
* Factory for creating palettes.
*/
public class PaletteFactory {
- private static final boolean debug = false;
- public static final int components = 3; // in bits
+ private static final boolean DEBUG = false;
+ public static final int COMPONENTS = 3; // in bits
/**
* Builds an exact complete opaque palette containing all the colors in {@code src},
@@ -66,7 +66,7 @@ public class PaletteFactory {
count += Integer.bitCount(eight);
}
- if (debug) {
+ if (DEBUG) {
System.out.println("Used colors: " + count);
}
@@ -95,7 +95,7 @@ public class PaletteFactory {
int result = 0;
final int precision_mask = (1 << precision) - 1;
- for (int i = 0; i < components; i++) {
+ for (int i = 0; i < COMPONENTS; i++) {
int sample = argb & 0xff;
argb >>= 8;
@@ -127,7 +127,7 @@ public class PaletteFactory {
private DivisionCandidate finishDivision(final ColorSpaceSubset subset,
final int component, final int precision, final int sum, final int slice) {
- if (debug) {
+ if (DEBUG) {
subset.dump("trying (" + component + "): ");
}
@@ -155,7 +155,7 @@ public class PaletteFactory {
slice_maxs[component] = slice;
slice_mins[component] = slice + 1;
- if (debug) {
+ if (DEBUG) {
System.out.println("total: " + total);
System.out.println("first total: " + sum);
System.out.println("second total: " + (total - sum));
@@ -176,7 +176,7 @@ public class PaletteFactory {
private List<DivisionCandidate> divideSubset2(final int table[],
final ColorSpaceSubset subset, final int component, final int precision) {
- if (debug) {
+ if (DEBUG) {
subset.dump("trying (" + component + "): ");
}
@@ -299,7 +299,7 @@ public class PaletteFactory {
if (max_subset == null) {
return v;
}
- if (debug) {
+ if (DEBUG) {
System.out.println("\t" + "area: " + max_area);
}
@@ -331,7 +331,7 @@ public class PaletteFactory {
public Palette makeQuantizedRgbPalette(final BufferedImage src, final int max) {
final int precision = 6; // in bits
- final int table_scale = precision * components;
+ final int table_scale = precision * COMPONENTS;
final int table_size = 1 << table_scale;
final int table[] = new int[table_size];
@@ -342,7 +342,7 @@ public class PaletteFactory {
final ColorSpaceSubset all = new ColorSpaceSubset(width * height, precision);
subsets.add(all);
- if (debug) {
+ if (DEBUG) {
final int pre_total = getFrequencyTotal(table, all.mins, all.maxs, precision);
System.out.println("pre total: " + pre_total);
}
@@ -358,7 +358,7 @@ public class PaletteFactory {
}
}
- if (debug) {
+ if (DEBUG) {
final int all_total = getFrequencyTotal(table, all.mins, all.maxs, precision);
System.out.println("all total: " + all_total);
System.out.println("width * height: " + (width * height));
@@ -366,7 +366,7 @@ public class PaletteFactory {
subsets = divide(subsets, max, table, precision);
- if (debug) {
+ if (DEBUG) {
System.out.println("subsets: " + subsets.size());
System.out.println("width*height: " + width * height);
}
@@ -376,7 +376,7 @@ public class PaletteFactory {
subset.setAverageRGB(table);
- if (debug) {
+ if (DEBUG) {
subset.dump(i + ": ");
}
}
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=1545202&r1=1545201&r2=1545202&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 Mon Nov 25 10:05:40 2013
@@ -31,7 +31,7 @@ import org.apache.commons.imaging.util.I
public class IcnsRoundTripTest extends IcnsBaseTest {
// 16x16 test image
- private static final int[][] image = {
+ private static final int[][] IMAGE = {
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0},
@@ -75,7 +75,7 @@ public class IcnsRoundTripTest extends I
bos.write4Bytes(4 + 4 + 16 * 16);
for (int y = 0; y < 16; y++) {
for (int x = 0; x < 16; x++) {
- if (image[y][x] != 0) {
+ if (IMAGE[y][x] != 0) {
bos.write(0xff);
} else {
bos.write(0x00);
@@ -100,7 +100,7 @@ public class IcnsRoundTripTest extends I
// 8 BPP image
for (int y = 0; y < 16; y++) {
for (int x = 0; x < 16; x++) {
- if (image[y][x] != 0) {
+ if (IMAGE[y][x] != 0) {
bos.write(0xff);
} else {
bos.write(43);
@@ -112,7 +112,7 @@ public class IcnsRoundTripTest extends I
bos.write4Bytes(4 + 4 + 16 * 16);
for (int y = 0; y < 16; y++) {
for (int x = 0; x < 16; x++) {
- if (image[y][x] != 0) {
+ if (IMAGE[y][x] != 0) {
bos.write(0xff);
} else {
bos.write(0x00);
@@ -138,7 +138,7 @@ public class IcnsRoundTripTest extends I
// 8 BPP image
for (int y = 0; y < 16; y++) {
for (int x = 0; x < 16; x++) {
- if (image[y][x] != 0) {
+ if (IMAGE[y][x] != 0) {
bos.write(0xff);
} else {
bos.write(43);
@@ -150,7 +150,7 @@ public class IcnsRoundTripTest extends I
bos.write4Bytes(4 + 4 + 16 * 16);
for (int y = 0; y < 16; y++) {
for (int x = 0; x < 16; x++) {
- if (image[y][x] != 0) {
+ if (IMAGE[y][x] != 0) {
bos.write(0xff);
} else {
bos.write(0x00);
@@ -165,7 +165,7 @@ public class IcnsRoundTripTest extends I
for (int x = 0; x < 16; x += 8) {
int eightBits = 0;
for (int pos = 0; pos < 8; pos++) {
- if (image[y][x + pos] != 0) {
+ if (IMAGE[y][x + pos] != 0) {
eightBits |= (1 << (7 - pos));
}
}
@@ -196,7 +196,7 @@ public class IcnsRoundTripTest extends I
// 8 BPP image
for (int y = 0; y < 16; y++) {
for (int x = 0; x < 16; x++) {
- if (image[y][x] != 0) {
+ if (IMAGE[y][x] != 0) {
bos.write(0xff);
} else {
bos.write(43);
@@ -211,7 +211,7 @@ public class IcnsRoundTripTest extends I
for (int x = 0; x < 16; x += 8) {
int eightBits = 0;
for (int pos = 0; pos < 8; pos++) {
- if (image[y][x + pos] != 0) {
+ if (IMAGE[y][x + pos] != 0) {
eightBits |= (1 << (7 - pos));
}
}
@@ -228,7 +228,7 @@ public class IcnsRoundTripTest extends I
bos.write4Bytes(4 + 4 + 16 * 16);
for (int y = 0; y < 16; y++) {
for (int x = 0; x < 16; x++) {
- if (image[y][x] != 0) {
+ if (IMAGE[y][x] != 0) {
bos.write(0xff);
} else {
bos.write(0x00);
@@ -253,7 +253,7 @@ public class IcnsRoundTripTest extends I
// 8 BPP image
for (int y = 0; y < 16; y++) {
for (int x = 0; x < 16; x++) {
- if (image[y][x] != 0) {
+ if (IMAGE[y][x] != 0) {
bos.write(0xff);
} else {
bos.write(43);
@@ -280,7 +280,7 @@ public class IcnsRoundTripTest extends I
// argb, a ignored
bos.write(0);
final int pixel;
- if (image[y][x] != 0) {
+ if (IMAGE[y][x] != 0) {
pixel = foreground;
} else {
pixel = background;
@@ -297,7 +297,7 @@ public class IcnsRoundTripTest extends I
for (int x = 0; x < 16; x += 8) {
int eightBits = 0;
for (int pos = 0; pos < 8; pos++) {
- if (image[y][x + pos] != 0) {
+ if (IMAGE[y][x + pos] != 0) {
eightBits |= (1 << (7 - pos));
}
}
@@ -309,7 +309,7 @@ public class IcnsRoundTripTest extends I
for (int x = 0; x < 16; x += 8) {
int eightBits = 0;
for (int pos = 0; pos < 8; pos++) {
- if (image[y][x + pos] != 0) {
+ if (IMAGE[y][x + pos] != 0) {
eightBits |= (1 << (7 - pos));
}
}
@@ -336,7 +336,7 @@ public class IcnsRoundTripTest extends I
// argb, a ignored
bos.write(0);
final int pixel;
- if (image[y][x] != 0) {
+ if (IMAGE[y][x] != 0) {
pixel = foreground;
} else {
pixel = background;
@@ -353,7 +353,7 @@ public class IcnsRoundTripTest extends I
for (int x = 0; x < 16; x += 8) {
int eightBits = 0;
for (int pos = 0; pos < 8; pos++) {
- if (image[y][x + pos] != 0) {
+ if (IMAGE[y][x + pos] != 0) {
eightBits |= (1 << (7 - pos));
}
}
@@ -388,7 +388,7 @@ public class IcnsRoundTripTest extends I
// argb, a ignored
bos.write(0);
final int pixel;
- if (image[y][x] != 0) {
+ if (IMAGE[y][x] != 0) {
pixel = foreground;
} else {
pixel = background;
@@ -412,20 +412,20 @@ public class IcnsRoundTripTest extends I
final BufferedImage dstImage = Imaging.getBufferedImage(exportFile);
assertNotNull(dstImage);
- assertTrue(dstImage.getWidth() == image[0].length);
- assertTrue(dstImage.getHeight() == image.length);
+ assertTrue(dstImage.getWidth() == IMAGE[0].length);
+ assertTrue(dstImage.getHeight() == IMAGE.length);
verify(dstImage, foreground, background);
}
private void verify(final BufferedImage data, final int foreground, final int background) {
assertNotNull(data);
- assertTrue(data.getHeight() == image.length);
+ assertTrue(data.getHeight() == IMAGE.length);
for (int y = 0; y < data.getHeight(); y++) {
- assertTrue(data.getWidth() == image[y].length);
+ assertTrue(data.getWidth() == IMAGE[y].length);
for (int x = 0; x < data.getWidth(); x++) {
- final int imageARGB = (image[y][x] == 1) ? foreground : background;
+ final int imageARGB = (IMAGE[y][x] == 1) ? foreground : background;
final int dataARGB = data.getRGB(x, y);
if (imageARGB != dataARGB) {
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=1545202&r1=1545201&r2=1545202&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 Mon Nov 25 10:05:40 2013
@@ -34,7 +34,7 @@ import org.apache.commons.imaging.util.I
public class IcoRoundtripTest extends IcoBaseTest {
// 16x16 test image
- private static final int[][] image = {
+ private static final int[][] IMAGE = {
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,1,0,0,0,0,0,1,1,0,0,0,0},
@@ -86,21 +86,21 @@ public class IcoRoundtripTest extends Ic
// Image
for (int y = 15; y >= 0; y--) {
for (int x = 0; x < 16; x += 8) {
- bos.write(((0x1 & image[y][x]) << 7)
- | ((0x1 & image[y][x + 1]) << 6)
- | ((0x1 & image[y][x + 2]) << 5)
- | ((0x1 & image[y][x + 3]) << 4)
- | ((0x1 & image[y][x + 4]) << 3)
- | ((0x1 & image[y][x + 5]) << 2)
- | ((0x1 & image[y][x + 6]) << 1)
- | ((0x1 & image[y][x + 7]) << 0));
+ bos.write(((0x1 & IMAGE[y][x]) << 7)
+ | ((0x1 & IMAGE[y][x + 1]) << 6)
+ | ((0x1 & IMAGE[y][x + 2]) << 5)
+ | ((0x1 & IMAGE[y][x + 3]) << 4)
+ | ((0x1 & IMAGE[y][x + 4]) << 3)
+ | ((0x1 & IMAGE[y][x + 5]) << 2)
+ | ((0x1 & IMAGE[y][x + 6]) << 1)
+ | ((0x1 & IMAGE[y][x + 7]) << 0));
}
// Pad to multiple of 32 bytes
bos.write(0);
bos.write(0);
}
// Mask
- for (int y = image.length - 1; y >= 0; y--) {
+ for (int y = IMAGE.length - 1; y >= 0; y--) {
bos.write(0);
bos.write(0);
// Pad to 4 bytes:
@@ -129,12 +129,12 @@ public class IcoRoundtripTest extends Ic
// Image
for (int y = 15; y >= 0; y--) {
for (int x = 0; x < 16; x += 2) {
- bos.write(((0xf & image[y][x]) << 4)
- | (0xf & image[y][x + 1]));
+ bos.write(((0xf & IMAGE[y][x]) << 4)
+ | (0xf & IMAGE[y][x + 1]));
}
}
// Mask
- for (int y = image.length - 1; y >= 0; y--) {
+ for (int y = IMAGE.length - 1; y >= 0; y--) {
bos.write(0);
bos.write(0);
// Pad to 4 bytes:
@@ -163,11 +163,11 @@ public class IcoRoundtripTest extends Ic
// Image
for (int y = 15; y >= 0; y--) {
for (int x = 0; x < 16; x++) {
- bos.write(image[y][x]);
+ bos.write(IMAGE[y][x]);
}
}
// Mask
- for (int y = image.length - 1; y >= 0; y--) {
+ for (int y = IMAGE.length - 1; y >= 0; y--) {
bos.write(0);
bos.write(0);
// Pad to 4 bytes:
@@ -192,7 +192,7 @@ public class IcoRoundtripTest extends Ic
// Image
for (int y = 15; y >= 0; y--) {
for (int x = 0; x < 16; x++) {
- if (image[y][x] == 1) {
+ if (IMAGE[y][x] == 1) {
bos.write2Bytes((0x1f & (foreground >> 3))
| ((0x1f & (foreground >> 11)) << 5)
| ((0x1f & (foreground >> 19)) << 10));
@@ -204,7 +204,7 @@ public class IcoRoundtripTest extends Ic
}
}
// Mask
- for (int y = image.length - 1; y >= 0; y--) {
+ for (int y = IMAGE.length - 1; y >= 0; y--) {
bos.write(0);
bos.write(0);
// Pad to 4 bytes:
@@ -229,7 +229,7 @@ public class IcoRoundtripTest extends Ic
// Image
for (int y = 15; y >= 0; y--) {
for (int x = 0; x < 16; x++) {
- if (image[y][x] == 1) {
+ if (IMAGE[y][x] == 1) {
bos.write3Bytes(0xffffff & foreground);
} else {
bos.write3Bytes(0xffffff & background);
@@ -237,7 +237,7 @@ public class IcoRoundtripTest extends Ic
}
}
// Mask
- for (int y = image.length - 1; y >= 0; y--) {
+ for (int y = IMAGE.length - 1; y >= 0; y--) {
bos.write(0);
bos.write(0);
// Pad to 4 bytes:
@@ -268,7 +268,7 @@ public class IcoRoundtripTest extends Ic
// Image
for (int y = 15; y >= 0; y--) {
for (int x = 0; x < 16; x++) {
- if (image[y][x] == 1) {
+ if (IMAGE[y][x] == 1) {
bos.write4Bytes(foreground);
} else {
bos.write4Bytes(background);
@@ -277,7 +277,7 @@ public class IcoRoundtripTest extends Ic
}
// Mask
if (writeMask) {
- for (int y = image.length - 1; y >= 0; y--) {
+ for (int y = IMAGE.length - 1; y >= 0; y--) {
bos.write(0);
bos.write(0);
// Pad to 4 bytes:
@@ -530,20 +530,20 @@ public class IcoRoundtripTest extends Ic
final BufferedImage dstImage = Imaging.getBufferedImage(tempFile);
assertNotNull(dstImage);
- assertTrue(dstImage.getWidth() == image[0].length);
- assertTrue(dstImage.getHeight() == image.length);
+ assertTrue(dstImage.getWidth() == IMAGE[0].length);
+ assertTrue(dstImage.getHeight() == IMAGE.length);
verify(dstImage, foreground, background);
}
private void verify(final BufferedImage data, final int foreground, final int background) {
assertNotNull(data);
- assertTrue(data.getHeight() == image.length);
+ assertTrue(data.getHeight() == IMAGE.length);
for (int y = 0; y < data.getHeight(); y++) {
- assertTrue(data.getWidth() == image[y].length);
+ assertTrue(data.getWidth() == IMAGE[y].length);
for (int x = 0; x < data.getWidth(); x++) {
- final int imageARGB = (image[y][x] == 1) ? foreground : background;
+ final int imageARGB = (IMAGE[y][x] == 1) ? foreground : background;
final int dataARGB = data.getRGB(x, y);
if (imageARGB != dataARGB) {
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java Mon Nov 25 10:05:40 2013
@@ -33,19 +33,19 @@ import org.apache.commons.imaging.format
import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
public class MicrosoftTagTest extends ExifBaseTest {
- private static final String author = "author";
- private static final String comment = "comment";
- private static final String subject = "subject";
- private static final String title = "title";
+ private static final String AUTHOR = "author";
+ private static final String COMMENT = "comment";
+ private static final String SUBJECT = "subject";
+ private static final String TITLE = "title";
public void testWrite() throws Exception {
final BufferedImage image = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
final TiffOutputSet exifSet = new TiffOutputSet();
final TiffOutputDirectory exif = exifSet.getOrCreateExifDirectory();
- exif.add(MicrosoftTagConstants.EXIF_TAG_XPAUTHOR, author);
- exif.add(MicrosoftTagConstants.EXIF_TAG_XPCOMMENT, comment);
- exif.add(MicrosoftTagConstants.EXIF_TAG_XPSUBJECT, subject);
- exif.add(MicrosoftTagConstants.EXIF_TAG_XPTITLE, title);
+ exif.add(MicrosoftTagConstants.EXIF_TAG_XPAUTHOR, AUTHOR);
+ exif.add(MicrosoftTagConstants.EXIF_TAG_XPCOMMENT, COMMENT);
+ exif.add(MicrosoftTagConstants.EXIF_TAG_XPSUBJECT, SUBJECT);
+ exif.add(MicrosoftTagConstants.EXIF_TAG_XPTITLE, TITLE);
final Map<String,Object> params = new TreeMap<String,Object>();
params.put(TiffConstants.PARAM_KEY_EXIF, exifSet);
final byte[] bytes = Imaging.writeImageToBytes(image, ImageFormats.TIFF, params);
@@ -68,10 +68,10 @@ public class MicrosoftTagTest extends Ex
final ExifRewriter rewriter = new ExifRewriter();
final TiffOutputSet outputSet = metadata.getOutputSet();
final TiffOutputDirectory exif = outputSet.getOrCreateExifDirectory();
- exif.add(MicrosoftTagConstants.EXIF_TAG_XPAUTHOR, author);
- exif.add(MicrosoftTagConstants.EXIF_TAG_XPCOMMENT, comment);
- exif.add(MicrosoftTagConstants.EXIF_TAG_XPSUBJECT, subject);
- exif.add(MicrosoftTagConstants.EXIF_TAG_XPTITLE, title);
+ exif.add(MicrosoftTagConstants.EXIF_TAG_XPAUTHOR, AUTHOR);
+ exif.add(MicrosoftTagConstants.EXIF_TAG_XPCOMMENT, COMMENT);
+ exif.add(MicrosoftTagConstants.EXIF_TAG_XPSUBJECT, SUBJECT);
+ exif.add(MicrosoftTagConstants.EXIF_TAG_XPTITLE, TITLE);
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
rewriter.updateExifMetadataLossy(imageWithExif, baos, outputSet);
checkFields(baos.toByteArray());
@@ -79,10 +79,10 @@ public class MicrosoftTagTest extends Ex
private void checkFields(final byte[] file) throws Exception {
final TiffImageMetadata metadata = toTiffMetadata(Imaging.getMetadata(file));
- assertEquals(author, metadata.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPAUTHOR));
- assertEquals(comment, metadata.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPCOMMENT));
- assertEquals(subject, metadata.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPSUBJECT));
- assertEquals(title, metadata.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPTITLE));
+ assertEquals(AUTHOR, metadata.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPAUTHOR));
+ assertEquals(COMMENT, metadata.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPCOMMENT));
+ assertEquals(SUBJECT, metadata.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPSUBJECT));
+ assertEquals(TITLE, metadata.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPTITLE));
}
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java Mon Nov 25 10:05:40 2013
@@ -35,14 +35,14 @@ public abstract class PngBaseTest extend
return format == ImageFormats.PNG;
}
- private static final ImageFilter imageFilter = new ImageFilter() {
+ private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
public boolean accept(final File file) throws IOException, ImageReadException {
return isPng(file);
}
};
protected List<File> getPngImages() throws IOException, ImageReadException {
- return getTestImages(imageFilter);
+ return getTestImages(IMAGE_FILTER);
}
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java?rev=1545202&r1=1545201&r2=1545202&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java Mon Nov 25 10:05:40 2013
@@ -35,14 +35,14 @@ public abstract class TiffBaseTest exten
return format == ImageFormats.TIFF;
}
- private static final ImageFilter imageFilter = new ImageFilter() {
+ private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
public boolean accept(final File file) throws IOException, ImageReadException {
return isTiff(file);
}
};
protected List<File> getTiffImages() throws IOException, ImageReadException {
- return getTestImages(imageFilter);
+ return getTestImages(IMAGE_FILTER);
}
}