Skip to content

fix(bitmap): apply orientation configuration for exif orientation 2, 3, & 4 #17446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MaqsudMallick wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −45
Open

fix(bitmap): apply orientation configuration for exif orientation 2, 3, & 4 #17446

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 2 additions & 45 deletions app/src/main/java/com/owncloud/android/utils/BitmapUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,9 @@ public static Bitmap retrieveBitmapFromFile(String storagePath, int minWidth, in
var scaledWidth = (int) (originalWidth * scaleFactor);
var scaledHeight = (int) (originalHeight * scaleFactor);

var shouldRotate = detectRotateImage(storagePath);
var result = decodeSampledBitmapFromFile(storagePath, scaledWidth, scaledHeight);
if (shouldRotate) {
int orientation = getExifOrientation(storagePath);
return BitmapExtensionsKt.rotateBitmapViaExif(result, orientation);
} else {
return result;
}
int orientation = getExifOrientation(storagePath);
return BitmapExtensionsKt.rotateBitmapViaExif(result, orientation);
}
/**
* Calculates a proper value for options.inSampleSize in order to decode a Bitmap minimizing the memory overload and
Expand Down Expand Up @@ -165,44 +160,6 @@ public static Bitmap scaleBitmap(Bitmap bitmap, float px, int width, int height,
return Bitmap.createScaledBitmap(bitmap, w, h, true);
}

/**
* Detect if Image will be rotated according to EXIF orientation. Cf. http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/
*
* @param storagePath Path to source file of bitmap. Needed for EXIF information.
* @return true if image's orientation determines it will be rotated to where height and width change
*/
public static boolean detectRotateImage(String storagePath) {
try {
ExifInterface exifInterface = new ExifInterface(storagePath);
int orientation = exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION, 1);

if (orientation != ExifInterface.ORIENTATION_NORMAL) {
switch (orientation) {
// 5
case ExifInterface.ORIENTATION_TRANSPOSE: {
return true;
}
// 6
case ExifInterface.ORIENTATION_ROTATE_90: {
return true;
}
// 7
case ExifInterface.ORIENTATION_TRANSVERSE: {
return true;
}
// 8
case ExifInterface.ORIENTATION_ROTATE_270: {
return true;
}
}
}
}
catch (Exception exception) {
Log_OC.e("BitmapUtil", "Could not read orientation at: " + storagePath);
}
return false;
}

public static int[] getImageResolution(String srcPath) {
Options options = new Options();
options.inJustDecodeBounds = true;
Expand Down