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 13:14:12 UTC
svn commit: r1545632 - in
/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging:
formats/bmp/ formats/gif/ formats/icns/ formats/jpeg/iptc/ formats/png/ util/
Author: ebourg
Date: Tue Nov 26 12:14:11 2013
New Revision: 1545632
URL: http://svn.apache.org/r1545632
Log:
Removed ParamMap
Removed:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/ParamMap.java
Modified:
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/icns/IcnsImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.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
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=1545632&r1=1545631&r2=1545632&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 Tue Nov 26 12:14:11 2013
@@ -52,7 +52,6 @@ import org.apache.commons.imaging.format
import org.apache.commons.imaging.palette.PaletteFactory;
import org.apache.commons.imaging.palette.SimplePalette;
import org.apache.commons.imaging.util.IoUtils;
-import org.apache.commons.imaging.util.ParamMap;
public class BmpImageParser extends ImageParser {
private static final String DEFAULT_EXTENSION = ".bmp";
@@ -524,8 +523,7 @@ public class BmpImageParser extends Imag
// make copy of params; we'll clear keys as we consume them.
params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
- final boolean verbose = ParamMap.getParamBoolean(params, PARAM_KEY_VERBOSE,
- false);
+ final boolean verbose = Boolean.TRUE.equals(params.get(PARAM_KEY_VERBOSE));
if (params.containsKey(PARAM_KEY_VERBOSE)) {
params.remove(PARAM_KEY_VERBOSE);
@@ -590,8 +588,7 @@ public class BmpImageParser extends Imag
// make copy of params; we'll clear keys as we consume them.
params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
- final boolean verbose = ParamMap.getParamBoolean(params, PARAM_KEY_VERBOSE,
- false);
+ final boolean verbose = Boolean.TRUE.equals(params.get(PARAM_KEY_VERBOSE));
if (params.containsKey(PARAM_KEY_VERBOSE)) {
params.remove(PARAM_KEY_VERBOSE);
@@ -719,8 +716,7 @@ public class BmpImageParser extends Imag
// make copy of params; we'll clear keys as we consume them.
params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
- final boolean verbose = ParamMap.getParamBoolean(params, PARAM_KEY_VERBOSE,
- false);
+ final boolean verbose = Boolean.TRUE.equals(params.get(PARAM_KEY_VERBOSE));
if (params.containsKey(PARAM_KEY_VERBOSE)) {
params.remove(PARAM_KEY_VERBOSE);
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=1545632&r1=1545631&r2=1545632&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 Tue Nov 26 12:14:11 2013
@@ -47,7 +47,6 @@ import org.apache.commons.imaging.common
import org.apache.commons.imaging.palette.Palette;
import org.apache.commons.imaging.palette.PaletteFactory;
import org.apache.commons.imaging.util.IoUtils;
-import org.apache.commons.imaging.util.ParamMap;
public class GifImageParser extends ImageParser {
private static final String DEFAULT_EXTENSION = ".gif";
@@ -780,8 +779,7 @@ public class GifImageParser extends Imag
// make copy of params; we'll clear keys as we consume them.
params = new HashMap<String,Object>(params);
- final boolean verbose = ParamMap.getParamBoolean(params, PARAM_KEY_VERBOSE,
- false);
+ final boolean verbose = Boolean.TRUE.equals(params.get(PARAM_KEY_VERBOSE));
// clear format key.
if (params.containsKey(PARAM_KEY_FORMAT)) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java?rev=1545632&r1=1545631&r2=1545632&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java Tue Nov 26 12:14:11 2013
@@ -39,7 +39,6 @@ import org.apache.commons.imaging.common
import org.apache.commons.imaging.common.IImageMetadata;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.util.IoUtils;
-import org.apache.commons.imaging.util.ParamMap;
public class IcnsImageParser extends ImageParser {
public static final int ICNS_MAGIC = IcnsType.typeAsInt("icns");
@@ -87,8 +86,6 @@ public class IcnsImageParser extends Ima
// make copy of params; we'll clear keys as we consume them.
params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
- ParamMap.getParamBoolean(params, PARAM_KEY_VERBOSE, false);
-
if (params.containsKey(PARAM_KEY_VERBOSE)) {
params.remove(PARAM_KEY_VERBOSE);
}
@@ -119,8 +116,6 @@ public class IcnsImageParser extends Ima
// make copy of params; we'll clear keys as we consume them.
params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
- ParamMap.getParamBoolean(params, PARAM_KEY_VERBOSE, false);
-
if (params.containsKey(PARAM_KEY_VERBOSE)) {
params.remove(PARAM_KEY_VERBOSE);
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java?rev=1545632&r1=1545631&r2=1545632&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java Tue Nov 26 12:14:11 2013
@@ -37,7 +37,6 @@ import org.apache.commons.imaging.common
import org.apache.commons.imaging.formats.jpeg.JpegConstants;
import org.apache.commons.imaging.util.Debug;
import org.apache.commons.imaging.util.IoUtils;
-import org.apache.commons.imaging.util.ParamMap;
public class IptcParser extends BinaryFileParser {
private static final ByteOrder APP13_BYTE_ORDER = ByteOrder.BIG_ENDIAN;
@@ -96,10 +95,8 @@ public class IptcParser extends BinaryFi
*/
public PhotoshopApp13Data parsePhotoshopSegment(final byte bytes[], final Map<String,Object> params)
throws ImageReadException, IOException {
- final boolean strict = ParamMap.getParamBoolean(params,
- ImagingConstants.PARAM_KEY_STRICT, false);
- final boolean verbose = ParamMap.getParamBoolean(params,
- ImagingConstants.PARAM_KEY_VERBOSE, false);
+ final boolean strict = params != null && Boolean.TRUE.equals(params.get(ImagingConstants.PARAM_KEY_STRICT));
+ final boolean verbose = params != null && Boolean.TRUE.equals(params.get(ImagingConstants.PARAM_KEY_VERBOSE));
return parsePhotoshopSegment(bytes, verbose, strict);
}
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=1545632&r1=1545631&r2=1545632&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 Tue Nov 26 12:14:11 2013
@@ -61,7 +61,6 @@ import org.apache.commons.imaging.format
import org.apache.commons.imaging.formats.png.transparencyfilters.TransparencyFilterTrueColor;
import org.apache.commons.imaging.icc.IccProfileParser;
import org.apache.commons.imaging.util.IoUtils;
-import org.apache.commons.imaging.util.ParamMap;
public class PngImageParser extends ImageParser {
private static final String DEFAULT_EXTENSION = ".png";
@@ -634,7 +633,6 @@ public class PngImageParser extends Imag
@Override
public BufferedImage getBufferedImage(final ByteSource byteSource, final Map<String,Object> params)
throws ImageReadException, IOException {
- ParamMap.getParamBoolean(params, PARAM_KEY_VERBOSE, false);
if (params.containsKey(PARAM_KEY_VERBOSE)) {
params.remove(PARAM_KEY_VERBOSE);
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=1545632&r1=1545631&r2=1545632&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 Tue Nov 26 12:14:11 2013
@@ -34,7 +34,6 @@ import org.apache.commons.imaging.palett
import org.apache.commons.imaging.palette.PaletteFactory;
import org.apache.commons.imaging.palette.SimplePalette;
import org.apache.commons.imaging.util.Debug;
-import org.apache.commons.imaging.util.ParamMap;
public class PngWriter {
private final boolean verbose;
@@ -44,8 +43,7 @@ public class PngWriter {
}
public PngWriter(final Map<String,Object> params) {
- this.verbose = ParamMap.getParamBoolean(params, ImagingConstants.PARAM_KEY_VERBOSE,
- false);
+ this.verbose = params != null && Boolean.TRUE.equals(params.get(ImagingConstants.PARAM_KEY_VERBOSE));
}
/*
@@ -461,10 +459,8 @@ public class PngWriter {
byte colorType;
{
- final boolean forceIndexedColor = ParamMap.getParamBoolean(params,
- PngConstants.PARAM_KEY_PNG_FORCE_INDEXED_COLOR, false);
- final boolean forceTrueColor = ParamMap.getParamBoolean(params,
- PngConstants.PARAM_KEY_PNG_FORCE_TRUE_COLOR, false);
+ final boolean forceIndexedColor = Boolean.TRUE.equals(params.get(PngConstants.PARAM_KEY_PNG_FORCE_INDEXED_COLOR));
+ final boolean forceTrueColor = Boolean.TRUE.equals(params.get(PngConstants.PARAM_KEY_PNG_FORCE_TRUE_COLOR));
if (forceIndexedColor && forceTrueColor) {
throw new ImageWriteException(