mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 12:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Rotate images appropriately in preview

Browse source 
Fixes #3
This commit is contained in:
YuviPanda 2012-10-27 05:56:00 +05:30
parent eb8edb2f06
commit 496413da22
1 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/org/wikimedia/commons/ImageLoaderTask.java
View file

@ -4,6 +4,7 @@ import java.net.*;
import java.io.*; import java.io.*;
import android.content.Context; import android.content.Context;
import android.database.Cursor;
import android.graphics.*; import android.graphics.*;
import android.net.Uri; import android.net.Uri;
import android.os.*; import android.os.*;
@ -30,14 +31,36 @@ class ImageLoaderTask extends AsyncTask<Uri, String, Bitmap> {
} }
return inSampleSize; return inSampleSize;
} }
private int getOrientation(Uri photoUri) {
/* it's on the external media. */
Cursor cursor = view.getContext().getContentResolver().query(photoUri,
new String[] { MediaStore.Images.ImageColumns.ORIENTATION }, null, null, null);
if (cursor.getCount() != 1) {
return -1;
}
cursor.moveToFirst();
return cursor.getInt(0);
}
public Bitmap getBitmap(Uri imageUri) throws FileNotFoundException { public Bitmap getBitmap(Uri imageUri) throws FileNotFoundException {
// FIXME: Use proper window width, not device width. But should do for now! // FIXME: Use proper window width, not device width. But should do for now!
WindowManager wm = (WindowManager) view.getContext().getSystemService(Context.WINDOW_SERVICE); WindowManager wm = (WindowManager) view.getContext().getSystemService(Context.WINDOW_SERVICE);
int reqHeight = wm.getDefaultDisplay().getHeight(); int reqHeight = wm.getDefaultDisplay().getHeight();
int reqWidth = wm.getDefaultDisplay().getWidth(); int reqWidth = wm.getDefaultDisplay().getWidth();
int orientation = getOrientation(imageUri);
if(orientation == 90 || orientation == 270) {
// Swap height and width if this is rotated
int temp = reqHeight;
reqHeight = reqWidth;
reqWidth = temp;
}
// First decode with inJustDecodeBounds=true to check dimensions // First decode with inJustDecodeBounds=true to check dimensions
final BitmapFactory.Options options = new BitmapFactory.Options(); final BitmapFactory.Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true; options.inJustDecodeBounds = true;
@ -52,7 +75,12 @@ class ImageLoaderTask extends AsyncTask<Uri, String, Bitmap> {
// Re-get the InputStream! // Re-get the InputStream!
bitmapStream = view.getContext().getContentResolver().openInputStream(imageUri); bitmapStream = view.getContext().getContentResolver().openInputStream(imageUri);
return BitmapFactory.decodeStream(bitmapStream, null, options); Bitmap bitmap = BitmapFactory.decodeStream(bitmapStream, null, options);
Matrix matrix = new Matrix();
matrix.postRotate(orientation);
return Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
} }
ImageLoaderTask(ImageView view) { ImageLoaderTask(ImageView view) {