git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NextableInputStream: separate base behaviour from nextable
[fanfix.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 483c44ff144ec8f705412e85c2c9b428e973999f..f198862437754f0883d6ecc77dbacf03c55d4eb7 100644
(file)
--- a/
src/be/nikiroo/utils/android/ImageUtilsAndroid.java
+++ b/
src/be/nikiroo/utils/android/ImageUtilsAndroid.java
@@
-2,15
+2,18
@@
package be.nikiroo.utils.android;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
-import be.nikiroo.utils.Image;
-import be.nikiroo.utils.ImageUtils;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.File;
import java.io.FileOutputStream;
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 framework.
+ * This class offer some utilities based around images and uses the Android
+ * framework.
*
* @author niki
*/
*
* @author niki
*/
@@
-59,10
+62,13
@@
public class ImageUtilsAndroid extends ImageUtils {
* in case of IO error
*/
static public Bitmap fromImage(Image img) throws IOException {
* 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) {
if (image == null) {
- throw new IOException("Failed to convert input to image");
+ String ssize = StringUtils.formatNumber(size);
+ throw new IOException(
+ "Failed to convert input to image, size was: " + ssize);
}
return image;
}
return image;