[GeoNetwork-commit] SF.net SVN: geonetwork:[2381] sandbox/geocat.ch/trunk/src/org/wfp/vam/ intermap

[<ju...@us...>]

Revision: 2381
          http://geonetwork.svn.sourceforge.net/geonetwork/?rev=2381&view=rev
Author:   justb
Date:     2009-02-26 14:39:24 +0000 (Thu, 26 Feb 2009)

Log Message:
-----------
restore ImageMerger and XmlUtil to original version (checked in by accident in r2380)

Modified Paths:
--------------
    sandbox/geocat.ch/trunk/src/org/wfp/vam/intermap/kernel/map/images/ImageMerger.java
    sandbox/geocat.ch/trunk/src/org/wfp/vam/intermap/util/XmlUtil.java

Modified: sandbox/geocat.ch/trunk/src/org/wfp/vam/intermap/kernel/map/images/ImageMerger.java
===================================================================
--- sandbox/geocat.ch/trunk/src/org/wfp/vam/intermap/kernel/map/images/ImageMerger.java	2009-02-26 14:32:47 UTC (rev 2380)
+++ sandbox/geocat.ch/trunk/src/org/wfp/vam/intermap/kernel/map/images/ImageMerger.java	2009-02-26 14:39:24 UTC (rev 2381)
@@ -46,17 +46,15 @@
 import jeeves.utils.Log;
 
 import org.wfp.vam.intermap.Constants;
-//import org.apache.batik.ext.awt.image.codec.PNGEncodeParam;
-//import org.apache.batik.ext.awt.image.codec.PNGImageEncoder;
 
-//import Acme.JPM.Encoders.GifEncoder;
+import Acme.JPM.Encoders.GifEncoder;
 
 import com.sun.image.codec.jpeg.JPEGCodec;
 import com.sun.image.codec.jpeg.JPEGImageEncoder;
-/*import com.sun.media.jai.codec.ImageCodec;
+import com.sun.media.jai.codec.ImageCodec;
 import com.sun.media.jai.codec.PNGEncodeParam;
 import com.sun.media.jai.codecimpl.PNGCodec;
-import com.sun.media.jai.codecimpl.PNGImageEncoder;     */
+import com.sun.media.jai.codecimpl.PNGImageEncoder;
 
 public class ImageMerger {
 	static public final int JPG = 0;
@@ -220,11 +218,11 @@
 	public static synchronized void encodePNG(OutputStream os, BufferedImage bi)
 		throws IOException {
 
-	/*	PNGEncodeParam pngParams = PNGEncodeParam.getDefaultEncodeParam(bi);
+		PNGEncodeParam pngParams = PNGEncodeParam.getDefaultEncodeParam(bi);
 		//	  PNGEncodeParam pngParams = new PNGEncodeParam.RGB();
 		pngParams.setBitDepth(8);
-		PNGImageEncoder encoder = null;
-			// (PNGImageEncoder) PNGCodec.createImageEncoder("png", os, pngParams);
+		PNGImageEncoder encoder =
+			(PNGImageEncoder) PNGCodec.createImageEncoder("png", os, pngParams);
 		encoder.setParam(pngParams);
 
 		// TODO make this into a user setting to allow to select for high or low
@@ -237,15 +235,15 @@
 		// (PNGImageEncoder)PNGCodec.createImageEncoder("png", os, pngParamsRGB);
 		//		encoder.setParam(pngParamsRGB);
 
-		encoder.encode(bi);             */
+		encoder.encode(bi);
 		os.close();
 	}
 
 	public static synchronized void encodeGIF(OutputStream os, BufferedImage bi)
 		throws IOException {
 
-	//	GifEncoder encoder = new GifEncoder(bi, os);
-		//encoder.encode();
+		GifEncoder encoder = new GifEncoder(bi, os);
+		encoder.encode();
 		os.close();
 	}
 
@@ -388,11 +386,11 @@
 
 	/** Just a test... */
 	private static void printCodecs() {
-		/*Enumeration e = ImageCodec.getCodecs();
+		Enumeration e = ImageCodec.getCodecs();
 		while (e.hasMoreElements()) {
 			ImageCodec ic = (ImageCodec) e.nextElement();
 			System.out.println(ic.getFormatName());
-		} */
+		}
 	}
 
 	public static void main(String args[]) {

Modified: sandbox/geocat.ch/trunk/src/org/wfp/vam/intermap/util/XmlUtil.java
===================================================================
--- sandbox/geocat.ch/trunk/src/org/wfp/vam/intermap/util/XmlUtil.java	2009-02-26 14:32:47 UTC (rev 2380)
+++ sandbox/geocat.ch/trunk/src/org/wfp/vam/intermap/util/XmlUtil.java	2009-02-26 14:39:24 UTC (rev 2381)
@@ -23,11 +23,11 @@
 
 package org.wfp.vam.intermap.util;
 
+import org.apache.xpath.XPathAPI;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.input.DOMBuilder;
 import org.jdom.output.DOMOutputter;
-import com.sun.org.apache.xpath.internal.XPathAPI;
 
 /**
  * @author ETj: Decompiled by Jad v1.5.8e.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.