From: tobiasKaminsky Date: Wed, 29 Oct 2014 15:12:03 +0000 (+0100) Subject: - moved rotateImage() to BitmapUtils X-Git-Tag: oc-android-1.7.0_signed~81^2~6 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3b3d3e05bc9c9a8e261c8e2b60fe4e879b20035d?hp=--cc - moved rotateImage() to BitmapUtils --- 3b3d3e05bc9c9a8e261c8e2b60fe4e879b20035d diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java index 5a158325..54727775 100644 --- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java +++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java @@ -194,7 +194,7 @@ public class ThumbnailsCacheManager { thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px); // Rotate image, obeying exif tag - thumbnail = rotateImage(thumbnail, mFile.getStoragePath()); + thumbnail = BitmapUtils.rotateImage(thumbnail, mFile.getStoragePath()); // Add thumbnail to cache addBitmapToCache(imageKey, thumbnail); @@ -267,71 +267,4 @@ public class ThumbnailsCacheManager { } } - /** - * Rotate bitmap according to EXIF orientation. - * Cf. http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/ - * @param bitmap Bitmap to be rotated - * @param storagePath Path to source file of bitmap. Needed for EXIF information. - * @return correctly EXIF-rotated bitmap - */ - public static Bitmap rotateImage(Bitmap bitmap, String storagePath){ - Bitmap resultBitmap = bitmap; - - try - { - ExifInterface exifInterface = new ExifInterface(storagePath); - int orientation = exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION, 1); - - Matrix matrix = new Matrix(); - - // 1: nothing to do - - // 2 - if (orientation == ExifInterface.ORIENTATION_FLIP_HORIZONTAL) - { - matrix.postScale(-1.0f, 1.0f); - } - // 3 - else if (orientation == ExifInterface.ORIENTATION_ROTATE_180) - { - matrix.postRotate(180); - } - // 4 - else if (orientation == ExifInterface.ORIENTATION_FLIP_VERTICAL) - { - matrix.postScale(1.0f, -1.0f); - } - // 5 - else if (orientation == ExifInterface.ORIENTATION_TRANSPOSE) - { - matrix.postRotate(-90); - matrix.postScale(1.0f, -1.0f); - } - // 6 - else if (orientation == ExifInterface.ORIENTATION_ROTATE_90) - { - matrix.postRotate(90); - } - // 7 - else if (orientation == ExifInterface.ORIENTATION_TRANSVERSE) - { - matrix.postRotate(90); - matrix.postScale(1.0f, -1.0f); - } - // 8 - else if (orientation == ExifInterface.ORIENTATION_ROTATE_270) - { - matrix.postRotate(270); - } - - // Rotate the bitmap - resultBitmap = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true); - } - catch (Exception exception) - { - Log_OC.e(TAG, "Could not rotate the image: " + storagePath); - } - return resultBitmap; - } - } diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index 3d07bb62..269e25ee 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -57,6 +57,7 @@ import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.ui.dialog.ConfirmationDialogFragment; import com.owncloud.android.ui.dialog.RemoveFileDialogFragment; import com.owncloud.android.ui.fragment.FileFragment; +import com.owncloud.android.utils.BitmapUtils; import com.owncloud.android.utils.TouchImageViewCustom; @@ -418,7 +419,7 @@ public class PreviewImageFragment extends FileFragment { } // Rotate image, obeying exif tag - result = ThumbnailsCacheManager.rotateImage(result, storagePath); + result = BitmapUtils.rotateImage(result, storagePath); return result; diff --git a/src/com/owncloud/android/utils/BitmapUtils.java b/src/com/owncloud/android/utils/BitmapUtils.java index 687b5a4f..d87f9bd6 100644 --- a/src/com/owncloud/android/utils/BitmapUtils.java +++ b/src/com/owncloud/android/utils/BitmapUtils.java @@ -16,9 +16,13 @@ */ package com.owncloud.android.utils; +import com.owncloud.android.lib.common.utils.Log_OC; + import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.graphics.Matrix; import android.graphics.BitmapFactory.Options; +import android.media.ExifInterface; /** * Utility class with methods for decoding Bitmaps. @@ -96,4 +100,72 @@ public class BitmapUtils { return inSampleSize; } + /** + * Rotate bitmap according to EXIF orientation. + * Cf. http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/ + * @param bitmap Bitmap to be rotated + * @param storagePath Path to source file of bitmap. Needed for EXIF information. + * @return correctly EXIF-rotated bitmap + */ + public static Bitmap rotateImage(Bitmap bitmap, String storagePath){ + Bitmap resultBitmap = bitmap; + + try + { + ExifInterface exifInterface = new ExifInterface(storagePath); + int orientation = exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION, 1); + + Matrix matrix = new Matrix(); + + // 1: nothing to do + + // 2 + if (orientation == ExifInterface.ORIENTATION_FLIP_HORIZONTAL) + { + matrix.postScale(-1.0f, 1.0f); + } + // 3 + else if (orientation == ExifInterface.ORIENTATION_ROTATE_180) + { + matrix.postRotate(180); + } + // 4 + else if (orientation == ExifInterface.ORIENTATION_FLIP_VERTICAL) + { + matrix.postScale(1.0f, -1.0f); + } + // 5 + else if (orientation == ExifInterface.ORIENTATION_TRANSPOSE) + { + matrix.postRotate(-90); + matrix.postScale(1.0f, -1.0f); + } + // 6 + else if (orientation == ExifInterface.ORIENTATION_ROTATE_90) + { + matrix.postRotate(90); + } + // 7 + else if (orientation == ExifInterface.ORIENTATION_TRANSVERSE) + { + matrix.postRotate(90); + matrix.postScale(1.0f, -1.0f); + } + // 8 + else if (orientation == ExifInterface.ORIENTATION_ROTATE_270) + { + matrix.postRotate(270); + } + + // Rotate the bitmap + resultBitmap = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true); + } + catch (Exception exception) + { + Log_OC.e("BitmapUtil", "Could not rotate the image: " + storagePath); + } + return resultBitmap; + } + + }