narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

trying to fix rotation problems

Browse source
This commit is contained in:
iNPUTmice 2014-08-13 13:44:21 +02:00
parent 457e7be5e2
commit b2cc17c362
1 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/eu/siacs/conversations/persistance/FileBackend.java
View file

@ -13,6 +13,7 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import android.content.Context; import android.content.Context;
import android.database.Cursor;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.graphics.Canvas; import android.graphics.Canvas;
@ -21,6 +22,7 @@ import android.graphics.RectF;
import android.media.ExifInterface; import android.media.ExifInterface;
import android.net.Uri; import android.net.Uri;
import android.os.Environment; import android.os.Environment;
import android.provider.MediaStore;
import android.util.Base64; import android.util.Base64;
import android.util.Base64OutputStream; import android.util.Base64OutputStream;
import android.util.Log; import android.util.Log;
@ -159,21 +161,11 @@ public class FileBackend {
if (originalBitmap == null) { if (originalBitmap == null) {
throw new ImageCopyException(R.string.error_not_an_image_file); throw new ImageCopyException(R.string.error_not_an_image_file);
} }
if (image == null) {
getIncomingFile().delete();
}
Bitmap scalledBitmap = resize(originalBitmap, IMAGE_SIZE); Bitmap scalledBitmap = resize(originalBitmap, IMAGE_SIZE);
originalBitmap = null; originalBitmap = null;
ExifInterface exif = new ExifInterface(image.toString()); int rotation = getRotation(image);
if (exif.getAttribute(ExifInterface.TAG_ORIENTATION) if (rotation > 0) {
.equalsIgnoreCase("6")) { scalledBitmap = rotate(scalledBitmap, rotation);
scalledBitmap = rotate(scalledBitmap, 90);
} else if (exif.getAttribute(ExifInterface.TAG_ORIENTATION)
.equalsIgnoreCase("8")) {
scalledBitmap = rotate(scalledBitmap, 270);
} else if (exif.getAttribute(ExifInterface.TAG_ORIENTATION)
.equalsIgnoreCase("3")) {
scalledBitmap = rotate(scalledBitmap, 180);
} }
OutputStream os = new FileOutputStream(file); OutputStream os = new FileOutputStream(file);
boolean success = scalledBitmap.compress( boolean success = scalledBitmap.compress(
@ -204,6 +196,38 @@ public class FileBackend {
} }
} }
} }
private int getRotation(Uri image) {
if ("content".equals(image.getScheme())) {
Cursor cursor = context.getContentResolver().query(image,
new String[] { MediaStore.Images.ImageColumns.ORIENTATION }, null, null, null);
if (cursor.getCount() != 1) {
return -1;
}
cursor.moveToFirst();
return cursor.getInt(0);
} else {
ExifInterface exif;
try {
exif = new ExifInterface(image.toString());
if (exif.getAttribute(ExifInterface.TAG_ORIENTATION)
.equalsIgnoreCase("6")) {
return 90;
} else if (exif.getAttribute(ExifInterface.TAG_ORIENTATION)
.equalsIgnoreCase("8")) {
return 270;
} else if (exif.getAttribute(ExifInterface.TAG_ORIENTATION)
.equalsIgnoreCase("3")) {
return 180;
} else {
return 0;
}
} catch (IOException e) {
return -1;
}
}
}
public Bitmap getImageFromMessage(Message message) { public Bitmap getImageFromMessage(Message message) {
return BitmapFactory.decodeFile(getJingleFile(message) return BitmapFactory.decodeFile(getJingleFile(message)