[Rawstudio-commit] r3476 - trunk/plugins/meta-tiff

[Klaus Post]

Author: post
Date: 2010-07-11 13:08:58 +0200 (Sun, 11 Jul 2010)
New Revision: 3476

Modified:
   trunk/plugins/meta-tiff/tiff-meta.c
Log:
Use correct offsets for retrieving make and model + fixes invalid (and 
potential crash) model on Olympus "E-3" (note only three characters in make 
name. 

Modified: trunk/plugins/meta-tiff/tiff-meta.c
===================================================================
--- trunk/plugins/meta-tiff/tiff-meta.c 2010-07-11 10:04:20 UTC (rev 3475)
+++ trunk/plugins/meta-tiff/tiff-meta.c 2010-07-11 11:08:58 UTC (rev 3476)
@@ -1210,11 +1210,11 @@
                {
                        case 0x010f: /* Make */
                                if (!meta->make_ascii)
-                                       meta->make_ascii = 
rs_remove_tailing_spaces(raw_strdup(rawfile, ifd.value_offset, ifd.count), 
TRUE);
+                                       meta->make_ascii = 
rs_remove_tailing_spaces(raw_strdup(rawfile, ifd.offset, ifd.count), TRUE);
                                break;
                        case 0x0110: /* Model */
                                if (!meta->model_ascii)
-                                       meta->model_ascii = 
rs_remove_tailing_spaces(raw_strdup(rawfile, ifd.value_offset, ifd.count), 
TRUE);
+                                       meta->model_ascii = 
rs_remove_tailing_spaces(raw_strdup(rawfile, ifd.offset, ifd.count), TRUE);
                                break;
                        case 0x9003: /* DateTime */
                        case 0x9004: /* DateTime */
@@ -1415,7 +1415,7 @@
                        case 0x010f: /* Make */
                                if (!meta->make_ascii)
                                {
-                                       meta->make_ascii = 
rs_remove_tailing_spaces(raw_strdup(rawfile, ifd.value_offset, ifd.count), 
TRUE);
+                                       meta->make_ascii = 
rs_remove_tailing_spaces(raw_strdup(rawfile, ifd.offset, ifd.count), TRUE);
                                        if (raw_strcmp(rawfile, 
ifd.value_offset, "Canon", 5))
                                                meta->make = MAKE_CANON;
                                        else if (raw_strcmp(rawfile, 
ifd.value_offset, "CASIO", 5))
@@ -1458,7 +1458,7 @@
                                break;
                        case 0x0110: /* Model */
                                if (!meta->model_ascii)
-                                       meta->model_ascii = 
rs_remove_tailing_spaces(raw_strdup(rawfile, ifd.value_offset, ifd.count), 
TRUE);
+                                       meta->model_ascii = 
rs_remove_tailing_spaces(raw_strdup(rawfile, ifd.offset, ifd.count), TRUE);
                                break;
                        case 0x0111: /* StripOffsets */
                                if (meta->preview_start==0 || is_preview)


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit