Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ExifInterface: fix writing STRING and SRATIONAL formats" into nyc-dev

Browse Source 
am: f2a1076

* commit 'f2a1076cd3d8fa1e5e6b9ced4380860e720675f7':
  ExifInterface: fix writing STRING and SRATIONAL formats
This commit is contained in:
Jaesung Chung
2016-03-22 05:44:28 +00:00
committed by android-build-merger
parent 7ceb8f5382 f2a1076cd3
commit 8dec91bf9d
1 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
media/java/android/media/ExifInterface.java
View File

@@ -2025,6 +2025,12 @@ public class ExifInterface {
int bytesWritten = 0;
int dataFormat = getDataFormatOfExifEntryValue(entryValue);
if (dataFormat == IFD_FORMAT_STRING) {
byte[] asciiArray = (entryValue + '\0').getBytes(Charset.forName("US-ASCII"));
dataOutputStream.write(asciiArray);
return asciiArray.length;
}
// Values can be composed of several components. Each component is separated by char ','.
String[] components = entryValue.split(",");
for (String component : components) {
@@ -2037,11 +2043,6 @@ public class ExifInterface {
dataOutputStream.writeDouble(Double.parseDouble(component));
bytesWritten += 8;
break;
case IFD_FORMAT_STRING:
byte[] asciiArray = (component + '\0').getBytes(Charset.forName("US-ASCII"));
dataOutputStream.write(asciiArray);
bytesWritten += asciiArray.length;
break;
case IFD_FORMAT_SRATIONAL:
String[] rationalNumber = component.split("/");
dataOutputStream.writeInt(Integer.parseInt(rationalNumber[0]));
@@ -2060,11 +2061,31 @@ public class ExifInterface {
// See TIFF 6.0 spec Types. page 15.
// Take the first component if there are more than one component.
if (entryValue.contains(",")) {
entryValue = entryValue.split(",")[0];
String[] entryValues = entryValue.split(",");
int dataFormat = getDataFormatOfExifEntryValue(entryValues[0]);
if (dataFormat == IFD_FORMAT_STRING) {
return IFD_FORMAT_STRING;
}
for (int i = 1; i < entryValues.length; ++i) {
if (getDataFormatOfExifEntryValue(entryValues[i]) != dataFormat) {
return IFD_FORMAT_STRING;
}
}
return dataFormat;
}
if (entryValue.contains("/")) {
return IFD_FORMAT_SRATIONAL;
String[] rationalNumber = entryValue.split("/");
if (rationalNumber.length == 2) {
try {
Integer.parseInt(rationalNumber[0]);
Integer.parseInt(rationalNumber[1]);
return IFD_FORMAT_SRATIONAL;
} catch (NumberFormatException e) {
// Ignored
}
}
return IFD_FORMAT_STRING;
}
try {
Integer.parseInt(entryValue);
@@ -2084,6 +2105,9 @@ public class ExifInterface {
// Determines the size of EXIF entry value.
private static int getSizeOfExifEntryValue(int dataFormat, String entryValue) {
// See TIFF 6.0 spec Types page 15.
if (dataFormat == IFD_FORMAT_STRING) {
return (entryValue + '\0').getBytes(Charset.forName("US-ASCII")).length;
}
int bytesEstimated = 0;
String[] components = entryValue.split(",");
for (String component : components) {
@@ -2094,10 +2118,6 @@ public class ExifInterface {
case IFD_FORMAT_DOUBLE:
bytesEstimated += 8;
break;
case IFD_FORMAT_STRING:
bytesEstimated
+= (component + '\0').getBytes(Charset.forName("US-ASCII")).length;
break;
case IFD_FORMAT_SRATIONAL:
bytesEstimated += 8;
break;