Project

General

Profile

Patch #878

Update list of lenses for Olympus cameras.

Added by Niels Kristian Bech Jensen over 6 years ago. Updated almost 6 years ago.

Status:
Closed
Priority:
Normal
Assignee:
Category:
metadata
Target version:
Start date:
12 Jan 2013
Due date:
% Done:

0%

Estimated time:

Description

This patch updates the list of lenses for Olympus cameras to match ExifTool 9.13.

Regards,
Niels Kristian


Files

exiv2_olympus_lenses.diff (5.74 KB) exiv2_olympus_lenses.diff Niels Kristian Bech Jensen, 12 Jan 2013 22:19
exiv2_olympus_lenses.diff (6.11 KB) exiv2_olympus_lenses.diff Niels Kristian Bech Jensen, 13 Jan 2013 00:42
exiv2_olympus_lenses.patch (6.14 KB) exiv2_olympus_lenses.patch Niels Kristian Bech Jensen, 13 Jan 2013 20:25

Associated revisions

Revision 2970 (diff)
Added by Robin Mills over 6 years ago

Issue: #878. Thanks to Neils for the patch.

History

#1

Updated by Niels Kristian Bech Jensen over 6 years ago

Updated patch with more lenses.

Regards,
Niels Kristian Bech Jensen

#2

Updated by Robin Mills over 6 years ago

  • Category set to metadata
  • Status changed from New to Assigned
  • Assignee set to Robin Mills
  • Target version set to 0.24

Neils

I appreciate very much you providing these updates for exiv2. Can I ask you to create patch files with the command svn diff > foo.patch. I think you're sending me diff files which I can probably manually convert into a patch. However to avoid errors, I much prefer to use the tools "as is" without manual intervention.

502 rmills@rmills-laptop:/c/gnu.test/exiv2 $ svn patch ~/Downloads/exiv2_olympus_lenses.diff
Skipped missing target: 'exiv2/src/olympusmn.cpp'
Summary of conflicts:
  Skipped paths: 1
516 rmills@rmills-laptop:/c/gnu.test/exiv2 $ cat ~/Downloads/exiv2_olympus_lenses.diff
--- exiv2.2967/src/olympusmn.cpp        2013-01-13 09:28:48.241585989 +0100
+++ exiv2/src/olympusmn.cpp     2013-01-13 09:34:51.833573875 +0100
@@ -1240,18 +1240,32 @@
             { { 0,  0,  0 }, N_("None")                                            },
             { { 0,  1,  0 }, N_("Olympus Zuiko Digital ED 50mm F2.0 Macro")        },
             { { 0,  1,  1 }, N_("Olympus Zuiko Digital 40-150mm F3.5-4.5")         },
-            { { 0,  1, 16 }, N_("Olympus Zuiko Digital ED 14-42mm F3.5-5.6")       },
+            { { 0,  1, 16 }, N_("Olympus M.Zuiko Digital ED 14-42mm F3.5-5.6")     },
             { { 0,  2,  0 }, N_("Olympus Zuiko Digital ED 150mm F2.0")             },
-            { { 0,  2, 16 }, N_("Olympus Zuiko Digital 17mm F2.8 Pancake")         },
....

I then edited exiv2.cpp
504 rmills@rmills-laptop:/c/gnu.test/exiv2 $ svn diff > neils.patch ; cat neils.patch
Index: src/exiv2.cpp
===================================================================
--- src/exiv2.cpp       (revision 2967)
+++ src/exiv2.cpp       (working copy)
@@ -8,7 +8,7 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+ * A little change for Niels
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
505 rmills@rmills-laptop:/c/gnu.test/exiv2 $ svn diff > neils.patch
506 rmills@rmills-laptop:/c/gnu.test/exiv2 $ svn revert src/exiv2.cpp
Reverted 'src/exiv2.cpp'
507 rmills@rmills-laptop:/c/gnu.test/exiv2 $ svn patch neils.patch
U         src/exiv2.cpp
508 rmills@rmills-laptop:/c/gnu.test/exiv2 $ svn revert src/exiv2.cpp
Reverted 'src/exiv2.cpp'
#3

Updated by Niels Kristian Bech Jensen over 6 years ago

Here is the same patch made with svn. You make me feel quite old using the true and tested methods. ;-)

Regards,
Niels Kristian

#4

Updated by Robin Mills over 6 years ago

Thanks, Neils - much appreciated. Yup, I forgot about the patch utility. Too much svn kills the brain. I'm making you feel old? I'm old. I'll be 62 on Friday. It's not all bad, I start getting a senior discount on the bus.

Thanks for this contribution. I wonder if I can get a script together to collect wisdom from exiftool to update exiv2. Ummm. We'll see.

Robin

#5

Updated by Niels Kristian Bech Jensen over 6 years ago

I think it will be quite difficult to write and maintain a script to extract data from ExifTool since each camera manufacturer encodes makernote data in different formats.

Regards,
Niels Kristian

#6

Updated by Robin Mills over 6 years ago

  • Status changed from Assigned to Resolved
#7

Updated by Robin Mills almost 6 years ago

  • Status changed from Resolved to Closed

Fixed in 0.24.

Also available in: Atom PDF