From 328ebcf4620479f7159d7a29f00949dc81f85fef Mon Sep 17 00:00:00 2001 From: nkbj Date: Sat, 5 Mar 2016 03:23:36 +0000 Subject: [PATCH] Fix a couple of lens names to be consistent across lens mounts. --- src/canonmn.cpp | 4 ++-- test/data/bugfixes-test.out | Bin 1857519 -> 1857527 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/canonmn.cpp b/src/canonmn.cpp index 224de2bb..89351225 100644 --- a/src/canonmn.cpp +++ b/src/canonmn.cpp @@ -793,7 +793,7 @@ namespace Exiv2 { { 160, "Tokina AT-X 124 AF 12-24mm f/4 DX" }, // 2 { 160, "Tokina AT-X 107 AF DX Fish-eye 10-17mm f/3.5-4.5" }, // 3 { 160, "Tokina AT-X 116 PRO DX AF 11-16mm f/2.8" }, // 4 - { 160, "Tokina AT-X 11 PRO DX Aspherical 11-20mm f/2.8" }, // 5 + { 160, "Tokina AT-X 11-20 F2.8 PRO DX Aspherical 11-20mm f/2.8" }, // 5 { 161, "Canon EF 28-70mm f/2.8L" }, // 0 { 161, "Sigma 24-70mm EX f/2.8" }, // 1 { 161, "Sigma 28-70mm f/2.8 EX" }, // 2 @@ -895,7 +895,7 @@ namespace Exiv2 { { 232, "Canon EF 70-300mm f/4.5-5.6 DO IS USM" }, { 233, "Canon EF 28-300mm f/3.5-5.6L IS" }, { 234, "Canon EF-S 17-85mm f4-5.6 IS USM" }, // 0 - { 234, "Tokina AT-X 12-28mm f/4 PRO DX" }, // 1 + { 234, "Tokina AT-X 12-28 PRO DX 12-28mm f/4" }, // 1 { 235, "Canon EF-S 10-22mm f/3.5-4.5 USM" }, { 236, "Canon EF-S 60mm f/2.8 Macro USM" }, { 237, "Canon EF 24-105mm f/4L IS" }, diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out index 3ab4673921988ca2310e5230e32b2d3679ec12c0..e0ed355991a252cbdf17c1d1acd7d632f40f86df 100644 GIT binary patch delta 80 zcmaFAzVQ3{!iE;c7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#7J(MQ7NHj57LgXw j7O@ub7Ks+g7O58LEi!3g9J)pZ3T{Sv7TeRpWI7oEVu%?> delta 71 zcmV~$xeb6I06@{;eT(2Nb1{OY2^(1a#%X9w9Lv(y_df4l?@j~(ArUbNDH%BhB^5Od XEs_p}re|PeVrF4wyUlK&!