Update of /cvsroot/ufraw/ufraw
In directory vz-cvs-3.sog:/tmp/cvs-serv21840
Modified Files:
ufraw_exiv2.cc wb_presets.c
Log Message:
Fix trimming of EXIF data (patch by Nils Philippsen). Remove incorrect WB fine
tuning presets for the OLYMPUS E-P3.
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- wb_presets.c 1 Aug 2012 09:30:14 -0000 1.220
+++ wb_presets.c 11 Sep 2012 04:45:21 -0000 1.221
@@ -3927,25 +3927,12 @@
{ "OLYMPUS", "E-P2", Flash, 6, { 1.968750, 1, 0.953125, 0 } },
{ "OLYMPUS", "E-P2", Flash, 7, { 1.960938, 1, 0.906250, 0 } },
- /* -7/+7 fine tuning is -7/+7 in both amber-blue and green-magenta */
- { "OLYMPUS", "E-P3", Daylight, -7, { 2.0000, 1, 1.9297, 0 } },
{ "OLYMPUS", "E-P3", Daylight, 0, { 2.0469, 1, 1.4922, 0 } },
- { "OLYMPUS", "E-P3", Daylight, 7, { 2.0000, 1, 1.1016, 0 } },
- { "OLYMPUS", "E-P3", Shade, -7, { 2.3828, 1, 1.5391, 0 } },
{ "OLYMPUS", "E-P3", Shade, 0, { 2.4375, 1, 1.1875, 0 } },
- { "OLYMPUS", "E-P3", Shade, 7, { 2.7477, 1.1532, 1, 0 } },
- { "OLYMPUS", "E-P3", Cloudy, -7, { 2.1719, 1, 1.7812, 0 } },
{ "OLYMPUS", "E-P3", Cloudy, 0, { 2.2188, 1, 1.3750, 0 } },
- { "OLYMPUS", "E-P3", Cloudy, 7, { 2.1641, 1, 1.0078, 0 } },
- { "OLYMPUS", "E-P3", Incandescent, -7, { 1.1953, 1, 3.2812, 0 } },
{ "OLYMPUS", "E-P3", Incandescent, 0, { 1.2266, 1, 2.5312, 0
} },
- { "OLYMPUS", "E-P3", Incandescent, 7, { 1.1953, 1, 1.8672, 0
} },
- { "OLYMPUS", "E-P3", Fluorescent, -7, { 1.9297, 1, 2.5625, 0
} },
{ "OLYMPUS", "E-P3", Fluorescent, 0, { 1.9766, 1, 1.9766, 0 } },
- { "OLYMPUS", "E-P3", Fluorescent, 7, { 1.9297, 1, 1.4531, 0 } },
- { "OLYMPUS", "E-P3", Flash, -7, { 2.1641, 1, 1.7656, 0 } },
{ "OLYMPUS", "E-P3", Flash, 0, { 2.2109, 1, 1.3672, 0 } },
- { "OLYMPUS", "E-P3", Flash, 7, { 2.1562, 1, 1.0078, 0 } },
/* Firmware version 1.2 */
/* -7/+7 fine tuning is -7/+7 in amber-blue and zero in green-magenta */
Index: ufraw_exiv2.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_exiv2.cc,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- ufraw_exiv2.cc 1 Jan 2012 15:30:20 -0000 1.63
+++ ufraw_exiv2.cc 11 Sep 2012 04:45:21 -0000 1.64
@@ -309,8 +309,19 @@
!= exifData.end()) {
exifData.erase(pos);
ufraw_message(UFRAW_SET_LOG,
- "buflen %d too big, erasing
Exif.Photo.MakerNote\n",
+ "buflen %d too big, erasing Exif.Photo.MakerNote
"
+ "and related decoded metadata\n",
size + sizeof(ExifHeader));
+ /* Delete decoded metadata associated with
+ * Exif.Photo.MakerNote, otherwise erasing it isn't
+ * effective. */
+ for (pos = exifData.begin(); pos != exifData.end();) {
+ if (!strcmp(pos->ifdName(), "Makernote"))
+ pos = exifData.erase(pos);
+ else
+ pos++;
+ }
+ blob.clear();
Exiv2::ExifParser::encode(blob, Exiv2::bigEndian, exifData);
size = blob.size();
}
@@ -321,6 +332,7 @@
ufraw_message(UFRAW_SET_LOG,
"buflen %d too big, erasing Thumbnail\n",
size + sizeof(ExifHeader));
+ blob.clear();
Exiv2::ExifParser::encode(blob, Exiv2::bigEndian, exifData);
size = blob.size();
}
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
