Skip to content

Commit

Permalink
recover degree.
Browse files Browse the repository at this point in the history
  • Loading branch information
郑晓勇 committed Apr 27, 2017
1 parent 5c8bff4 commit 92c1924
Show file tree
Hide file tree
Showing 5 changed files with 250 additions and 0 deletions.
Binary file added app/src/main/assets/img.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions tiny/src/main/java/com/zxy/tiny/common/TinyException.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,10 @@ public NetworkIOException(String message) {
super(message);
}
}

public static final class EOFException extends RuntimeException {
public EOFException(String message) {
super(message);
}
}
}
36 changes: 36 additions & 0 deletions tiny/src/main/java/com/zxy/tiny/core/BitmapCompressor.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import com.zxy.tiny.Tiny;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;

Expand Down Expand Up @@ -95,6 +96,12 @@ public static Bitmap compress(byte[] bytes, Tiny.BitmapCompressOptions options,
result = customCompress(result, compressWidth, compressHeight, true);
}

//processing bitmap degree.
if (ExifCompat.isJpeg(bytes)) {
int orientation = ExifCompat.getOrientation(bytes);
result = BitmapKit.rotateBitmap(result, orientation);
}

return result;
}

Expand Down Expand Up @@ -137,6 +144,35 @@ public static Bitmap compress(int resId, Tiny.BitmapCompressOptions options, boo
result = customCompress(result, compressWidth, compressHeight, true);
}

//processing bitmap degree.
InputStream is = null;
Resources resources = Tiny.getInstance().getApplication().getResources();
try {
is = resources.openRawResource(resId, new TypedValue());
ByteArrayOutputStream os = new ByteArrayOutputStream();
byte[] buffer = new byte[4096];
int len = -1;
while ((len = is.read(buffer)) != -1) {
os.write(buffer, 0, len);
}
os.close();

if (ExifCompat.isJpeg(os.toByteArray())) {
int orientation = ExifCompat.getOrientation(os.toByteArray());
result = BitmapKit.rotateBitmap(result, orientation);
}
} catch (Exception e) {
e.printStackTrace();
} finally {
if (is != null) {
try {
is.close();
} catch (IOException e) {
//ignore...
}
}
}

return result;
}

Expand Down
16 changes: 16 additions & 0 deletions tiny/src/main/java/com/zxy/tiny/core/BitmapKit.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Matrix;
import android.os.Build;
import android.util.Pair;
import android.util.TypedValue;
Expand All @@ -16,6 +17,7 @@
import java.io.IOException;
import java.io.InputStream;


/**
* Created by zhengxiaoyong on 2017/3/13.
*/
Expand Down Expand Up @@ -123,4 +125,18 @@ public static long getBitmapSizeInBytes(Bitmap bitmap) {
throw new TinyException.UnsupportedParamException("this bitmap config is not supported!");
}

public static Bitmap rotateBitmap(Bitmap bitmap, int degree) {
if (bitmap == null || bitmap.isRecycled())
return bitmap;
if (degree != 90 && degree != 180 && degree != 270)
return bitmap;
float pointX = bitmap.getWidth() / 2;
float pointY = bitmap.getHeight() / 2;
Matrix matrix = new Matrix();
matrix.setRotate(degree, pointX, pointY);
Bitmap result = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
bitmap.recycle();
return result;
}

}
192 changes: 192 additions & 0 deletions tiny/src/main/java/com/zxy/tiny/core/ExifCompat.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,192 @@
package com.zxy.tiny.core;

import android.media.ExifInterface;

import com.zxy.tiny.common.Logger;
import com.zxy.tiny.common.TinyException;

import java.io.InputStream;
import java.util.Arrays;

/**
* Created by zhengxiaoyong on 2017/4/27.
*/
public class ExifCompat {

private static final byte[] JPEG_SIGNATURE = new byte[]{
(byte) 0xff, (byte) 0xd8, (byte) 0xff
};

private static final int JPEG_SIGNATURE_SIZE = 3;

public static boolean isJpeg(InputStream is) {
boolean isJpeg = false;
if (is == null)
return isJpeg;
is.mark(JPEG_SIGNATURE_SIZE);
byte[] signatureBytes = new byte[JPEG_SIGNATURE_SIZE];
try {
if (is.read(signatureBytes) != JPEG_SIGNATURE_SIZE)
throw new TinyException.EOFException("no more data.");
isJpeg = Arrays.equals(JPEG_SIGNATURE, signatureBytes);
is.reset();
} catch (Exception e) {
//ignore...
}
return isJpeg;
}

public static boolean isJpeg(byte[] data) {
boolean isJpeg = false;
if (data == null || data.length < 3)
return isJpeg;
byte[] signatureBytes = new byte[]{
data[0], data[1], data[2]
};
isJpeg = Arrays.equals(JPEG_SIGNATURE, signatureBytes);
return isJpeg;
}

public static int getOrientation(byte[] jpeg) {
if (jpeg == null) {
return 0;
}

int offset = 0;
int length = 0;

// ISO/IEC 10918-1:1993(E)
while (offset + 3 < jpeg.length && (jpeg[offset++] & 0xFF) == 0xFF) {
int marker = jpeg[offset] & 0xFF;

// Check if the marker is a padding.
if (marker == 0xFF) {
continue;
}
offset++;

// Check if the marker is SOI or TEM.
if (marker == 0xD8 || marker == 0x01) {
continue;
}
// Check if the marker is EOI or SOS.
if (marker == 0xD9 || marker == 0xDA) {
break;
}

// Get the length and check if it is reasonable.
length = pack(jpeg, offset, 2, false);
if (length < 2 || offset + length > jpeg.length) {
Logger.e("Invalid length");
return 0;
}

// Break if the marker is EXIF in APP1.
if (marker == 0xE1 && length >= 8 &&
pack(jpeg, offset + 2, 4, false) == 0x45786966 &&
pack(jpeg, offset + 6, 2, false) == 0) {
offset += 8;
length -= 8;
break;
}

// Skip other markers.
offset += length;
length = 0;
}

// JEITA CP-3451 Exif Version 2.2
if (length > 8) {
// Identify the byte order.
int tag = pack(jpeg, offset, 4, false);
if (tag != 0x49492A00 && tag != 0x4D4D002A) {
Logger.e("Invalid byte order");
return 0;
}
boolean littleEndian = (tag == 0x49492A00);

// Get the offset and check if it is reasonable.
int count = pack(jpeg, offset + 4, 4, littleEndian) + 2;
if (count < 10 || count > length) {
Logger.e("Invalid offset");
return 0;
}
offset += count;
length -= count;

// Get the count and go through all the elements.
count = pack(jpeg, offset - 2, 2, littleEndian);
while (count-- > 0 && length >= 12) {
// Get the tag and check if it is orientation.
tag = pack(jpeg, offset, 2, littleEndian);
if (tag == 0x0112) {
// We do not really care about type and count, do we?
int orientation = pack(jpeg, offset + 8, 2, littleEndian);
switch (orientation) {
case 1:
return 0;
case 3:
return 180;
case 6:
return 90;
case 8:
return 270;
}
Logger.e("Unsupported orientation");
return 0;
}
offset += 12;
length -= 12;
}
}

Logger.e("Orientation not found");
return 0;
}

public static int getOrientation(String filepath) {
int orientation = ExifInterface.ORIENTATION_NORMAL;
int degree;
try {
ExifInterface exif = new ExifInterface(filepath);
orientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION,
ExifInterface.ORIENTATION_NORMAL);
} catch (Exception e) {
e.printStackTrace();
}
switch (orientation) {
case ExifInterface.ORIENTATION_NORMAL:
degree = 0;
break;
case ExifInterface.ORIENTATION_ROTATE_90:
degree = 90;
break;
case ExifInterface.ORIENTATION_ROTATE_180:
degree = 180;
break;
case ExifInterface.ORIENTATION_ROTATE_270:
degree = 270;
break;
default:
degree = 0;
break;
}
return degree;
}

private static int pack(byte[] bytes, int offset, int length,
boolean littleEndian) {
int step = 1;
if (littleEndian) {
offset += length - 1;
step = -1;
}

int value = 0;
while (length-- > 0) {
value = (value << 8) | (bytes[offset] & 0xFF);
offset += step;
}
return value;
}
}

0 comments on commit 92c1924

Please sign in to comment.