diff options
-rw-r--r-- | src/com/android/camera/Camera.java | 5 | ||||
-rw-r--r-- | src/com/android/camera/CropImage.java | 1 | ||||
-rw-r--r-- | src/com/android/camera/ImageManager.java | 6 | ||||
-rw-r--r-- | src/com/android/camera/gallery/Image.java | 2 |
4 files changed, 5 insertions, 9 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index a8ffa21..20301f0 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -694,9 +694,8 @@ public class Camera extends Activity implements View.OnClickListener, mCancel = true; } if (!mCancel) { - ImageManager.storeImage( - mLastContentUri, mContentResolver, - 0, null, data); + ImageManager.storeImage(mLastContentUri, mContentResolver, + null, data); ImageManager.setImageSize(mContentResolver, mLastContentUri, new File(ImageManager.CAMERA_IMAGE_BUCKET_NAME, name).length()); diff --git a/src/com/android/camera/CropImage.java b/src/com/android/camera/CropImage.java index 91608d2..88060a2 100644 --- a/src/com/android/camera/CropImage.java +++ b/src/com/android/camera/CropImage.java @@ -380,7 +380,6 @@ public class CropImage extends MonitoredActivity { ImageManager.storeImage( newUri, mContentResolver, - 0, // TODO fix this orientation croppedImage, null); diff --git a/src/com/android/camera/ImageManager.java b/src/com/android/camera/ImageManager.java index 225a249..45ffd26 100644 --- a/src/com/android/camera/ImageManager.java +++ b/src/com/android/camera/ImageManager.java @@ -248,8 +248,7 @@ public class ImageManager { return cr.insert(STORAGE_URI, values); } - public static void storeImage( - Uri uri, ContentResolver cr, int orientation, + public static void storeImage(Uri uri, ContentResolver cr, Bitmap source, byte [] jpegData) { if (source == null && jpegData == null || uri == null) { @@ -278,8 +277,7 @@ public class ImageManager { } finally { c.close(); } - image.saveImageContents( - source, jpegData, orientation, true, filepath); + image.saveImageContents(source, jpegData, true, filepath); ContentValues values = new ContentValues(); values.put(ImageColumns.MINI_THUMB_MAGIC, 0); diff --git a/src/com/android/camera/gallery/Image.java b/src/com/android/camera/gallery/Image.java index 14847ce..4da091d 100644 --- a/src/com/android/camera/gallery/Image.java +++ b/src/com/android/camera/gallery/Image.java @@ -90,7 +90,7 @@ public class Image extends BaseImage implements IImage { } public void saveImageContents(Bitmap image, byte [] jpegData, - int orientation, boolean newFile, String filePath) { + boolean newFile, String filePath) { Bitmap thumbnail = null; Uri uri = mContainer.contentUri(mId); compressImageToFile(image, jpegData, uri); |