olgamiller/SSTVEncoder2
1
0
Fork 0
mirror of https://github.com/olgamiller/SSTVEncoder2.git synced 2025-12-06 06:52:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed image orientation error

Browse source 
(replaced uri.getPath with InputStream as argument of ExifInterface)
This commit is contained in:
Olga Miller 2018-07-16 21:10:15 +02:00
parent da7c59063a
commit e333e2124e
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/src/main/java/om/sstvencoder/MainActivity.java
View file

@ -273,16 +273,33 @@ public class MainActivity extends AppCompatActivity {
public int getOrientation(ContentResolver resolver, Uri uri) { public int getOrientation(ContentResolver resolver, Uri uri) {
int orientation = 0; int orientation = 0;
try { try {
Cursor cursor = resolver.query(uri, new String[]{MediaStore.Images.ImageColumns.ORIENTATION}, null, null, null); Cursor cursor = resolver.query(uri,
new String[]{MediaStore.Images.ImageColumns.ORIENTATION},
null, null, null);
if (cursor.moveToFirst()) if (cursor.moveToFirst())
orientation = cursor.getInt(0); orientation = cursor.getInt(0);
cursor.close(); cursor.close();
} catch (Exception ignore) { } catch (Exception ignore) {
try { orientation = getExifOrientation(resolver, uri);
ExifInterface exif = new ExifInterface(uri.getPath()); }
orientation = Utility.convertToDegrees(exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, 0)); return orientation;
} catch (Exception ex) { }
showOrientationErrorMessage(uri, ex);
private int getExifOrientation(ContentResolver resolver, Uri uri) {
int orientation = 0;
InputStream in = null;
try {
in = resolver.openInputStream(uri);
int orientationAttribute = (new ExifInterface(in)).getAttributeInt(ExifInterface.TAG_ORIENTATION, 0);
orientation = Utility.convertToDegrees(orientationAttribute);
} catch (Exception ex) {
showOrientationErrorMessage(uri, ex);
} finally {
if (in != null) {
try {
in.close();
} catch (Exception ignore) {
}
} }
} }
return orientation; return orientation;