Improve ImageUtilsAndroid and ImageUtils check() system

[nikiroo-utils.git] / src / be / nikiroo / utils / android / ImageUtilsAndroid.java

diff --git a/src/be/nikiroo/utils/android/ImageUtilsAndroid.java b/src/be/nikiroo/utils/android/ImageUtilsAndroid.java
index b2359e66338d9d0d7959b6fae56fa3ea6b0c7b72..d55e602cb89d247e6056caec1f49c9b484de7ed4 100644 (file)
--- a/src/be/nikiroo/utils/android/ImageUtilsAndroid.java
+++ b/src/be/nikiroo/utils/android/ImageUtilsAndroid.java
@@ -1,14 +1,20 @@
 package be.nikiroo.utils.android;
 
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.BitmapFactory;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.util.stream.Stream;
+
+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 +23,13 @@ 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
+               Config.ALPHA_8;
+               return true;
+       }
+
        @Override
        public void saveAsImage(Image img, File target, String format)
                        throws IOException {
@@ -61,27 +74,18 @@ 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);
-               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";
-                                       }
-                               }
+               InputStream stream = img.newInputStream();
+               try {
+                       Bitmap image = BitmapFactory.decodeStream(stream);
+                       if (image == null) {
+                               String ssize = StringUtils.formatNumber(img.getSize());
+                               throw new IOException(
+                                               "Failed to convert input to image, size was: " + ssize);
                        }
-
-                       throw new IOException(
-                                       "Failed to convert input to image, size was: " + ssize);
+               } finally {
+                       stream.close();
                }
-
+               
                return image;
        }
 }