diff options
author | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-05-28 12:46:30 -0700 |
---|---|---|
committer | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-05-28 12:46:30 -0700 |
commit | decba1b4203f9a184b551ea3e11094a45023e753 (patch) | |
tree | bb425758d63b08a950edc21c520048c1c80b793d | |
parent | afe9f55ee6ba3eaee02e7b13809a534ebe98d34a (diff) | |
download | jhead-decba1b4203f9a184b551ea3e11094a45023e753.tar.gz |
Remove ISO tag workaround
The WAR is also removed upstream.
Bug: 21494051
Change-Id: I243e93374a4852026dc518566fdb37cd09dd9912
-rw-r--r-- | exif.c | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -945,10 +945,6 @@ static void ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, case TAG_ISO_EQUIVALENT: ImageInfo.ISOequivalent = (int)ConvertAnyFormat(ValuePtr, Format); - if ( ImageInfo.ISOequivalent < 50 ){ - // Fixes strange encoding on some older digicams. - ImageInfo.ISOequivalent *= 200; - } break; case TAG_DIGITALZOOMRATIO: @@ -1341,7 +1337,7 @@ static void create_EXIF_internal(ExifElement_t* elements, int exifTagCount, int #ifdef SUPERDEBUG ALOGE("create_EXIF %d exif elements, %d gps elements", exifTagCount, gpsTagCount); #endif - + MotorolaOrder = 0; memcpy(Buffer+2, "Exif\0\0II",8); @@ -1365,7 +1361,7 @@ static void create_EXIF_internal(ExifElement_t* elements, int exifTagCount, int Put16u(Buffer+DirIndex, NumEntries); // Number of entries DirIndex += 2; - + // Entries go here... if (!hasDateTimeTag) { // Date/time entry @@ -1524,7 +1520,7 @@ static void create_EXIF_internal(ExifElement_t* elements, int exifTagCount, int printf("Ending Thumbnail section DirIndex = %d DataWriteIndex %d", DirIndex, DataWriteIndex); } - + Buffer[0] = (unsigned char)(DataWriteIndex >> 8); Buffer[1] = (unsigned char)DataWriteIndex; |