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

[Nico Klasens]

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

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


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


Index: Imaging.java
===================================================================
RCS file: 
/var/cvs/applications/resources/src/org/mmbase/util/images/Imaging.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Imaging.java        23 Jun 2007 10:42:55 -0000      1.6
+++ Imaging.java        7 Apr 2009 08:25:07 -0000       1.7
@@ -9,9 +9,11 @@
 */
 package org.mmbase.util.images;
 
-import org.mmbase.util.transformers.*;
 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;
 
@@ -344,11 +346,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();


Index: ImageMagickImageInformer.java
===================================================================
RCS file: 
/var/cvs/applications/resources/src/org/mmbase/util/images/ImageMagickImageInformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ImageMagickImageInformer.java       13 Jun 2007 18:54:55 -0000      1.2
+++ ImageMagickImageInformer.java       7 Apr 2009 08:25:07 -0000       1.3
@@ -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.2 2007/06/13 18:54:55 
nklasens Exp $
+ * @version $Id: ImageMagickImageInformer.java,v 1.3 2009/04/07 08:25:07 
nklasens Exp $
  */
 public class ImageMagickImageInformer implements ImageInformer {
     
@@ -82,11 +83,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();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs