X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fandroid%2FImageUtilsAndroid.java;h=4b3c1ea631d94689039b225925aff20e4ed57cc0;hb=10b6023d2b40921bfc55abf414a988ca19e5e142;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..4b3c1ea 100644
--- a/src/be/nikiroo/utils/android/ImageUtilsAndroid.java
+++ b/src/be/nikiroo/utils/android/ImageUtilsAndroid.java
@@ -7,8 +7,11 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
+import javax.imageio.ImageIO;
+
 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
@@ -17,6 +20,14 @@ import be.nikiroo.utils.ImageUtils;
  * @author niki
  */
 public class ImageUtilsAndroid extends ImageUtils {
+	@Override
+	protected boolean check() {
+		// If we can get the class, it means we have access to it
+		@SuppressWarnings("unused")
+		Object test = Bitmap.class;
+		return true;
+	}
+	
 	@Override
 	public void saveAsImage(Image img, File target, String format)
 			throws IOException {
@@ -61,23 +72,12 @@ 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;
+		// TODO: check if we can use a stream, too
+		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);
 		}