scratchfoundation/scratchjr
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchjr.git synced 2024-11-28 18:15:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rotate Android images to account for JPEG rotations

Browse source
This commit is contained in:
Tim Mickel 2016-01-11 13:30:56 -05:00
parent f8524c3bc3
commit 7a0885d255
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/ScratchJr/app/src/main/java/org/scratchjr/android/CameraView.java
View file

@ -179,12 +179,12 @@ public class CameraView
/** /**
* Take the given bitmap image from the camera and transform it to the correct * Take the given bitmap image from the camera and transform it to the correct
* aspect ratio and size. * aspect ratio, size, and rotation.
* *
* @return jpeg-encoded data of the transformed image. * @return jpeg-encoded data of the transformed image.
*/ */
public byte[] getTransformedImage(Bitmap originalImage) { public byte[] getTransformedImage(Bitmap originalImage, int exifRotation) {
Bitmap cropped = cropAndResize(originalImage); Bitmap cropped = cropResizeAndRotate(originalImage, exifRotation);
ByteArrayOutputStream bos = new ByteArrayOutputStream(); ByteArrayOutputStream bos = new ByteArrayOutputStream();
cropped.compress(CompressFormat.JPEG, 90, bos); cropped.compress(CompressFormat.JPEG, 90, bos);
try { try {
@ -202,7 +202,7 @@ public class CameraView
* *
* If the image was front-facing, also mirror horizontally. * If the image was front-facing, also mirror horizontally.
*/ */
private Bitmap cropAndResize(Bitmap image) { private Bitmap cropResizeAndRotate(Bitmap image, int exifRotation) {
int imageWidth = image.getWidth(); int imageWidth = image.getWidth();
int imageHeight = image.getHeight(); int imageHeight = image.getHeight();
float rectWidth = _rect.width(); float rectWidth = _rect.width();
@ -220,6 +220,8 @@ public class CameraView
} }
Matrix m = new Matrix(); Matrix m = new Matrix();
// Adjust the image to undo rotation done by JPEG generator
m.postRotate(-1.0f * exifRotation);
if (_currentFacingFront) { if (_currentFacingFront) {
// flip bitmap horizontally since front-facing camera is mirrored // flip bitmap horizontally since front-facing camera is mirrored
m.preScale(-1.0f, 1.0f); m.preScale(-1.0f, 1.0f);