Handles export size zero
bug:11280447
Change-Id: Ia8758a6d269b4ac9fdc9435b3bcdf9295c3e11a9
diff --git a/src/com/android/gallery3d/filtershow/tools/SaveImage.java b/src/com/android/gallery3d/filtershow/tools/SaveImage.java
index 354081e..c3cdea8 100644
--- a/src/com/android/gallery3d/filtershow/tools/SaveImage.java
+++ b/src/com/android/gallery3d/filtershow/tools/SaveImage.java
@@ -402,6 +402,10 @@
// if we have a valid size
int w = (int) (bitmap.getWidth() * sizeFactor);
int h = (int) (bitmap.getHeight() * sizeFactor);
+ if (w == 0 || h == 0) {
+ w = 1;
+ h = 1;
+ }
bitmap = Bitmap.createScaledBitmap(bitmap, w, h, true);
}
updateProgress();
diff --git a/src/com/android/gallery3d/filtershow/ui/ExportDialog.java b/src/com/android/gallery3d/filtershow/ui/ExportDialog.java
index f6a84ce..b42c9f3 100644
--- a/src/com/android/gallery3d/filtershow/ui/ExportDialog.java
+++ b/src/com/android/gallery3d/filtershow/ui/ExportDialog.java
@@ -202,8 +202,8 @@
return;
}
mEditing = true;
- int width = 0;
- int height = 0;
+ int width = 1;
+ int height = 1;
if (text.getId() == R.id.editableWidth) {
if (mWidthText.getText() != null) {
String value = String.valueOf(mWidthText.getText());
@@ -213,6 +213,10 @@
width = mOriginalBounds.width();
mWidthText.setText("" + width);
}
+ if (width <= 0) {
+ width = (int) Math.ceil(mRatio);
+ mWidthText.setText("" + width);
+ }
height = (int) (width / mRatio);
}
mHeightText.setText("" + height);
@@ -226,6 +230,10 @@
height = mOriginalBounds.height();
mHeightText.setText("" + height);
}
+ if (height <= 0) {
+ height = 1;
+ mHeightText.setText("" + height);
+ }
width = (int) (height * mRatio);
}
mWidthText.setText("" + width);
