[MMBASE CVS] src/org/mmbase/util/images ImageMagickImageInformer.java Imaging.java

[Nico Klasens]

Update of /var/cvs/src/org/mmbase/util/images
In directory james.mmbase.org:/tmp/cvs-serv952/src/org/mmbase/util/images

Modified Files:
      Tag: MMBase-1_8
        ImageMagickImageInformer.java Imaging.java 
Log Message:
 MMB-1806 Improve io stream copy performance


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/images
See also: http://www.mmbase.org/jira/browse/MMB-1806


Index: ImageMagickImageInformer.java
===================================================================
RCS file: 
/var/cvs/src/org/mmbase/util/images/Attic/ImageMagickImageInformer.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- ImageMagickImageInformer.java       9 May 2005 09:53:07 -0000       1.1
+++ ImageMagickImageInformer.java       7 Apr 2009 08:23:12 -0000       1.1.2.1
@@ -13,6 +13,7 @@
 import java.io.*;
 import java.util.regex.*;
 
+import org.mmbase.util.IOUtil;
 import org.mmbase.util.externalprocess.CommandLauncher;
 import org.mmbase.util.externalprocess.ProcessException;
 
@@ -24,7 +25,7 @@
  *
  * @author Michiel Meeuwissen
  * @since MMBase-1.8
- * @version $Id: ImageMagickImageInformer.java,v 1.1 2005/05/09 09:53:07 
michiel Exp $
+ * @version $Id: ImageMagickImageInformer.java,v 1.1.2.1 2009/04/07 08:23:12 
nklasens Exp $
  */
 public class ImageMagickImageInformer implements ImageInformer {
     
@@ -80,11 +81,7 @@
             File file = new File(args[0]);
             FileInputStream input = new FileInputStream(file);
             ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-            int b = input.read();
-            while (b != -1) {
-                bytes.write(b);
-                b = input.read();
-            }
+            IOUtil.copy(input, bytes);
             input.close();
             byte[] ba = bytes.toByteArray();
             ImageInformer imii  = new ImageMagickImageInformer();


Index: Imaging.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/images/Attic/Imaging.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- Imaging.java        20 Dec 2006 14:54:10 -0000      1.4.2.1
+++ Imaging.java        7 Apr 2009 08:23:12 -0000       1.4.2.2
@@ -12,6 +12,8 @@
 
 import java.util.*;
 import java.util.regex.*;
+
+import org.mmbase.util.IOUtil;
 import org.mmbase.util.transformers.*;
 import org.mmbase.util.logging.Logging;
 import org.mmbase.util.logging.Logger;
@@ -350,11 +352,7 @@
             File file = new File(args[0]);
             FileInputStream input = new FileInputStream(file);
             ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-            int b = input.read();
-            while (b != -1) {
-                bytes.write(b);
-                b = input.read();
-            }
+            IOUtil.copy(input, bytes);
             input.close();
             byte[] ba = bytes.toByteArray();
             ImageInformer   informer   = new ImageMagickImageInformer();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs