X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fandroid%2FImageUtilsAndroid.java;h=f198862437754f0883d6ecc77dbacf03c55d4eb7;hb=7b42695f536a88cfc5fed57e98687394e3c42fe9;hp=b2359e66338d9d0d7959b6fae56fa3ea6b0c7b72;hpb=e704a41477b85b6bb76dff4181df132176aec112;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/android/ImageUtilsAndroid.java b/src/be/nikiroo/utils/android/ImageUtilsAndroid.java
index b2359e6..f198862 100644
--- a/src/be/nikiroo/utils/android/ImageUtilsAndroid.java
+++ b/src/be/nikiroo/utils/android/ImageUtilsAndroid.java
@@ -9,6 +9,7 @@ import java.io.IOException;
 
 import be.nikiroo.utils.Image;
 import be.nikiroo.utils.ImageUtils;
+import be.nikiroo.utils.StringUtils;
 
 /**
  * This class offer some utilities based around images and uses the Android
@@ -61,23 +62,11 @@ public class ImageUtilsAndroid extends ImageUtils {
 	 *             in case of IO error
 	 */
 	static public Bitmap fromImage(Image img) throws IOException {
-		Bitmap image = BitmapFactory.decodeByteArray(img.getData(), 0,
-				img.getData().length);
+		byte[] array = img.getData();
+		int size = array.length;
+		Bitmap image = BitmapFactory.decodeByteArray(array, 0, size);
 		if (image == null) {
-			int size = img.getData().length;
-			String ssize = size + " byte";
-			if (size > 1) {
-				ssize = size + " bytes";
-				if (size >= 1000) {
-					size = size / 1000;
-					ssize = size + " kb";
-					if (size > 1000) {
-						size = size / 1000;
-						ssize = size + " MB";
-					}
-				}
-			}
-
+			String ssize = StringUtils.formatNumber(size);
 			throw new IOException(
 					"Failed to convert input to image, size was: " + ssize);
 		}