X-Git-Url: http://git.nikiroo.be/?p=jvcard.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Flauncher%2FMain.java;h=61287b3df8c486b10b1c36a0556ba115399fdb7f;hp=0860fec1bd6f3a858cf6cb1e6fafebef7b7a9514;hb=HEAD;hpb=f04a32e97c847d7e2551037a4d5f6a070879215c

diff --git a/src/be/nikiroo/jvcard/launcher/Main.java b/src/be/nikiroo/jvcard/launcher/Main.java
index 0860fec..61287b3 100644
--- a/src/be/nikiroo/jvcard/launcher/Main.java
+++ b/src/be/nikiroo/jvcard/launcher/Main.java
@@ -1,17 +1,13 @@
 package be.nikiroo.jvcard.launcher;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.net.Socket;
 import java.nio.charset.Charset;
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.imageio.ImageIO;
-
 import be.nikiroo.jvcard.Card;
 import be.nikiroo.jvcard.Contact;
 import be.nikiroo.jvcard.Data;
@@ -26,6 +22,8 @@ import be.nikiroo.jvcard.resources.DisplayOption;
 import be.nikiroo.jvcard.resources.RemoteBundle;
 import be.nikiroo.jvcard.resources.StringId;
 import be.nikiroo.jvcard.resources.TransBundle;
+import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.Image;
 import be.nikiroo.utils.ImageUtils;
 import be.nikiroo.utils.StringUtils;
 import be.nikiroo.utils.Version;
@@ -40,6 +38,7 @@ import be.nikiroo.utils.resources.Bundles;
  * 
  */
 public class Main {
+	/** The name of the program */
 	static public final String APPLICATION_TITLE = "jVcard";
 
 	static private final int ERR_NO_FILE = 1;
@@ -353,14 +352,11 @@ public class Main {
 								}
 
 								String b64;
-								InputStream in = null;
+								Image img = new Image(IOUtils.toByteArray(f));
 								try {
-									in = new FileInputStream(f);
-									b64 = ImageUtils.toBase64(in);
+									b64 = img.toBase64();
 								} finally {
-									if (in != null) {
-										in.close();
-									}
+									img.close();
 								}
 
 								// remove previous photos:
@@ -400,10 +396,10 @@ public class Main {
 							String filename = contact.toString(format, "");
 							File f = new File(dir, filename + ".png");
 							System.out.println("Saving " + f);
+							Image img = new Image(photo.getValue());
 							try {
-								ImageIO.write(
-										ImageUtils.fromBase64(photo.getValue()),
-										"png", f);
+								ImageUtils.getInstance().saveAsImage(img, f,
+										"png");
 							} catch (IOException e) {
 								System.err.println(trans(
 										StringId.CLI_ERR_CANNOT_SAVE_PHOTO,