diff --git a/htroot/NetworkPicture.java b/htroot/NetworkPicture.java
index edfa0ead7..1898a634e 100644
--- a/htroot/NetworkPicture.java
+++ b/htroot/NetworkPicture.java
@@ -136,7 +136,7 @@ public class NetworkPicture
env.getConfig(SwitchboardConstants.NETWORK_NAME, "unspecified"),
env.getConfig("network.unit.description", "unspecified"),
bgcolor,
- cyc).getImage(), "png");
+ cyc), "png");
lastAccessSeconds = System.currentTimeMillis() / 1000;
sync.release();
diff --git a/source/net/yacy/kelondro/util/ByteBuffer.java b/source/net/yacy/kelondro/util/ByteBuffer.java
index 37377e221..dbe868061 100644
--- a/source/net/yacy/kelondro/util/ByteBuffer.java
+++ b/source/net/yacy/kelondro/util/ByteBuffer.java
@@ -184,6 +184,10 @@ public final class ByteBuffer extends OutputStream {
return tmp;
}
+ public void copyTo(byte[] otherArray, int offset) {
+ System.arraycopy(this.buffer, 0, otherArray, offset, this.length);
+ }
+
public ByteBuffer trim(final int start) {
this.offset += start;
this.length -= start;
diff --git a/source/net/yacy/peers/graphics/EncodedImage.java b/source/net/yacy/peers/graphics/EncodedImage.java
index 6fae28687..9fa99fdd3 100644
--- a/source/net/yacy/peers/graphics/EncodedImage.java
+++ b/source/net/yacy/peers/graphics/EncodedImage.java
@@ -1,7 +1,5 @@
package net.yacy.peers.graphics;
-import java.awt.image.BufferedImage;
-
import net.yacy.kelondro.util.ByteBuffer;
import net.yacy.visualization.RasterPlotter;
@@ -9,8 +7,8 @@ public class EncodedImage {
private ByteBuffer image;
private String extension;
- public EncodedImage(final BufferedImage sourceImage, final String targetExt) {
- this.image = RasterPlotter.exportImage(sourceImage, targetExt);
+ public EncodedImage(final RasterPlotter sourceImage, final String targetExt) {
+ this.image = "png".equals(targetExt) ? sourceImage.exportPng() : RasterPlotter.exportImage(sourceImage.getImage(), targetExt);
this.extension = targetExt;
}
diff --git a/source/net/yacy/server/http/HTTPDFileHandler.java b/source/net/yacy/server/http/HTTPDFileHandler.java
index ecd5b75e8..6cb6a36f3 100644
--- a/source/net/yacy/server/http/HTTPDFileHandler.java
+++ b/source/net/yacy/server/http/HTTPDFileHandler.java
@@ -591,12 +591,20 @@ public final class HTTPDFileHandler {
targetDate = new Date(System.currentTimeMillis());
nocache = true;
final String mimeType = Classification.ext2mime(targetExt, "text/html");
- final ByteBuffer result = RasterPlotter.exportImage(yp.getImage(), targetExt);
-
// write the array to the client
- HTTPDemon.sendRespondHeader(conProp, out, httpVersion, 200, null, mimeType, result.length(), targetDate, null, null, null, null, nocache);
- if (!method.equals(HeaderFramework.METHOD_HEAD)) {
- result.writeTo(out);
+ if ("png".equals(targetExt)) {
+ final byte[] result = ((RasterPlotter) img).pngEncode(1);
+ HTTPDemon.sendRespondHeader(conProp, out, httpVersion, 200, null, mimeType, result.length, targetDate, null, null, null, null, nocache);
+ if (!method.equals(HeaderFramework.METHOD_HEAD)) {
+ out.write(result);
+ }
+ } else {
+ final ByteBuffer result = RasterPlotter.exportImage(yp.getImage(), targetExt);
+ HTTPDemon.sendRespondHeader(conProp, out, httpVersion, 200, null, mimeType, result.length(), targetDate, null, null, null, null, nocache);
+ if (!method.equals(HeaderFramework.METHOD_HEAD)) {
+ result.writeTo(out);
+ }
+ result.close();
}
}
if (img instanceof EncodedImage) {
diff --git a/source/net/yacy/visualization/ChartPlotter.java b/source/net/yacy/visualization/ChartPlotter.java
index c753b97f8..f6937b637 100644
--- a/source/net/yacy/visualization/ChartPlotter.java
+++ b/source/net/yacy/visualization/ChartPlotter.java
@@ -29,10 +29,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import javax.imageio.ImageIO;
-
import net.yacy.kelondro.logging.Log;
-import net.yacy.kelondro.util.ByteBuffer;
public class ChartPlotter extends RasterPlotter {
diff --git a/source/net/yacy/visualization/PngEncoder.java b/source/net/yacy/visualization/PngEncoder.java
deleted file mode 100644
index 1ee1d513c..000000000
--- a/source/net/yacy/visualization/PngEncoder.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * PngEncoder takes a Java Image object and creates a byte string which can be saved as a PNG file.
- * The Image is presumed to use the DirectColorModel.
- *
- * Thanks to Jay Denny at KeyPoint Software
- * http://www.keypoint.com/
- * who let me develop this code on company time.
- *
- * You may contact me with (probably very-much-needed) improvements,
- * comments, and bug fixes at:
- *
- * david@catcode.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * A copy of the GNU LGPL may be found at
- * http://www.gnu.org/copyleft/lesser.html
- *
- * @author J. David Eisenberg
- * @version 1.5, 19 Oct 2003
- *
- * CHANGES:
- * --------
- * 19-Nov-2002 : CODING STYLE CHANGES ONLY (by David Gilbert for Object Refinery Limited);
- * 19-Sep-2003 : Fix for platforms using EBCDIC (contributed by Paulo Soares);
- * 19-Oct-2003 : Change private fields to private fields so that
- * PngEncoderB can inherit them (JDE)
- * Fixed bug with calculation of nRows
- * 23.10.2012
- * For the integration into YaCy this class was adopted to YaCy graphics by Michael Christen:
- * - removed alpha encoding
- * - removed not used code
- * - inlined static values
- * - inlined all methods that had been called only once
- * - moved class objects which appear after all refactoring only within a single method into this method
- * - removed a giant number of useless (obvious things) comments and empty lines to increase readability (!)
- * - new order of data computation: first compute the size of compressed deflater output,
- * then assign an exact-sized byte[] which makes resizing afterwards superfluous
- * - after all enhancements all class objects were removed; result is just one short static method
- * - made objects final where possible
- * - prepared process for concurrency: PixelGrabber.grabPixels is the main time-consuming process. This shall be done in concurrency.
- * - added concurrent processes to call the PixelGrabber and framework to do that (queues)
- */
-
-package net.yacy.visualization;
-
-import java.awt.Image;
-import java.awt.image.ImageObserver;
-import java.awt.image.PixelGrabber;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.zip.CRC32;
-import java.util.zip.Deflater;
-import java.util.zip.DeflaterOutputStream;
-
-public class PngEncoder extends Object {
-
- private static final int[] POISON_IN = new int[0];
- private static final byte IHDR[] = {73, 72, 68, 82};
- private static final byte IDAT[] = {73, 68, 65, 84};
- private static final byte IEND[] = {73, 69, 78, 68};
-
- public final static byte[] pngEncode(final Image image, final int compressionLevel) throws IOException {
- if (image == null) throw new IOException("image == null");
- final int width = image.getWidth(null);
- final int height = image.getHeight(null);
-
- final TreeMap scan = new TreeMap();
- if (height > 80) {
- // prepare an input list for concurrent PixelGrabber computation
- final BlockingQueue grabberInput = new LinkedBlockingQueue();
- int startRow = 0; // starting row to process this time through
- int rowsLeft = height; // number of rows remaining to write
- while (rowsLeft > 0) {
- int nRows = Math.max(Math.min(32767 / (width * 4), rowsLeft), 1); // how many rows to grab at a time
- grabberInput.add(new int[]{startRow, nRows});
- startRow += nRows;
- rowsLeft -= nRows;
- }
- // do the PixelGrabber computation and allocate the result in the right order
- ArrayList ts = new ArrayList();
- int tc = Math.max(2, Math.min(1 + grabberInput.size() / 40, Runtime.getRuntime().availableProcessors()));
- for (int i = 0; i < tc; i++) {
- grabberInput.add(POISON_IN);
- Thread t = new Thread() {
- public void run() {
- int[] gi;
- try {
- while ((gi = grabberInput.take()) != POISON_IN) pixelGrabber(image, width, gi[0], gi[1], scan);
- } catch (InterruptedException e) {} catch (IOException e) {}
- }
- };
- t.start();
- ts.add(t);
- if (grabberInput.size() == 0) break;
- }
- for (Thread t: ts) try {t.join();} catch (InterruptedException e) {}
- } else {
- int startRow = 0; // starting row to process this time through
- int rowsLeft = height; // number of rows remaining to write
- while (rowsLeft > 0) {
- int nRows = Math.max(Math.min(32767 / (width * 4), rowsLeft), 1); // how many rows to grab at a time
- pixelGrabber(image, width, startRow, nRows, scan);
- startRow += nRows;
- rowsLeft -= nRows;
- }
- }
-
- // finally write the result of the concurrent calculation into an DeflaterOutputStream to compress the png
- final Deflater scrunch = new Deflater(compressionLevel);
- ByteArrayOutputStream outBytes = new ByteArrayOutputStream(1024);
- final DeflaterOutputStream compBytes = new DeflaterOutputStream(outBytes, scrunch);
- for (Map.Entry entry: scan.entrySet()) compBytes.write(entry.getValue());
- compBytes.close();
- final byte[] compressedLines = outBytes.toByteArray();
- outBytes.close();
- outBytes = null;
- final int nCompressed = compressedLines.length;
- final byte[] pngBytes = new byte[nCompressed + 57]; // yes thats the exact size, not too less, not too much. No resizing needed.
- int bytePos = writeBytes(pngBytes, new byte[]{-119, 80, 78, 71, 13, 10, 26, 10}, 0);
- final int startPos = bytePos = writeInt4(pngBytes, 13, bytePos);
- bytePos = writeBytes(pngBytes, IHDR, bytePos);
- bytePos = writeInt4(pngBytes, width, bytePos);
- bytePos = writeInt4(pngBytes, height, bytePos);
- bytePos = writeBytes(pngBytes, new byte[]{8, 2, 0, 0, 0}, bytePos);
- final CRC32 crc = new CRC32();
- crc.reset();
- crc.update(pngBytes, startPos, bytePos - startPos);
- bytePos = writeInt4(pngBytes, (int) crc.getValue(), bytePos);
- crc.reset();
- bytePos = writeInt4(pngBytes, nCompressed, bytePos);
- bytePos = writeBytes(pngBytes, IDAT, bytePos);
- crc.update(IDAT);
- System.arraycopy(compressedLines, 0, pngBytes, bytePos, nCompressed);
- bytePos += nCompressed;
- crc.update(compressedLines, 0, nCompressed);
- bytePos = writeInt4(pngBytes, (int) crc.getValue(), bytePos);
- scrunch.finish();
- bytePos = writeInt4(pngBytes, 0, bytePos);
- bytePos = writeBytes(pngBytes, IEND, bytePos);
- crc.reset();
- crc.update(IEND);
- bytePos = writeInt4(pngBytes, (int) crc.getValue(), bytePos);
- return pngBytes;
- }
-
- private final static int writeInt4(final byte[] target, final int n, final int offset) {
- return writeBytes(target, new byte[]{(byte) ((n >> 24) & 0xff), (byte) ((n >> 16) & 0xff), (byte) ((n >> 8) & 0xff), (byte) (n & 0xff)}, offset);
- }
-
- private final static int writeBytes(final byte[] target, final byte[] data, final int offset) {
- System.arraycopy(data, 0, target, offset, data.length);
- return offset + data.length;
- }
-
- private final static void pixelGrabber(final Image image, final int width, int y, int nRows, TreeMap scan) throws IOException {
- int[] pixels = new int[width * nRows];
- PixelGrabber pg = new PixelGrabber(image, 0, y, width, nRows, pixels, 0, width);
- try {pg.grabPixels();} catch (InterruptedException e) {throw new IOException("interrupted waiting for pixels!");}
- if ((pg.getStatus() & ImageObserver.ABORT) != 0) throw new IOException("image fetch aborted or errored");
- try {
- ByteArrayOutputStream scanLines = new ByteArrayOutputStream(width * nRows * 3 + width);
- for (int i = 0; i < width * nRows; i++) {
- if (i % width == 0) scanLines.write(0);
- scanLines.write((pixels[i] >> 16) & 0xff);
- scanLines.write((pixels[i] >> 8) & 0xff);
- scanLines.write((pixels[i]) & 0xff);
- }
- synchronized (scan) {scan.put(y, scanLines.toByteArray());}
- scanLines.close();
- } catch (OutOfMemoryError e) {
- throw new IOException("out of memory, needed bytes: " + width * nRows * 4);
- }
- }
-
-}
diff --git a/source/net/yacy/visualization/RasterPlotter.java b/source/net/yacy/visualization/RasterPlotter.java
index 74d447f29..4f21f4d1e 100644
--- a/source/net/yacy/visualization/RasterPlotter.java
+++ b/source/net/yacy/visualization/RasterPlotter.java
@@ -35,11 +35,25 @@ package net.yacy.visualization;
import java.awt.Color;
import java.awt.Graphics2D;
+import java.awt.Transparency;
+import java.awt.color.ColorSpace;
import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
+import java.awt.image.ComponentColorModel;
+import java.awt.image.ComponentSampleModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.DataBufferByte;
+import java.awt.image.Raster;
import java.awt.image.WritableRaster;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStream;
+import java.util.zip.CRC32;
+import java.util.zip.Deflater;
+import java.util.zip.DeflaterOutputStream;
import javax.imageio.ImageIO;
@@ -69,12 +83,13 @@ public class RasterPlotter {
protected final int width, height;
private final int[] cc;
- private BufferedImage image;
- private final WritableRaster grid;
+ private BufferedImage image;
+ private WritableRaster grid;
private int defaultColR, defaultColG, defaultColB;
private final long backgroundCol;
private DrawMode defaultMode;
-
+ private byte[] frame;
+
public RasterPlotter(final int width, final int height, final DrawMode drawMode, final String backgroundColor) {
this(width, height, drawMode, Long.parseLong(backgroundColor, 16));
}
@@ -89,15 +104,16 @@ public class RasterPlotter {
this.defaultColB = 0xFF;
this.defaultMode = drawMode;
try {
- this.image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
- /*
- byte[] frame = new byte[width * height * 3];
+ // we need our own frame buffer to get a very, very fast transformation to png because we can omit the PixedGrabber, which is up to 800 times slower
+ // see: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4835595
+ this.frame = new byte[width * height * 3];
DataBuffer videoBuffer = new DataBufferByte(frame, frame.length);
- ComponentSampleModel sampleModel = new ComponentSampleModel(DataBuffer.TYPE_BYTE, width, height, 3, width*3, new int[] {2,1,0});
- Raster raster = Raster.createRaster(sampleModel, videoBuffer, null);
- this.image.setData(raster);
- */
+ ComponentSampleModel sampleModel = new ComponentSampleModel(DataBuffer.TYPE_BYTE, width, height, 3, width * 3, new int[] {0, 1, 2});
+ this.grid = Raster.createWritableRaster(sampleModel, videoBuffer, null);
+ ColorModel colorModel = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB), null, false, false, Transparency.OPAQUE, DataBuffer.TYPE_BYTE);
+ this.image = new BufferedImage(colorModel, this.grid, false, null);
} catch (final OutOfMemoryError e) {
+ this.frame = null;
try {
this.image = new BufferedImage(width, height, BufferedImage.TYPE_BYTE_INDEXED);
} catch (final OutOfMemoryError ee) {
@@ -107,9 +123,9 @@ public class RasterPlotter {
this.image = new BufferedImage(1, 1, BufferedImage.TYPE_BYTE_BINARY);
}
}
+ this.grid = this.image.getRaster();
}
clear();
- this.grid = this.image.getRaster();
}
/**
@@ -758,7 +774,6 @@ public class RasterPlotter {
public static ByteBuffer exportImage(final BufferedImage image, final String targetExt) {
// generate an byte array from the given image
- if ("png".equals(targetExt)) return exportPng(image);
final ByteBuffer baos = new ByteBuffer();
ImageIO.setUseCache(false); // because we write into ram here
try {
@@ -771,10 +786,10 @@ public class RasterPlotter {
}
}
- public static ByteBuffer exportPng(final BufferedImage image) {
+ public ByteBuffer exportPng() {
try {
final ByteBuffer baos = new ByteBuffer();
- byte[] pngbytes = PngEncoder.pngEncode(image, 1);
+ byte[] pngbytes = pngEncode(1);
if (pngbytes == null) return null;
baos.write(pngbytes);
baos.flush();
@@ -785,8 +800,90 @@ public class RasterPlotter {
Log.logException(e);
return null;
}
- }
+ }
+
+ /*
+ * The following code was transformed from a library, coded by J. David Eisenberg, version 1.5, 19 Oct 2003 (C) LGPL
+ * This code was very strongly transformed into the following very short method for an ultra-fast png generation.
+ * These changes had been made 23.10.2012 by [MC] to the original code:
+ * For the integration into YaCy this class was adopted to YaCy graphics by Michael Christen:
+ * - removed alpha encoding
+ * - removed not used code
+ * - inlined static values
+ * - inlined all methods that had been called only once
+ * - moved class objects which appear after all refactoring only within a single method into this method
+ * - removed a giant number of useless (obvious things) comments and empty lines to increase readability (!)
+ * - new order of data computation: first compute the size of compressed deflater output,
+ * then assign an exact-sized byte[] which makes resizing afterwards superfluous
+ * - after all enhancements all class objects were removed; result is just one short static method
+ * - made objects final where possible
+ * - removed the PixelGrabber call and replaced it with a call to this.frame which is just a byte[]
+ * - added more speed woodoo like a buffer around the deflater which makes this much faster
+ */
+
+ private static final byte IHDR[] = {73, 72, 68, 82};
+ private static final byte IDAT[] = {73, 68, 65, 84};
+ private static final byte IEND[] = {73, 69, 78, 68};
+
+ public final byte[] pngEncode(final int compressionLevel) throws IOException {
+ if (this.frame == null) return exportImage(this.getImage(), "png").getBytes();
+ final int width = image.getWidth(null);
+ final int height = image.getHeight(null);
+
+ final Deflater scrunch = new Deflater(compressionLevel);
+ ByteBuffer outBytes = new ByteBuffer(1024);
+ final OutputStream compBytes = new BufferedOutputStream(new DeflaterOutputStream(outBytes, scrunch));
+ int i = 0;
+ for (int row = 0; row < height; row++) {
+ compBytes.write(0);
+ for (int column = 0; column < width; column++) {
+ compBytes.write(frame, i, 3); // this replaces the whole PixelGrabber process which makes it probably more than 800x faster. See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4835595
+ i += 3;
+ }
+ }
+ compBytes.close();
+
+ // finally write the result of the concurrent calculation into an DeflaterOutputStream to compress the png
+ final int nCompressed = outBytes.length();
+ final byte[] pngBytes = new byte[nCompressed + 57]; // yes thats the exact size, not too less, not too much. No resizing needed.
+ int bytePos = writeBytes(pngBytes, new byte[]{-119, 80, 78, 71, 13, 10, 26, 10}, 0);
+ final int startPos = bytePos = writeInt4(pngBytes, 13, bytePos);
+ bytePos = writeBytes(pngBytes, IHDR, bytePos);
+ bytePos = writeInt4(pngBytes, width, bytePos);
+ bytePos = writeInt4(pngBytes, height, bytePos);
+ bytePos = writeBytes(pngBytes, new byte[]{8, 2, 0, 0, 0}, bytePos);
+ final CRC32 crc = new CRC32();
+ crc.reset();
+ crc.update(pngBytes, startPos, bytePos - startPos);
+ bytePos = writeInt4(pngBytes, (int) crc.getValue(), bytePos);
+ crc.reset();
+ bytePos = writeInt4(pngBytes, nCompressed, bytePos);
+ bytePos = writeBytes(pngBytes, IDAT, bytePos);
+ crc.update(IDAT);
+ outBytes.copyTo(pngBytes, bytePos);
+ outBytes.close();
+ outBytes = null;
+ crc.update(pngBytes, bytePos, nCompressed);
+ bytePos += nCompressed;
+ bytePos = writeInt4(pngBytes, (int) crc.getValue(), bytePos);
+ scrunch.finish();
+ bytePos = writeInt4(pngBytes, 0, bytePos);
+ bytePos = writeBytes(pngBytes, IEND, bytePos);
+ crc.reset();
+ crc.update(IEND);
+ bytePos = writeInt4(pngBytes, (int) crc.getValue(), bytePos);
+ return pngBytes;
+ }
+
+ private final static int writeInt4(final byte[] target, final int n, final int offset) {
+ return writeBytes(target, new byte[]{(byte) ((n >> 24) & 0xff), (byte) ((n >> 16) & 0xff), (byte) ((n >> 8) & 0xff), (byte) (n & 0xff)}, offset);
+ }
+ private final static int writeBytes(final byte[] target, final byte[] data, final int offset) {
+ System.arraycopy(data, 0, target, offset, data.length);
+ return offset + data.length;
+ }
+
public static void main(final String[] args) {
// go into headless awt mode
System.setProperty("java.awt.headless", "true");
@@ -799,21 +896,13 @@ public class RasterPlotter {
ImageIO.write(m.getImage(), "png", fos);
fos.close();
} catch (final IOException e) {}
-
Log.shutdown();
+
// open file automatically, works only on Mac OS X
/*
Process p = null;
- try {
- p = Runtime.getRuntime().exec(new String[] {"/usr/bin/osascript", "-e", "open \"" + args[0] + "\""});
- } catch (java.io.IOException e) {
- Log.logException(e);
- }
- try {
- p.waitFor();
- } catch (InterruptedException e) {
- Log.logException(e);
- }
+ try {p = Runtime.getRuntime().exec(new String[] {"/usr/bin/osascript", "-e", "open \"" + args[0] + "\""});} catch (java.io.IOException e) {Log.logException(e);}
+ try {p.waitFor();} catch (InterruptedException e) {Log.logException(e);}
*/
}