You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by dv...@apache.org on 2007/02/02 09:52:57 UTC
svn commit: r502538 - in /xmlgraphics/batik/trunk:
sources-1.4/org/apache/batik/dom/util/
sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/
sources/org/apache/batik/bridge/ sources/org/apache/batik/bridge/svg12/
sources/org/apache/batik/css/eng...
Author: dvholten
Date: Fri Feb 2 00:52:56 2007
New Revision: 502538
URL: http://svn.apache.org/viewvc?view=rev&rev=502538
Log:
1.) delete unused imports
2.) add missing svn-attributes
Modified:
xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/dom/util/DOMUtilitiesSupport.java (props changed)
xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/AbstractImageIORegistryEntry.java (props changed)
xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIODebugUtil.java (props changed)
xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOImageWriter.java (props changed)
xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOJPEGImageWriter.java (props changed)
xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOJPEGRegistryEntry.java (props changed)
xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOPNGImageWriter.java (props changed)
xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOPNGRegistryEntry.java (props changed)
xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOTIFFImageWriter.java (props changed)
xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOTIFFRegistryEntry.java (props changed)
xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/PNGTranscoderImageIOWriteAdapter.java (props changed)
xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/TIFFTranscoderImageIOWriteAdapter.java (props changed)
xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGFontFaceElementBridge.java
xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12ScriptingEnvironment.java
xmlgraphics/batik/trunk/sources/org/apache/batik/css/engine/SystemColorSupport.java
xmlgraphics/batik/trunk/sources/org/apache/batik/css/engine/value/svg12/LineHeightManager.java
xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageWriter.java (contents, props changed)
xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGRed.java
xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGTranscoderInternalCodecWriteAdapter.java (contents, props changed)
xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFTranscoderInternalCodecWriteAdapter.java
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFPainter.java
Propchange: xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/dom/util/DOMUtilitiesSupport.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/AbstractImageIORegistryEntry.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIODebugUtil.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOImageWriter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOJPEGImageWriter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOJPEGRegistryEntry.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOPNGImageWriter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOPNGRegistryEntry.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOTIFFImageWriter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOTIFFRegistryEntry.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/PNGTranscoderImageIOWriteAdapter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/TIFFTranscoderImageIOWriteAdapter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGFontFaceElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGFontFaceElementBridge.java?view=diff&rev=502538&r1=502537&r2=502538
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGFontFaceElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGFontFaceElementBridge.java Fri Feb 2 00:52:56 2007
@@ -153,7 +153,7 @@
(null, SVG_DESCENT_ATTRIBUTE);
if (descentStr.length() == 0) {
// set it to be unitsPerEm *.2.
- descentStr = String.valueOf(unitsPerEm*.2);
+ descentStr = String.valueOf(unitsPerEm*0.2);
}
float descent;
try {
@@ -286,7 +286,7 @@
}
/**
- * the returned list may contains Strings or ParsedURLs
+ * the returned list may contain Strings and ParsedURLs
*/
public List getFontFaceSrcs(Element fontFaceElement) {
// Search for a font-face-src element
@@ -321,14 +321,14 @@
ParsedURL purl;
if (base != null) purl = new ParsedURL(base, uri);
else purl = new ParsedURL(uri);
- ret.add(purl); // todo here we stuff a ParsedURL
+ ret.add(purl); // here we add a ParsedURL
continue;
}
if (n.getLocalName().equals(SVG_FONT_FACE_NAME_TAG)) {
Element ffname = (Element)n;
- String s = ffname.getAttribute("name"); // todo here we stuff a String
+ String s = ffname.getAttribute("name");
if (s.length() != 0)
- ret.add(s);
+ ret.add(s); // here we add a String
}
}
return ret;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12ScriptingEnvironment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12ScriptingEnvironment.java?view=diff&rev=502538&r1=502537&r2=502538
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12ScriptingEnvironment.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12ScriptingEnvironment.java Fri Feb 2 00:52:56 2007
@@ -23,7 +23,6 @@
import org.apache.batik.bridge.Messages;
import org.apache.batik.bridge.ScriptingEnvironment;
import org.apache.batik.bridge.SVGUtilities;
-import org.apache.batik.bridge.svg12.SVG12BridgeContext;
import org.apache.batik.dom.AbstractDocument;
import org.apache.batik.dom.AbstractElement;
import org.apache.batik.dom.events.EventSupport;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/css/engine/SystemColorSupport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/css/engine/SystemColorSupport.java?view=diff&rev=502538&r1=502537&r2=502538
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/css/engine/SystemColorSupport.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/css/engine/SystemColorSupport.java Fri Feb 2 00:52:56 2007
@@ -22,7 +22,6 @@
import java.awt.SystemColor;
import java.util.HashMap;
import java.util.Map;
-import java.util.Locale;
import org.apache.batik.css.engine.value.FloatValue;
import org.apache.batik.css.engine.value.RGBColorValue;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/css/engine/value/svg12/LineHeightManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/css/engine/value/svg12/LineHeightManager.java?view=diff&rev=502538&r1=502537&r2=502538
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/css/engine/value/svg12/LineHeightManager.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/css/engine/value/svg12/LineHeightManager.java Fri Feb 2 00:52:56 2007
@@ -24,7 +24,6 @@
import org.apache.batik.css.engine.StyleMap;
import org.apache.batik.css.engine.value.LengthManager;
import org.apache.batik.css.engine.value.FloatValue;
-import org.apache.batik.css.engine.value.svg12.SVG12ValueConstants;
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.SVG12CSSConstants;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageWriter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageWriter.java?view=diff&rev=502538&r1=502537&r2=502538
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageWriter.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageWriter.java Fri Feb 2 00:52:56 2007
@@ -22,12 +22,11 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.batik.ext.awt.image.codec.png.PNGImageEncoder;
import org.apache.batik.ext.awt.image.spi.ImageWriter;
import org.apache.batik.ext.awt.image.spi.ImageWriterParams;
/**
- * ImageWriter implementation that uses Batik's PNG codec to
+ * ImageWriter implementation that uses Batik's PNG codec to
* write PNG files.
*
* @version $Id$
Propchange: xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageWriter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGRed.java?view=diff&rev=502538&r1=502537&r2=502538
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGRed.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGRed.java Fri Feb 2 00:52:56 2007
@@ -43,7 +43,6 @@
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.TimeZone;
-import java.util.Vector;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -60,7 +59,6 @@
*
* @version $Id$
*/
-
public class PNGRed extends AbstractRed {
static class PNGChunk {
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGTranscoderInternalCodecWriteAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGTranscoderInternalCodecWriteAdapter.java?view=diff&rev=502538&r1=502537&r2=502538
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGTranscoderInternalCodecWriteAdapter.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGTranscoderInternalCodecWriteAdapter.java Fri Feb 2 00:52:56 2007
@@ -22,8 +22,6 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.batik.ext.awt.image.codec.png.PNGEncodeParam;
-import org.apache.batik.ext.awt.image.codec.png.PNGImageEncoder;
import org.apache.batik.ext.awt.image.rendered.IndexImage;
import org.apache.batik.transcoder.TranscoderException;
import org.apache.batik.transcoder.TranscoderOutput;
@@ -31,7 +29,7 @@
import org.apache.batik.transcoder.image.PNGTranscoder;
/**
- * This class is a helper to <tt>PNGTranscoder</tt> that writes PNG images
+ * This class is a helper to <tt>PNGTranscoder</tt> that writes PNG images
* through the internal PNG codec.
*
* @version $Id$
@@ -40,7 +38,7 @@
PNGTranscoder.WriteAdapter {
/**
- * @throws TranscoderException
+ * @throws TranscoderException
* @see org.apache.batik.transcoder.image.PNGTranscoder.WriteAdapter#writeImage(org.apache.batik.transcoder.image.PNGTranscoder, java.awt.image.BufferedImage, org.apache.batik.transcoder.TranscoderOutput)
*/
public void writeImage(PNGTranscoder transcoder, BufferedImage img,
@@ -50,7 +48,7 @@
int n=-1;
if (hints.containsKey(PNGTranscoder.KEY_INDEXED)) {
n=((Integer)hints.get(PNGTranscoder.KEY_INDEXED)).intValue();
- if (n==1||n==2||n==4||n==8)
+ if (n==1||n==2||n==4||n==8)
//PNGEncodeParam.Palette can handle these numbers only.
img = IndexImage.getIndexedImage(img,1<<n);
}
Propchange: xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGTranscoderInternalCodecWriteAdapter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFTranscoderInternalCodecWriteAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFTranscoderInternalCodecWriteAdapter.java?view=diff&rev=502538&r1=502537&r2=502538
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFTranscoderInternalCodecWriteAdapter.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFTranscoderInternalCodecWriteAdapter.java Fri Feb 2 00:52:56 2007
@@ -28,10 +28,6 @@
import java.io.OutputStream;
import org.apache.batik.ext.awt.image.GraphicsUtil;
-import org.apache.batik.ext.awt.image.codec.tiff.TIFFEncodeParam;
-import org.apache.batik.ext.awt.image.codec.tiff.TIFFField;
-import org.apache.batik.ext.awt.image.codec.tiff.TIFFImageDecoder;
-import org.apache.batik.ext.awt.image.codec.tiff.TIFFImageEncoder;
import org.apache.batik.ext.awt.image.rendered.FormatRed;
import org.apache.batik.transcoder.TranscoderException;
import org.apache.batik.transcoder.TranscoderOutput;
@@ -39,7 +35,7 @@
import org.apache.batik.transcoder.image.TIFFTranscoder;
/**
- * This class is a helper to <tt>TIFFTranscoder</tt> that writes TIFF images
+ * This class is a helper to <tt>TIFFTranscoder</tt> that writes TIFF images
* through the internal TIFF codec.
*
* @version $Id$
@@ -48,7 +44,7 @@
TIFFTranscoder.WriteAdapter {
/**
- * @throws TranscoderException
+ * @throws TranscoderException
* @see org.apache.batik.transcoder.image.PNGTranscoder.WriteAdapter#writeImage(org.apache.batik.transcoder.image.PNGTranscoder, java.awt.image.BufferedImage, org.apache.batik.transcoder.TranscoderOutput)
*/
public void writeImage(TIFFTranscoder transcoder, BufferedImage img,
@@ -59,19 +55,19 @@
float PixSzMM = transcoder.getUserAgent().getPixelUnitToMillimeter();
// num Pixs in 100 Meters
- int numPix = (int)(((1000 * 100) / PixSzMM) + 0.5);
+ int numPix = (int)(((1000 * 100) / PixSzMM) + 0.5);
int denom = 100 * 100; // Centimeters per 100 Meters;
long [] rational = {numPix, denom};
TIFFField [] fields = {
- new TIFFField(TIFFImageDecoder.TIFF_RESOLUTION_UNIT,
- TIFFField.TIFF_SHORT, 1,
+ new TIFFField(TIFFImageDecoder.TIFF_RESOLUTION_UNIT,
+ TIFFField.TIFF_SHORT, 1,
new char [] { (char)3 }),
- new TIFFField(TIFFImageDecoder.TIFF_X_RESOLUTION,
- TIFFField.TIFF_RATIONAL, 1,
+ new TIFFField(TIFFImageDecoder.TIFF_X_RESOLUTION,
+ TIFFField.TIFF_RATIONAL, 1,
new long [][] { rational }),
- new TIFFField(TIFFImageDecoder.TIFF_Y_RESOLUTION,
- TIFFField.TIFF_RATIONAL, 1,
- new long [][] { rational })
+ new TIFFField(TIFFImageDecoder.TIFF_Y_RESOLUTION,
+ TIFFField.TIFF_RATIONAL, 1,
+ new long [][] { rational })
};
params.setExtraFields(fields);
@@ -98,7 +94,7 @@
SinglePixelPackedSampleModel sppsm;
sppsm = (SinglePixelPackedSampleModel)img.getSampleModel();
OutputStream ostream = output.getOutputStream();
- TIFFImageEncoder tiffEncoder =
+ TIFFImageEncoder tiffEncoder =
new TIFFImageEncoder(ostream, params);
int bands = sppsm.getNumBands();
int [] off = new int[bands];
@@ -106,7 +102,7 @@
off[i] = i;
SampleModel sm = new PixelInterleavedSampleModel
(DataBuffer.TYPE_BYTE, w, h, bands, w * bands, off);
-
+
RenderedImage rimg = new FormatRed(GraphicsUtil.wrap(img), sm);
tiffEncoder.encode(rimg);
ostream.flush();
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFPainter.java?view=diff&rev=502538&r1=502537&r2=502538
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFPainter.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFPainter.java Fri Feb 2 00:52:56 2007
@@ -20,7 +20,6 @@
package org.apache.batik.transcoder.wmf.tosvg;
import java.io.BufferedInputStream;
-import java.io.UnsupportedEncodingException;
import java.awt.Font;
import java.awt.Dimension;
import java.awt.Graphics2D;