sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (48808ff8ee13bec76f737b3a2a4e481e5f7e9c9c)

From: Florian Franzmann <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (48808ff8ee13bec76f737b3a2a4e481e5f7e9c9c)
Date: Wed, 7 Aug 2013 07:35:44 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 4
graphics-libs/ftgl/BUILD | 2
graphics-libs/ftgl/HISTORY | 3
graphics/exiv2/00_hyphens_used_as_minus.diff | 60 +++
graphics/exiv2/90_changeset_r2743.diff | 11
graphics/exiv2/90_changeset_r2744.diff | 12
graphics/exiv2/90_changeset_r2756.diff | 14
graphics/exiv2/90_changeset_r2818_partial.diff | 36 +
graphics/exiv2/90_changeset_r2860.diff | 12
graphics/exiv2/90_changeset_r2889.diff | 27 +
graphics/exiv2/90_changeset_r2958.diff | 30 +
graphics/exiv2/90_changeset_r2959.diff | 21 +
graphics/exiv2/90_changeset_r2961.diff | 497
+++++++++++++++++++++++++
graphics/exiv2/90_changeset_r2963.diff | 22 +
graphics/exiv2/90_changeset_r2968.diff | 22 +
graphics/exiv2/90_changeset_r2969.diff | 12
graphics/exiv2/90_changeset_r2970.diff | 77 +++
graphics/exiv2/90_changeset_r2975.diff | 165 ++++++++
graphics/exiv2/90_changeset_r2978.diff | 12
graphics/exiv2/90_changeset_r2981.diff | 51 ++
graphics/exiv2/90_changeset_r2982.diff | 21 +
graphics/exiv2/90_changeset_r2984.diff | 22 +
graphics/exiv2/90_changeset_r2985.diff | 14
graphics/exiv2/90_changeset_r2986.diff | 16
graphics/exiv2/90_changeset_r2988.diff | 12
graphics/exiv2/90_changeset_r2989.diff | 21 +
graphics/exiv2/90_changeset_r2990.diff | 31 +
graphics/exiv2/90_changeset_r2991.diff | 15
graphics/exiv2/90_changeset_r2992.diff | 12
graphics/exiv2/90_changeset_r2993.diff | 95 ++++
graphics/exiv2/90_changeset_r2994.diff | 14
graphics/exiv2/90_changeset_r2995.diff | 135 ++++++
graphics/exiv2/90_changeset_r2998.diff | 53 ++
graphics/exiv2/90_changeset_r3002.diff | 79 +++
graphics/exiv2/90_changeset_r3003.diff | 291 ++++++++++++++
graphics/exiv2/90_changeset_r3004.diff | 180 +++++++++
graphics/exiv2/90_changeset_r3005.diff | 113 +++++
graphics/exiv2/90_changeset_r3006.diff | 15
graphics/exiv2/90_changeset_r3011.diff | 12
graphics/exiv2/90_changeset_r3016.diff | 47 ++
graphics/exiv2/90_changeset_r3017.diff | 41 ++
graphics/exiv2/90_changeset_r3023.diff | 293 ++++++++++++++
graphics/exiv2/90_changeset_r3026.diff | 13
graphics/exiv2/95_post_r3026_cleanup.diff | 100 +++++
graphics/exiv2/HISTORY | 45 ++
graphics/exiv2/PRE_BUILD | 43 ++
utils/nocache/BUILD | 1
utils/nocache/DETAILS | 22 +
utils/nocache/HISTORY | 3
utils/nocache/PRE_BUILD | 5
50 files changed, 2853 insertions(+), 1 deletion(-)

New commits:
commit 48808ff8ee13bec76f737b3a2a4e481e5f7e9c9c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/nocache: new spell, tool for excluding processes from the buffer
cache

commit 76bbc2d4c8168781ee9e33b2c2835140ebfd6c84
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics-libs/ftgl: fix linker error

commit 3b3be8804c144fb9590db599a27f90386736e612
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/exiv2: add patches from upstream to fix a memory leak, add
support for recent cameras/lenses, fix use after delete

diff --git a/ChangeLog b/ChangeLog
index e4b0a82..6740774 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * utils/nocache: new spell, a tool for excluding processes from
+ participating in the buffer cache
+
2013-08-06 Treeve Jelbert <treeve AT sourcemage.org>
* net/tcpdump.gpg: add D9C15D0D <The Tcpdump Group>

diff --git a/graphics-libs/ftgl/BUILD b/graphics-libs/ftgl/BUILD
index 7063ee5..0475cbe 100755
--- a/graphics-libs/ftgl/BUILD
+++ b/graphics-libs/ftgl/BUILD
@@ -1,2 +1,2 @@
OPTS+=" --with-gl-inc=/usr/include" &&
-LIBS+=" -lm" default_build
+LIBS+=" -lm -lGL -lGLU" default_build
diff --git a/graphics-libs/ftgl/HISTORY b/graphics-libs/ftgl/HISTORY
index 7a40daa..b4e5b9b 100644
--- a/graphics-libs/ftgl/HISTORY
+++ b/graphics-libs/ftgl/HISTORY
@@ -1,3 +1,6 @@
+2013-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ BUILD: add -lGL and -lGLU to LIBS
+
2012-10-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: added dependency on texlive, bzip2, libxext, zlib
* BUILD: fix build error
diff --git a/graphics/exiv2/00_hyphens_used_as_minus.diff
b/graphics/exiv2/00_hyphens_used_as_minus.diff
new file mode 100644
index 0000000..79975f4
--- /dev/null
+++ b/graphics/exiv2/00_hyphens_used_as_minus.diff
@@ -0,0 +1,60 @@
+--- a/src/exiv2.1
++++ b/src/exiv2.1
+@@ -171,17 +171,17 @@ Print mode for the 'print' action. Possi
+ .br
+ s : print a summary of the Exif metadata (the default)
+ .br
+-a : print Exif, IPTC and XMP metadata (shortcut for -Pkyct)
++a : print Exif, IPTC and XMP metadata (shortcut for \-Pkyct)
+ .br
+-t : interpreted (translated) Exif tags (-PEkyct)
++t : interpreted (translated) Exif tags (\-PEkyct)
+ .br
+-v : plain Exif tag values (-PExgnycv)
++v : plain Exif tag values (\-PExgnycv)
+ .br
+-h : hexdump of the Exif data (-PExgnycsh)
++h : hexdump of the Exif data (\-PExgnycsh)
+ .br
+-i : IPTC datasets (-PIkyct)
++i : IPTC datasets (\-PIkyct)
+ .br
+-x : XMP properties (-PXkyct)
++x : XMP properties (\-PXkyct)
+ .br
+ c : JPEG comment
+ .br
+@@ -256,7 +256,7 @@ images and a modifier to generate an XMP
+ p[<n>[,<m> ...]] : Extract preview images. The optional comma separated
+ list of preview image numbers is used to determine which preview images
+ to extract. The available preview images and their numbers are displayed
+-with the 'print' option -pp.
++with the 'print' option \-pp.
+ .br
+ X : Extract metadata to an XMP sidecar file <file>.xmp. The remaining
+ extract targets determine what metadata to extract to the sidecar
+@@ -393,13 +393,13 @@ ignored (comments). Remaining lines are
+ exiv2 *.jpg
+ Prints a summary of the Exif information for all JPEG files in the
directory.
+ .TP
+-exiv2 -pi image.jpg
++exiv2 \-pi image.jpg
+ Prints the IPTC metadata of the image.
+ .TP
+ exiv2 rename img_1234.jpg
+ Renames img_1234.jpg (taken on 13\-Nov\-05 at 22:58:31) to
20051113_225831.jpg
+ .TP
+-exiv2 -r':basename:_%Y%m' rename img_1234.jpg
++exiv2 \-r':basename:_%Y%m' rename img_1234.jpg
+ Renames img_1234.jpg to img_1234_200511.jpg
+ .TP
+ exiv2 \-et img1.jpg img2.jpg
+@@ -441,7 +441,7 @@ and GPSLatitudeRef contains either 'N' o
+ latitude respectively.
+ .TP
+ .nf
+-exiv2 insert -l/tmp -S.CRW /data/*.JPG
++exiv2 insert \-l/tmp \-S.CRW /data/*.JPG
+ .fi
+ Copy all metadata from CRW files in the /tmp directory to JPG files
+ with corresponding basenames in the /data directory. Note that this
diff --git a/graphics/exiv2/90_changeset_r2743.diff
b/graphics/exiv2/90_changeset_r2743.diff
new file mode 100644
index 0000000..1994069
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2743.diff
@@ -0,0 +1,11 @@
+--- a/src/exif.cpp (revision 2742)
++++ b/src/exif.cpp (revision 2743)
+@@ -752,6 +752,8 @@
+ { pttLen, "Exif.Pentax.PreviewLength" },
+ { pttTag, "Exif.Pentax.PreviewOffset" },
+ { pttTag, "Exif.Pentax.PreviewResolution" },
++ { pttLen, "Exif.SamsungPreview.JPEGInterchangeFormatLength" },
++ { pttIfd, "SamsungPreview" },
+ { pttLen, "Exif.Thumbnail.StripByteCounts" },
+ { pttIfd, "Thumbnail" },
+ { pttLen, "Exif.Thumbnail.JPEGInterchangeFormatLength" },
diff --git a/graphics/exiv2/90_changeset_r2744.diff
b/graphics/exiv2/90_changeset_r2744.diff
new file mode 100644
index 0000000..8ff8229
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2744.diff
@@ -0,0 +1,12 @@
+--- a/src/exif.cpp (revision 2743)
++++ b/src/exif.cpp (revision 2744)
+@@ -752,6 +752,9 @@
+ { pttLen, "Exif.Pentax.PreviewLength" },
+ { pttTag, "Exif.Pentax.PreviewOffset" },
+ { pttTag, "Exif.Pentax.PreviewResolution" },
++ { pttLen, "Exif.PentaxDng.PreviewLength" },
++ { pttTag, "Exif.PentaxDng.PreviewOffset" },
++ { pttTag, "Exif.PentaxDng.PreviewResolution" },
+ { pttLen, "Exif.SamsungPreview.JPEGInterchangeFormatLength" },
+ { pttIfd, "SamsungPreview" },
+ { pttLen, "Exif.Thumbnail.StripByteCounts" },
diff --git a/graphics/exiv2/90_changeset_r2756.diff
b/graphics/exiv2/90_changeset_r2756.diff
new file mode 100644
index 0000000..c319528
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2756.diff
@@ -0,0 +1,14 @@
+Index: canonmn.cpp
+===================================================================
+--- a/src/canonmn.cpp (revision 2755)
++++ b/src/canonmn.cpp (revision 2756)
+@@ -525,7 +525,8 @@
+ { 137, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM"
}, // 6
+ { 137, "Sigma 17-50mm f/2.8 OS HSM"
}, // 7
+ { 137, "Sigma 18-200mm f/3.5-6.3 II DC OS HSM"
}, // 8
+- { 137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD"
}, // 9
++ { 137, "Sigma 12-24mm f/4.5-5.6 DG HSM II"
}, // 9
++ { 137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD"
}, // 10
+ { 138, "Canon EF 28-80mm f/2.8-4L"
},
+ { 139, "Canon EF 400mm f/2.8L"
},
+ { 140, "Canon EF 500mm f/4.5L"
},
diff --git a/graphics/exiv2/90_changeset_r2818_partial.diff
b/graphics/exiv2/90_changeset_r2818_partial.diff
new file mode 100644
index 0000000..7250dca
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2818_partial.diff
@@ -0,0 +1,36 @@
+Index: canonmn.cpp
+===================================================================
+--- a/src/canonmn.cpp (revision 2817)
++++ a/src/canonmn.cpp (revision 2818)
+@@ -173,6 +173,13 @@
+ { 0x80000261, N_("EOS 50D") },
+ { 0x80000270, N_("EOS Rebel T2i / 550D / Kiss X4") },
+ { 0x80000281, N_("EOS-1D Mark IV") },
++ { 0x80000285, N_("EOS 5D Mark III") },
++ { 0x80000286, N_("EOS Rebel T3i / 600D / Kiss X5") },
++ { 0x80000287, N_("EOS 60D") },
++ { 0x80000288, N_("EOS Rebel T3 / 1100D / Kiss X50") },
++ { 0x80000297, N_("WFT-E2 II") },
++ { 0x80000298, N_("WFT-E4 II") },
++ { 0x80000301, N_("EOS Rebel T4i / 650D / Kiss X6i") },
+ };
+
+ //! SerialNumberFormat, tag 0x0015
+@@ -652,11 +659,16 @@
+ { 249, "Canon EF 800mm f/5.6L IS"
},
+ { 250, "Canon EF 24 f/1.4L II"
},
+ { 251, "Canon EF 70-200mm f/2.8L IS II USM"
},
++ { 252, "Canon EF 70-200mm f/2.8L IS II USM + 1.4x"
},
++ { 253, "Canon EF 70-200mm f/2.8L IS II USM + 2x"
},
+ { 254, "Canon EF 100mm f/2.8L Macro IS USM"
},
+ { 488, "Canon EF-S 15-85mm f/3.5-5.6 IS USM"
},
+ { 489, "Canon EF 70-300mm f/4-5.6L IS USM"
},
+ { 490, "Canon EF 8-15mm f/4L USM"
},
+- { 491, "Canon EF 300mm f/2.8L IS II USM"
}
++ { 491, "Canon EF 300mm f/2.8L IS II USM"
},
++ { 494, "Canon EF 600mm f/4.0L IS II USM"
},
++ { 495, "Canon EF 24-70mm f/2.8L II USM"
},
++ { 4144,"Canon EF 40mm f/2.8 STM"
}
+ };
+
+ //! A lens id and a pretty-print function for special treatment of the
id.
diff --git a/graphics/exiv2/90_changeset_r2860.diff
b/graphics/exiv2/90_changeset_r2860.diff
new file mode 100644
index 0000000..bef2951
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2860.diff
@@ -0,0 +1,12 @@
+Index: trunk/src/pentaxmn.cpp
+===================================================================
+--- trunk/src/pentaxmn.cpp (revision 2859)
++++ trunk/src/pentaxmn.cpp (revision 2860)
+@@ -666,6 +666,7 @@
+ { 0x060e, "smc PENTAX-FA* MACRO 200mm F4 ED[IF]" },
+ { 0x0700, "smc PENTAX-DA 21mm F3.2 AL Limited" },
+ { 0x074b, "Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)" },
++ { 0x07d6, "smc PENTAX-DA 35mm F2.4 AL" },
+ { 0x07d9, "smc PENTAX-DA 50-200mm F4-5.6 ED WR" },
+ { 0x07da, "smc PENTAX-DA 18-55mm F3.5-5.6 AL WR" },
+ { 0x07dc, "Tamron SP AF 10-24mm F3.5-4.5 Di II LD Aspherical [IF]"
},
diff --git a/graphics/exiv2/90_changeset_r2889.diff
b/graphics/exiv2/90_changeset_r2889.diff
new file mode 100644
index 0000000..b04643d
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2889.diff
@@ -0,0 +1,27 @@
+Index: trunk/src/pentaxmn.cpp
+===================================================================
+--- trunk/src/pentaxmn.cpp (revision 2888)
++++ trunk/src/pentaxmn.cpp (revision 2889)
+@@ -561,11 +561,19 @@
+ { 0x0314, "smc PENTAX-F 35-80mm F4-5.6" },
+ { 0x0315, "smc PENTAX-F 80-200mm F4.7-5.6" },
+ { 0x0316, "smc PENTAX-F FISH-EYE 17-28mm F3.5-4.5" },
+- { 0x0317, "smc PENTAX-F 100-300mm F4.5-5.6" },
++ { 0x0317, "smc PENTAX-F 100-300mm F4.5-5.6" }, //0
++ { 0x0317, "Sigma AF 28-300mm F3.5-5.6 DL IF" }, //1
++ { 0x0317, "Sigma AF 28-300mm F3.5-6.3 DG IF Macro" }, //2
+ { 0x0318, "smc PENTAX-F 35-135mm F3.5-4.5" },
+- { 0x0319, "smc PENTAX-F 35-105mm F4-5.6 or SIGMA or Tokina" },
++ { 0x0319, "smc PENTAX-F 35-105mm F4-5.6 or SIGMA or Tokina" }, //0
++ { 0x0319, "Sigma AF 28-300mm F3.5-5.6 DL IF" }, //1
++ { 0x0319, "Sigma 55-200mm F4-5.6 DC" }, //2
++ { 0x0319, "Sigma AF 28-300mm F3.5-5.6 DL IF" }, //3
++ { 0x0319, "Sigma AF 28-300mm F3.5-6.3 DG IF Macro" }, //4
++ { 0x0319, "Tokina 80-200mm F2.8 ATX-Pro" }, //5
+ { 0x031a, "smc PENTAX-F* 250-600mm F5.6 ED[IF]" },
+- { 0x031b, "smc PENTAX-F 28-80mm F3.5-4.5" },
++ { 0x031b, "smc PENTAX-F 28-80mm F3.5-4.5" }, //0
++ { 0x031b, "Tokina AT-X Pro AF 28-70mm F2.6-2.8" }, //1
+ { 0x031c, "smc PENTAX-F 35-70mm F3.5-4.5" },
+ { 0x031d, "PENTAX-F 28-80mm F3.5-4.5 or SIGMA AF 18-125mm F3.5-5.6
DC" },
+ { 0x031e, "PENTAX-F 70-200mm F4-5.6" },
diff --git a/graphics/exiv2/90_changeset_r2958.diff
b/graphics/exiv2/90_changeset_r2958.diff
new file mode 100644
index 0000000..0302d62
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2958.diff
@@ -0,0 +1,30 @@
+Index: trunk/src/samsungmn.cpp
+===================================================================
+--- trunk/src/samsungmn.cpp (revision 2957)
++++ trunk/src/samsungmn.cpp (revision 2958)
+@@ -50,14 +50,17 @@
+
+ //! LensType, tag 0xa003
+ extern const TagDetails samsung2LensType[] = {
+- { 0, N_("Built-in") },
+- { 1, N_("Samsung 30mm F2 Pancake") },
+- { 2, N_("Samsung Zoom 18-55mm F3.5-5.6 OIS") },
+- { 3, N_("Samsung Zoom 50-200mm F4-5.6 ED OIS") },
+- { 4, N_("Samsung 20-50mm F3.5-5.6 Compact Zoom") },
+- { 5, N_("Samsung 20mm F2.8 Pancake") },
+- { 7, N_("Samsung 60mm F2.8 Macro ED OIS SSA") },
+- { 8, N_("Samsung 16mm F2.4 Ultra Wide Pancake") }
++ { 0, N_("Built-in") },
++ { 1, N_("Samsung NX 30mm F2 Pancake") },
++ { 2, N_("Samsung NX 18-55mm F3.5-5.6 OIS") },
++ { 3, N_("Samsung NX 50-200mm F4-5.6 ED OIS") },
++ { 4, N_("Samsung NX 20-50mm F3.5-5.6 ED") },
++ { 6, N_("Samsung NX 18-200mm F3.5-6.3 ED OIS") },
++ { 5, N_("Samsung NX 20mm F2.8 Pancake") },
++ { 7, N_("Samsung NX 60mm F2.8 Macro ED OIS SSA") },
++ { 8, N_("Samsung NX 16mm F2.4 Pancake") },
++ { 9, N_("Samsung NX 85mm F1.4 ED SSA") },
++ { 12, N_("Samsung NX 12-24mm F4-5.6 ED") }
+ };
+
+ //! ColorSpace, tag 0xa011
diff --git a/graphics/exiv2/90_changeset_r2959.diff
b/graphics/exiv2/90_changeset_r2959.diff
new file mode 100644
index 0000000..fb70153
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2959.diff
@@ -0,0 +1,21 @@
+Index: trunk/src/pentaxmn.cpp
+===================================================================
+--- trunk/src/pentaxmn.cpp (revision 2958)
++++ trunk/src/pentaxmn.cpp (revision 2959)
+@@ -675,6 +675,7 @@
+ { 0x0700, "smc PENTAX-DA 21mm F3.2 AL Limited" },
+ { 0x074b, "Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)" },
+ { 0x07d6, "smc PENTAX-DA 35mm F2.4 AL" },
++ { 0x07d6, "smc PENTAX-DA 35mm F2.4 AL" },
+ { 0x07d9, "smc PENTAX-DA 50-200mm F4-5.6 ED WR" },
+ { 0x07da, "smc PENTAX-DA 18-55mm F3.5-5.6 AL WR" },
+ { 0x07dc, "Tamron SP AF 10-24mm F3.5-4.5 Di II LD Aspherical [IF]"
},
+@@ -694,6 +695,8 @@
+ { 0x07f2, "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM (SDM not
used)" },
+ { 0x07f3, "smc PENTAX-DA 70mm F2.4 Limited" },
+ { 0x07f4, "smc PENTAX-DA 21mm F3.2 AL Limited" },
++ { 0x0808, "SIGMA 18-250mm F3.5-6.3 DC OS HSM" },
++ { 0x08d7, "smc PENTAX-DA 18-135mm F3.5-5.6 ED AL [IF] DC WR" },
+ { 0x08e2, "smc PENTAX-DA* 55mm F1.4 SDM" },
+ { 0x08e3, "smc PENTAX DA* 60-250mm F4 [IF] SDM"},
+ { 0x08e8, "smc PENTAX-DA 17-70mm F4 AL [IF] SDM" },
diff --git a/graphics/exiv2/90_changeset_r2961.diff
b/graphics/exiv2/90_changeset_r2961.diff
new file mode 100644
index 0000000..5327b55
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2961.diff
@@ -0,0 +1,497 @@
+--- trunk/src/pentaxmn.cpp (revision 2960)
++++ trunk/src/pentaxmn.cpp (revision 2961)
+@@ -65,6 +65,7 @@
+ { 0x12958, N_("Optio 330GS") },
+ { 0x12962, N_("Optio 450/550") },
+ { 0x1296c, N_("Optio S") },
++ { 0x12971, N_("Optio S V1.01") },
+ { 0x12994, N_("*ist D") },
+ { 0x129b2, N_("Optio 33L") },
+ { 0x129bc, N_("Optio 33LF") },
+@@ -111,14 +112,18 @@
+ { 0x12c32, N_("Optio M20") },
+ { 0x12c3c, N_("Optio W20") },
+ { 0x12c46, N_("Optio A20") },
+- { 0x12c8c, N_("Optio M30") },
++// { 0x12c8c, N_("Optio M30") },
+ { 0x12c78, N_("Optio E30") },
+ { 0x12c7d, N_("Optio E35") },
+ { 0x12c82, N_("Optio T30") },
++ { 0x12c8c, N_("Optio M30") },
++ { 0x12c91, N_("Optio L30") },
+ { 0x12c96, N_("Optio W30") },
+ { 0x12ca0, N_("Optio A30") },
+ { 0x12cb4, N_("Optio E40") },
+ { 0x12cbe, N_("Optio M40") },
++ { 0x12cc3, N_("Optio L40") },
++ { 0x12cc5, N_("Optio L36") },
+ { 0x12cc8, N_("Optio Z10") },
+ { 0x12cd2, N_("K20D") },
+ { 0x12cd4, N_("Samsung GX20") },
+@@ -129,13 +134,15 @@
+ { 0x12d04, N_("Optio S12") },
+ { 0x12d0e, N_("Optio E50") },
+ { 0x12d18, N_("Optio M50") },
++ { 0x12d22, N_("Optio L50") },
+ { 0x12d2c, N_("Optio V20") },
+ { 0x12d40, N_("Optio W60") },
+ { 0x12d4a, N_("Optio M60") },
+- { 0x12d68, N_("Optio E60") },
++ { 0x12d68, N_("Optio E60/M90") },
+ { 0x12d72, N_("K2000") },
+ { 0x12d73, N_("K-m") },
+ { 0x12d86, N_("Optio P70") },
++ { 0x12d90, N_("Optio L70") },
+ { 0x12d9a, N_("Optio E70") },
+ { 0x12dae, N_("X70") },
+ { 0x12db8, N_("K-7") },
+@@ -144,7 +151,30 @@
+ { 0x12df4, N_("Optio WS80") },
+ { 0x12dfe, N_("K-x") },
+ { 0x12e08, N_("645D") },
++ { 0x12e12, N_("Optio E80") },
++ { 0x12e30, N_("Optio W90") },
+ { 0x12e3a, N_("Optio I-10") },
++ { 0x12e44, N_("Optio H90") },
++ { 0x12e4e, N_("Optio E90") },
++ { 0x12e58, N_("X90") },
++ { 0x12e6c, N_("K-r") },
++ { 0x12e76, N_("K-5") },
++ { 0x12e8a, N_("Optio RS1000/RS1500") },
++ { 0x12e94, N_("Optio RZ10") },
++ { 0x12e9e, N_("Optio LS1000") },
++ { 0x12ebc, N_("Optio WG-1 GPS") },
++ { 0x12ed0, N_("Optio S1") },
++ { 0x12ee4, N_("Q") },
++ { 0x12ef8, N_("K-01") },
++ { 0x12f0c, N_("Optio RZ18") },
++ { 0x12f16, N_("Optio VS20") },
++ { 0x12f2a, N_("Optio WG-2 GPS") },
++ { 0x12f48, N_("Optio LS465") },
++ { 0x12f52, N_("K-30") },
++ { 0x12f5c, N_("X-5") },
++ { 0x12f66, N_("Q10") },
++ { 0x12f70, N_("K-5 II") },
++ { 0x12f71, N_("K-5 II s") },
+ };
+
+ //! Quality, tag 0x0008
+@@ -155,6 +185,7 @@
+ { 3, N_("TIFF") },
+ { 4, N_("RAW") },
+ { 5, N_("Premium") },
++ { 65535, N_("n/a") },
+ };
+
+ //! Size, tag 0x0009
+@@ -175,22 +206,43 @@
+ { 23, N_("3056x2296") },
+ { 25, N_("2816x2212 or 2816x2112") },
+ { 27, N_("3648x2736") },
++ { 29, N_("4000x3000") },
++ { 30, N_("4288x3216") },
++ { 31, N_("4608x3456") },
++ { 129, N_("1920x1080") },
++ { 135, N_("4608x2592") },
++ { 257, N_("3216x3216") },
++// not sure what to do with these values:
++// '0 0' = 2304x1728
++// '4 0' = 1600x1200
++// '5 0' = 2048x1536
++// '8 0' = 2560x1920
++// '32 2' = 960x640
++// '33 2' = 1152x768
++// '34 2' = 1536x1024
++// '35 1' = 2400x1600
++// '36 0' = 3008x2008 or 3040x2024
++// '37 0' = 3008x2000
+ };
+
+ //! Flash, tag 0x000c
+ extern const TagDetails pentaxFlash[] = {
+ { 0x000, N_("Auto, Did not fire") },
+- { 0x001, N_("Off") },
++ { 0x001, N_("Off, Did not fire") },
++ { 0x002, N_("Off, Did not fire") },
+ { 0x003, N_("Auto, Did not fire, Red-eye reduction") },
++ { 0x005, N_("On. Did not fire. Wireless (Master)") },
+ { 0x100, N_("Auto, Fired") },
+- { 0x102, N_("On") },
++ { 0x102, N_("On, Fired") },
+ { 0x103, N_("Auto, Fired, Red-eye reduction") },
+ { 0x104, N_("On, Red-eye reduction") },
+- { 0x105, N_("On, Wireless") },
++ { 0x105, N_("On, Wireless (Master)") },
++ { 0x106, N_("On, Wireless (Control)") },
+ { 0x108, N_("On, Soft") },
+ { 0x109, N_("On, Slow-sync") },
+ { 0x10a, N_("On, Slow-sync, Red-eye reduction") },
+ { 0x10b, N_("On, Trailing-curtain Sync") },
++// exiftool recognises 2 values, the values here correpond with Value 0
+ };
+
+ //! Focus, tag 0x000d
+@@ -204,6 +256,9 @@
+ { 16, N_("AF-S") },
+ { 17, N_("AF-C") },
+ { 18, N_("AF-A") },
++ { 32, N_("Contrast-detect") },
++ { 33, N_("Tracking Contrast-detect") },
++ { 288, N_("Face Detect") },
+ };
+
+ //! AFPoint, tag 0x000e
+@@ -212,6 +267,8 @@
+ { 0xfffe, N_("Fixed Center") },
+ { 0xfffd, N_("Automatic Tracking AF") },
+ { 0xfffc, N_("Face Recognition AF") },
++ { 0xfffb, N_("AF Select") },
++ { 0, N_("None") },
+ { 1, N_("Upper-left") },
+ { 2, N_("Top") },
+ { 3, N_("Upper-right") },
+@@ -264,10 +321,19 @@
+ { 22, N_("4000") },
+ { 23, N_("5000") },
+ { 24, N_("6400") },
++ { 25, N_("8000") },
++ { 26, N_("10000") },
++ { 27, N_("12800") },
++ { 28, N_("16000") },
++ { 29, N_("20000") },
++ { 30, N_("25600") },
++ { 31, N_("32000") },
++ { 32, N_("40000") },
++ { 33, N_("51200") },
+ { 50, N_("50") },
+ { 100, N_("100") },
+ { 200, N_("200") },
+- { 268, N_("200") },
++// { 268, N_("200") },
+ { 400, N_("400") },
+ { 800, N_("800") },
+ { 1600, N_("1600") },
+@@ -285,6 +351,15 @@
+ { 268, N_("1600") },
+ { 269, N_("2200") },
+ { 270, N_("3200") },
++ { 271, N_("4500") },
++ { 272, N_("6400") },
++ { 273, N_("9000") },
++ { 274, N_("12800") },
++ { 275, N_("18000") },
++ { 276, N_("25600") },
++ { 277, N_("36000") },
++ { 278, N_("51200") },
++
+ };
+
+ //! Generic for Off/On switches
+@@ -319,6 +394,7 @@
+ { 8, N_("WhiteFluorescent") },
+ { 9, N_("Flash") },
+ { 10, N_("Cloudy") },
++ { 15, N_("Color Temperature Enhancement") },
+ { 17, N_("Kelvin") },
+ { 65534, N_("Unknown") },
+ { 65535, N_("User Selected") },
+@@ -330,6 +406,7 @@
+ { 2, N_("Auto (Shade)") },
+ { 3, N_("Auto (Flash)") },
+ { 4, N_("Auto (Tungsten)") },
++ { 6, N_("Auto (DaylightFluorescent)") },
+ { 7, N_("Auto (DaywhiteFluorescent)") },
+ { 8, N_("Auto (WhiteFluorescent)") },
+ { 10, N_("Auto (Cloudy)") },
+@@ -346,6 +423,8 @@
+ { 4, N_("Med High") },
+ { 5, N_("Very Low") },
+ { 6, N_("Very High") },
++ { 7, N_("-4") },
++ { 8, N_("+4") },
+ { 65535, N_("None") },
+ { 65535, N_("None") } // To silence compiler
warning
+ };
+@@ -359,6 +438,8 @@
+ { 4, N_("Med High") },
+ { 5, N_("Very Low") },
+ { 6, N_("Very High") },
++ { 7, N_("-4") },
++ { 8, N_("+4") },
+ };
+
+ //! Sharpness, tag 0x0021
+@@ -370,6 +451,8 @@
+ { 4, N_("Med Hard") },
+ { 5, N_("Very Soft") },
+ { 6, N_("Very Hard") },
++ { 7, N_("-4") },
++ { 8, N_("+4") },
+ };
+
+ //! Location, tag 0x0022
+@@ -452,20 +535,27 @@
+ { 69, N_("Stockholm") },
+ { 70, N_("Lisbon") },
+ { 71, N_("Copenhagen") },
++ { 72, N_("Warsaw") },
++ { 73, N_("Prague") },
++ { 74, N_("Budapest") },
+ };
+
+ //! ImageProcessing, combi-tag 0x0032 (4 bytes)
+ extern const TagDetails pentaxImageProcessing[] = {
+ { 0x00000000, N_("Unprocessed") },
+ { 0x00000004, N_("Digital Filter") },
++ { 0x01000000, N_("Resized") },
+ { 0x02000000, N_("Cropped") },
+ { 0x04000000, N_("Color Filter") },
++ { 0x06000000, N_("Digital Filter 6") },
+ { 0x10000000, N_("Frame Synthesis?") }
+ };
+
+ //! PictureMode, combi-tag 0x0033 (3 bytes)
+ extern const TagDetails pentaxPictureMode[] = {
+ { 0x000000, N_("Program") },
++ { 0x000100, N_("Hi-speed Program") },
++ { 0x000200, N_("DOF Program") },
+ { 0x000300, N_("MTF Program") },
+ { 0x000400, N_("Standard") },
+ { 0x000500, N_("Portrait") },
+@@ -486,6 +576,13 @@
+ { 0x001300, N_("Food") },
+ { 0x001400, N_("Stage Lighting") },
+ { 0x001500, N_("Night Snap") },
++ { 0x001700, N_("Blue Sky") },
++ { 0x001800, N_("Sunset") },
++ { 0x001a00, N_("Night Scene HDR") },
++ { 0x001b00, N_("HDR") },
++ { 0x001c00, N_("Quick Macro") },
++ { 0x001d00, N_("Forest") },
++ { 0x001e00, N_("Backlight Silhouette") },
+ /* AUTO PICT modes (auto-selected) */
+ { 0x010400, N_("Auto PICT (Standard)") },
+ { 0x010500, N_("Auto PICT (Portrait)") },
+@@ -504,6 +601,7 @@
+ { 0x020101, N_("Hi-speed Program") },
+ { 0x020201, N_("DOF Program") },
+ { 0x020301, N_("MTF Program") },
++ { 0x021601, N_("Shallow DOF") },
+ { 0x030001, N_("Green Mode") },
+ { 0x040001, N_("Shutter Speed Priority") },
+ { 0x050001, N_("Aperture Priority") },
+@@ -522,6 +620,12 @@
+ { 0x0f0001, N_("Sensitivity Priority AE (1)") },
+ { 0x100000, N_("Flash X-Sync Speed AE") },
+ { 0x100001, N_("Flash X-Sync Speed AE (1)") },
++ { 0x120001, N_("Auto Program (Normal)") },
++ { 0x120101, N_("Auto Program (Hi-Speed)") },
++ { 0x120201, N_("Auto Program (DOF)") },
++ { 0x120301, N_("Auto Program (MTF)") },
++ { 0x121601, N_("Auto Program (Shallow DOF)") },
++ { 0x141601, N_("Blur control") },
+ /* other modes */
+ { 0x000001, N_("Program") },
+ { 0xfe0000, N_("Video (30 fps)") },
+@@ -534,12 +638,21 @@
+ { 0x01000000, N_("Continuous") },
+ { 0x02000000, N_("Continuous (Hi)") },
+ { 0x03000000, N_("Burst") },
++ { 0xff000000, N_("Video") },
+ { 0x00100000, N_("Single-frame") }, /* on 645D */
+ { 0x00010000, N_("Self-timer (12 sec)") },
+ { 0x00020000, N_("Self-timer (2 sec)") },
++ { 0x000f0000, N_("Video") },
++ { 0x00100000, N_("Mirror Lock-up") },
+ { 0x00000100, N_("Remote Control (3 sec)") },
+ { 0x00000200, N_("Remote Control") },
++ { 0x00000400, N_("Remote Continuous Shooting") },
+ { 0x00000001, N_("Multiple Exposure") },
++ { 0x00000010, N_("HDR") },
++ { 0x00000020, N_("HDR Strong 1") },
++ { 0x00000030, N_("HDR Strong 2") },
++ { 0x00000040, N_("HDR Strong 3") },
++ { 0x000000e0, N_("HDR Auto") },
+ { 0x000000ff, N_("Video") },
+ };
+
+@@ -577,7 +690,9 @@
+ { 0x031c, "smc PENTAX-F 35-70mm F3.5-4.5" },
+ { 0x031d, "PENTAX-F 28-80mm F3.5-4.5 or SIGMA AF 18-125mm F3.5-5.6
DC" },
+ { 0x031e, "PENTAX-F 70-200mm F4-5.6" },
+- { 0x031f, "smc PENTAX-F 70-210mm F4-5.6" },
++ { 0x031f, "smc PENTAX-F 70-210mm F4-5.6 or Tokina or Takumar Lens"
}, //0
++ { 0x031f, "Tokina AF 730 75-300mm F4.5-5.6" },
//1
++ { 0x031f, "Tokina AF 730 75-300mm F4.5-5.6" },
//2
+ { 0x0320, "smc PENTAX-F 50mm F1.4" },
+ { 0x0321, "smc PENTAX-F 50mm F1.7" },
+ { 0x0322, "smc PENTAX-F 135mm F2.8 [IF]" },
+@@ -587,11 +702,17 @@
+ { 0x0327, "smc PENTAX-F* 600mm F4 ED[IF]" },
+ { 0x0328, "smc PENTAX-F MACRO 100mm F2.8" },
+ { 0x0329, "smc PENTAX-F MACRO 50mm F2.8 or Sigma 50mm F2,8 MACRO" },
+- { 0x032c, "Tamron 35-90mm F4 AF or various SIGMA models" },
+- { 0x032e, "SIGMA APO 70-200mm F2.8 EX" },
++ { 0x032c, "Tamron 35-90mm F4 AF or various SIGMA models" }, // 0
++ { 0x032c, "Sigma 12-24mm F4.5 EX DG" }, // 1
++ { 0x032c, "Sigma 12-24mm F4.5 EX DG" }, // 2
++ { 0x032c, "Sigma 12-24mm F4.5 EX DG" }, // 3
++ { 0x032c, "Sigma 12-24mm F4.5 EX DG" }, // 4
++ { 0x032e, "SIGMA APO 70-200mm F2.8 EX" }, // 0
++ { 0x032e, "Sigma EX APO 100-300mm F4 IF" }, // 1
+ { 0x0332, "smc PENTAX-FA 28-70mm F4 AL" },
+ { 0x0333, "SIGMA 28mm F1.8 EX DG ASPHERICAL MACRO" },
+- { 0x0334, "smc PENTAX-FA 28-200mm F3.8-5.6 AL[IF]" },
++ { 0x0334, "smc PENTAX-FA 28-200mm F3.8-5.6 AL[IF]" }, // 0
++ { 0x0334, "Tamron AF LD 28-200mm F3.8-5.6 [IF] Aspherical (171D)"
}, // 1
+ { 0x0335, "smc PENTAX-FA 28-80mm F3.5-5.6 AL" },
+ { 0x03f7, "smc PENTAX-DA FISH-EYE 10-17mm F3.5-4.5 ED[IF]" },
+ { 0x03f8, "smc PENTAX-DA 12-24mm F4 ED AL[IF]" },
+@@ -600,7 +721,16 @@
+ { 0x03fc, "smc PENTAX-DA 18-55mm F3.5-5.6 AL" },
+ { 0x03fd, "smc PENTAX-DA 14mm F2.8 ED[IF]" },
+ { 0x03fe, "smc PENTAX-DA 16-45mm F4 ED AL" },
+- { 0x03ff, "SIGMA" },
++ { 0x03ff, "SIGMA" }, // 0
++ { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 1
++ { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 2
++ { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 3
++ { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 4
++ { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 5
++ { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 6
++ { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 7
++ { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 8
++ { 0x03ff, "Sigma 18-50mm F2.8 EX DC" }, // 9
+ { 0x0401, "smc PENTAX-FA SOFT 28mm F2.8" },
+ { 0x0402, "smc PENTAX-FA 80-320mm F4.5-5.6" },
+ { 0x0403, "smc PENTAX-FA 43mm F1.9 Limited" },
+@@ -610,11 +740,13 @@
+ { 0x0410, "TAMRON AF 80-210mm F4-5.6 (178D)" },
+ { 0x0413, "TAMRON SP AF 90mm F2.8 (172E)" },
+ { 0x0414, "smc PENTAX-FA 28-80mm F3.5-5.6" },
++ { 0x0415, "Cosina AF 100-300mm F5.6-6.7" },
+ { 0x0416, "TOKINA 28-80mm F3.5-5.6" },
+ { 0x0417, "smc PENTAX-FA 20-35mm F4 AL" },
+ { 0x0418, "smc PENTAX-FA 77mm F1.8 Limited" },
+ { 0x0419, "TAMRON SP AF 14mm F2.8" },
+- { 0x041a, "smc PENTAX-FA MACRO 100mm F3.5" },
++ { 0x041a, "smc PENTAX-FA MACRO 100mm F3.5 or Cosina lens" }, //0
++ { 0x041a, "Cosina 100mm F3.5 Macro" }, //1
+ { 0x041b, "TAMRON AF28-300mm F/3.5-6.3 LD Aspherical[IF] MACRO
(285D)" },
+ { 0x041c, "smc PENTAX-FA 35mm F2 AL" },
+ { 0x041d, "TAMRON AF 28-200mm F/3.8-5.6 LD Super II MACRO (371D)" },
+@@ -627,12 +759,19 @@
+ { 0x0429, "TAMRON AF 28-200mm Super Zoom F3.8-5.6 Aspherical XR
[IF] MACRO (A03)" },
+ { 0x042b, "smc PENTAX-FA 28-90mm F3.5-5.6" },
+ { 0x042c, "smc PENTAX-FA J 75-300mm F4.5-5.8 AL" },
+- { 0x042d, "TAMRON 28-300mm F3.5-6.3 Ultra zoom XR" },
++ { 0x042d, "TAMRON 28-300mm F3.5-6.3 Ultra zoom XR or Tamron AF
28-300mm F3.5-6.3 XR Di LD Aspherical [IF] Macro" }, //0
+ { 0x042e, "smc PENTAX-FA J 28-80mm F3.5-5.6 AL" },
+ { 0x042f, "smc PENTAX-FA J 18-35mm F4-5.6 AL" },
+ { 0x0431, "TAMRON SP AF 28-75mm F2.8 XR Di (A09)" },
+ { 0x0433, "smc PENTAX-D FA 50mm F2.8 MACRO" },
+ { 0x0434, "smc PENTAX-D FA 100mm F2.8 MACRO" },
++ { 0x044b, "Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)" },
++ { 0x04e5, "smc PENTAX-DA 18-55mm F3.5-5.6 AL II" },
++ { 0x04e6, "Tamron SP AF 17-50mm F2.8 XR Di II" },
++ { 0x04e7, "smc PENTAX-DA 18-250mm F3.5-6.3 ED AL [IF]" },
++ { 0x04ed, "Samsung/Schneider D-XENOGON 10-17mm F3.5-4.5" },
++ { 0x04ef, "Samsung D-XENON 12-24mm F4 ED AL [IF]" },
++ { 0x04f3, "smc PENTAX-DA 70mm F2.4 Limited" },
+ { 0x04f4, "smc PENTAX-DA 21mm F3.2 AL Limited" },
+ { 0x04f5, "Schneider D-XENON 50-200mm" },
+ { 0x04f6, "Schneider D-XENON 18-55mm" },
+@@ -660,6 +799,7 @@
+ { 0x050e, "smc PENTAX-FA* 250-600mm F5.6 ED[IF]" },
+ { 0x050f, "smc PENTAX-FA 28-105mm F4-5.6" },
+ { 0x0510, "smc PENTAX-FA 100-300mm F4.5-5.6" },
++ { 0x0562, "smc PENTAX-FA 100-300mm F4.5-5.6" },
+ { 0x0601, "smc PENTAX-FA* 85mm F1.4[IF]" },
+ { 0x0602, "smc PENTAX-FA* 200mm F2.8 ED[IF]" },
+ { 0x0603, "smc PENTAX-FA* 300mm F2.8 ED[IF]" },
+@@ -673,16 +813,22 @@
+ { 0x060d, "smc PENTAX-FA* 400mm F5.6 ED[IF]" },
+ { 0x060e, "smc PENTAX-FA* MACRO 200mm F4 ED[IF]" },
+ { 0x0700, "smc PENTAX-DA 21mm F3.2 AL Limited" },
++ { 0x073a, "smc PENTAX-D FA Macro 100mm F2.8 WR" },
+ { 0x074b, "Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)" },
++ { 0x07d4, "smc Pentax-DA 50mm F1.8" },
++ { 0x07d5, "smc PENTAX-DA 40mm F2.8 XS" },
+ { 0x07d6, "smc PENTAX-DA 35mm F2.4 AL" },
+- { 0x07d6, "smc PENTAX-DA 35mm F2.4 AL" },
++ { 0x07d8, "smc PENTAX-DA L 55-300mm F4-5.8 ED" },
+ { 0x07d9, "smc PENTAX-DA 50-200mm F4-5.6 ED WR" },
+ { 0x07da, "smc PENTAX-DA 18-55mm F3.5-5.6 AL WR" },
+ { 0x07dc, "Tamron SP AF 10-24mm F3.5-4.5 Di II LD Aspherical [IF]"
},
++ { 0x07dd, "smc PENTAX-DA L 50-200mm F4-5.6 ED" },
+ { 0x07de, "smc PENTAX-DA 18-55mm F3.5-5.6 AL II" },
+ { 0x07df, "Samsung D-XENON 18-55mm F3.5-5.6 II" },
+ { 0x07e0, "smc PENTAX-DA 15mm F4 ED AL Limited" },
+ { 0x07e1, "Samsung D-XENON 18-250mm F3.5-6.3" },
++ { 0x07e2, "smc PENTAX-DA* 55mm F1.4 SDM (SDM unused)" },
++ { 0x07e3, "smc PENTAX-DA* 55mm F1.4 SDM (SDM unused)" },
+ { 0x07e5, "smc PENTAX-DA 18-55mm F3.5-5.6 AL II" },
+ { 0x07e6, "Tamron AF 17-50mm F2.8 XR Di-II LD (Model A16)" },
+ { 0x07e7, "smc PENTAX-DA 18-250mm F3.5-6.3ED AL [IF]" },
+@@ -695,7 +841,21 @@
+ { 0x07f2, "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM (SDM not
used)" },
+ { 0x07f3, "smc PENTAX-DA 70mm F2.4 Limited" },
+ { 0x07f4, "smc PENTAX-DA 21mm F3.2 AL Limited" },
++ { 0x0804, "Sigma 50mm F1.4 EX DG HSM" },
+ { 0x0808, "SIGMA 18-250mm F3.5-6.3 DC OS HSM" },
++ { 0x080b, "Sigma 10-20mm F3.5 EX DC HSM" },
++ { 0x080c, "Sigma 70-300mm F4-5.6 DG OS" },
++ { 0x080d, "Sigma 120-400mm F4.5-5.6 APO DG OS HSM" },
++ { 0x080e, "Sigma 17-70mm F2.8-4.0 DC Macro OS HSM" },
++ { 0x080f, "Sigma 150-500mm F5-6.3 APO DG OS HSM" },
++ { 0x0810, "Sigma 70-200mm F2.8 EX DG Macro HSM II" },
++ { 0x0811, "Sigma 50-500mm F4.5-6.3 DG OS HSM" },
++ { 0x0812, "Sigma 8-16mm F4.5-5.6 DC HSM" },
++ { 0x0815, "Sigma 17-50mm F2.8 EX DC OS HSM" },
++ { 0x0816, "Sigma 85mm F1.4 EX DG HSM" },
++ { 0x0817, "Sigma 70-200mm F2.8 APO EX DG OS HSM" },
++ { 0x081b, "Sigma 18-200mm F3.5-6.3 II DC HSM" },
++ { 0x08d2, "smc Pentax-DA 18-270mm F3.5-6.3 ED SDM" },
+ { 0x08d7, "smc PENTAX-DA 18-135mm F3.5-5.6 ED AL [IF] DC WR" },
+ { 0x08e2, "smc PENTAX-DA* 55mm F1.4 SDM" },
+ { 0x08e3, "smc PENTAX DA* 60-250mm F4 [IF] SDM"},
+@@ -704,9 +864,28 @@
+ { 0x08eb, "smc PENTAX-DA* 200mm F2.8 ED [IF] SDM" },
+ { 0x08f1, "smc PENTAX-DA* 50-135mm F2.8 ED [IF] SDM" },
+ { 0x08f2, "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM" },
++ { 0x08ff, "Sigma lens" }, //0
++ { 0x08ff, "Sigma 70-200mm F2.8 EX DG Macro HSM II" }, //1
++ { 0x08ff, "Sigma 70-200mm F2.8 EX DG Macro HSM II" }, //2
++ { 0x08ff, "Sigma 70-200mm F2.8 EX DG Macro HSM II" }, //3
++ { 0x08ff, "Sigma 70-200mm F2.8 EX DG Macro HSM II" }, //4
++ { 0x0900, "645 Manual lens" }, //1
++ { 0x0a00, "645 A Series lens" }, //1
+ { 0x0b04, "smc PENTAX-FA645 Zoom 45mm-85mm F4.5" },
+ { 0x0b07, "smc PENTAX-FA645 Macro 120mm F4" },
++ { 0x0b08, "smc PENTAX-FA 645 80-160mm F4.5" },
++ { 0x0b0b, "smc PENTAX-FA 645 35mm F3.5 AL [IF]" },
++ { 0x0b10, "smc PENTAX-FA 645 33-55mm F4.5 AL" },
+ { 0x0b11, "smc PENTAX-FA645 Zoom 150mm-300mm F5.6 ED [IF]" },
++ { 0x0d12, "smc PENTAX-D FA 645 55mm F2.8 AL [IF] SDM AW" },
++ { 0x0d13, "smc PENTAX-D FA 645 25mm F4 AL [IF] SDM AW" },
++ { 0x1500, "Pentax Q Manual Lens" },
++ { 0x1501, "01 Standard Prime 8.5mm F1.9" },
++ { 0x1502, "02 Standard Zoom 5-15mm F2.8-4.5" },
++ { 0x1503, "03 Fish-eye 3.2mm F5.6" },
++ { 0x1504, "04 Toy Lens Wide 6.3mm F7.1" },
++ { 0x1505, "05 Toy Lens Telephoto 18mm F8" },
++ { 0x1506, "06 Telephoto Zoom 15-45mm F2.8" },
+ };
+
+ //! ImageTone, tag 0x004f
+@@ -717,7 +896,10 @@
+ { 3, N_("Landscape") },
+ { 4, N_("Vibrant") },
+ { 5, N_("Monochrome") },
++ { 6, N_("Muted") },
+ { 7, N_("Reversal film") },
++ { 8, N_("Bleach bypass") },
++ { 9, N_("Radiant") },
+ };
+
+ //! DynamicRangeExpansion, tag 0x0069
diff --git a/graphics/exiv2/90_changeset_r2963.diff
b/graphics/exiv2/90_changeset_r2963.diff
new file mode 100644
index 0000000..970e56e
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2963.diff
@@ -0,0 +1,22 @@
+Index: trunk/src/canonmn.cpp
+===================================================================
+--- trunk/src/canonmn.cpp (revision 2962)
++++ trunk/src/canonmn.cpp (revision 2963)
+@@ -180,6 +180,7 @@
+ { 0x80000297, N_("WFT-E2 II") },
+ { 0x80000298, N_("WFT-E4 II") },
+ { 0x80000301, N_("EOS Rebel T4i / 650D / Kiss X6i") },
++ { 0x80000302, N_("EOS 6D") },
+ };
+
+ //! SerialNumberFormat, tag 0x0015
+@@ -669,7 +670,8 @@
+ { 491, "Canon EF 300mm f/2.8L IS II USM"
},
+ { 494, "Canon EF 600mm f/4.0L IS II USM"
},
+ { 495, "Canon EF 24-70mm f/2.8L II USM"
},
+- { 4144,"Canon EF 40mm f/2.8 STM"
}
++ { 505, "Canon EF 35mm f/2 IS USM"
},
++ { 4144,"Canon EF 40mm f/2.8 STM"
}
+ };
+
+ //! A lens id and a pretty-print function for special treatment of the
id.
diff --git a/graphics/exiv2/90_changeset_r2968.diff
b/graphics/exiv2/90_changeset_r2968.diff
new file mode 100644
index 0000000..4fb5ca8
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2968.diff
@@ -0,0 +1,22 @@
+Index: trunk/src/minoltamn.cpp
+===================================================================
+--- trunk/src/minoltamn.cpp (revision 2967)
++++ trunk/src/minoltamn.cpp (revision 2968)
+@@ -1693,6 +1693,7 @@
+ "Tamron SP AF 17-35mm F2.8-4 Di LD Aspherical IF | "
+ "Sigma AF 50-150mm F2.8 EX DC APO HSM II | "
+ "Sigma 10-20mm F3.5 EX DC HSM | "
++ "Sigma 50mm F1.4 EX DG HSM | "
+ "Sigma 70-200mm F2.8 II EX DG APO MACRO HSM" },
+ { 129, "Tamron 200-400mm F5.6 LD | "
+ "Tamron 70-300mm F4-5.6 LD" },
+@@ -1781,7 +1782,8 @@
+ "Sigma 14mm F3.5 | "
+ "Sigma 15mm F2.8 Fisheye" },
+ { 25790, "Minolta AF 20mm F2.8" },
+- { 25791, "Minolta/Sony AF 20mm F2.8" },
++ { 25791, "Minolta/Sony AF 20mm F2.8 | "
++ "Tokina AT-X 116 PRO DX AF 11-16mm F2.8" },
+ { 25810, "Minolta AF 100mm F2.8 Macro" },
+ { 25811, "Minolta AF 100mm F2.8 Macro [New] | "
+ "Sigma AF 90mm F2.8 Macro | "
diff --git a/graphics/exiv2/90_changeset_r2969.diff
b/graphics/exiv2/90_changeset_r2969.diff
new file mode 100644
index 0000000..4dfd309
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2969.diff
@@ -0,0 +1,12 @@
+Index: trunk/src/nikonmn.cpp
+===================================================================
+--- trunk/src/nikonmn.cpp (revision 2968)
++++ trunk/src/nikonmn.cpp (revision 2969)
+@@ -2146,6 +2146,7 @@
+ {0x00,0x49,0x30,0x48,0x22,0x2B,0x00,0x02,0x00,0x00,0x02, "Tamron", "166D",
"SP AF 20-40mm F/2.7-3.5"},
+ {0x0E,0x4A,0x31,0x48,0x23,0x2D,0x0E,0x02,0x00,0x00,0x02, "Tamron", "166D",
"SP AF 20-40mm F/2.7-3.5"},
+ //M "Tamron" "266D" "SP AF
20-40mm F/2.7-3.5 Aspherical-IF";
++{0xFE,0x48,0x37,0x5C,0x24,0x24,0xDF,0x0E,0x00,0x00,0x02, "Tamron", "A007",
"SP 24-70mm F/2.8 Di VC USD"},
+ //M "Tamron" "73D" "AF 24-70mm
F/3.3-5.6 Aspherical";
+ {0x45,0x41,0x37,0x72,0x2C,0x3C,0x48,0x02,0x00,0x00,0x02, "Tamron", "190D",
"SP AF 24-135mm F/3.5-5.6 AD Aspherical (IF) Macro"},
+ //M "Tamron" "159D" "AF 28-70mm
F/3.5-4.5";
diff --git a/graphics/exiv2/90_changeset_r2970.diff
b/graphics/exiv2/90_changeset_r2970.diff
new file mode 100644
index 0000000..bd9d0de
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2970.diff
@@ -0,0 +1,77 @@
+Index: trunk/src/olympusmn.cpp
+===================================================================
+--- trunk/src/olympusmn.cpp (revision 2969)
++++ trunk/src/olympusmn.cpp (revision 2970)
+@@ -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")
},
++ { { 0, 2, 16 }, N_("Olympus M.Zuiko Digital 17mm F2.8
Pancake") },
+ { { 0, 3, 0 }, N_("Olympus Zuiko Digital ED 300mm F2.8")
},
++ { { 0, 3, 16 }, N_("Olympus M.Zuiko Digital ED 14-150mm
F4.0-5.6") },
++ { { 0, 4, 16 }, N_("Olympus M.Zuiko Digital ED 9-18mm
F4.0-5.6") },
+ { { 0, 5, 0 }, N_("Olympus Zuiko Digital 14-54mm F2.8-3.5")
},
+ { { 0, 5, 1 }, N_("Olympus Zuiko Digital Pro ED 90-250mm
F2.8") },
++ { { 0, 5, 16 }, N_("Olympus M.Zuiko Digital ED 14-42mm
F3.5-5.6 L") },
+ { { 0, 6, 0 }, N_("Olympus Zuiko Digital ED 50-200mm
F2.8-3.5") },
+ { { 0, 6, 1 }, N_("Olympus Zuiko Digital ED 8mm F3.5
Fisheye") },
++ { { 0, 6, 16 }, N_("Olympus M.Zuiko Digital ED 40-150mm
F4.0-5.6") },
+ { { 0, 7, 0 }, N_("Olympus Zuiko Digital 11-22mm F2.8-3.5")
},
+ { { 0, 7, 1 }, N_("Olympus Zuiko Digital 18-180mm F3.5-6.3")
},
++ { { 0, 7, 16 }, N_("Olympus M.Zuiko Digital ED 12mm F2.0")
},
+ { { 0, 8, 1 }, N_("Olympus Zuiko Digital 70-300mm F4.0-5.6")
},
++ { { 0, 8, 16 }, N_("Olympus M.Zuiko Digital ED 75-300mm
F4.8-6.7") },
++ { { 0, 9, 16 }, N_("Olympus M.Zuiko Digital 14-42mm F3.5-5.6
II") },
++ { { 0, 16, 16 }, N_("Olympus M.Zuiko Digital ED 12-50mm
F3.5-6.3 EZ") },
++ { { 0, 17, 16 }, N_("Olympus M.Zuiko Digital 45mm F1.8")
},
++ { { 0, 18, 16 }, N_("Olympus M.Zuiko Digital ED 60mm F2.8
Macro") },
++ { { 0, 19, 16 }, N_("Olympus M.Zuiko Digital ED 14-42mm
F3.5-5.6 II R") },
++ { { 0, 20, 16 }, N_("Olympus M.Zuiko Digital ED 14-150mm II or
40-150mm R") },
+ { { 0, 21, 0 }, N_("Olympus Zuiko Digital ED 7-14mm F4.0")
},
++ { { 0, 21, 16 }, N_("Olympus M.Zuiko Digital ED 75mm F1.8")
},
++ { { 0, 22, 16 }, N_("Olympus M.Zuiko Digital 17mm F1.8")
},
+ { { 0, 23, 0 }, N_("Olympus Zuiko Digital Pro ED 35-100mm
F2.0") },
+ { { 0, 24, 0 }, N_("Olympus Zuiko Digital 14-45mm F3.5-5.6")
},
+ { { 0, 32, 0 }, N_("Olympus Zuiko Digital 35mm F3.5 Macro")
},
+@@ -1265,7 +1279,9 @@
+ { { 0, 52, 0 }, N_("Olympus Zuiko Digital ED 9-18mm F4.0-5.6")
},
+ { { 0, 53, 0 }, N_("Olympus Zuiko Digital 14-54mm F2.8-3.5
II") },
+ { { 1, 1, 0 }, N_("Sigma 18-50mm F3.5-5.6")
},
++ { { 1, 1, 16 }, N_("Sigma 30mm F2.8 EX DN")
},
+ { { 1, 2, 0 }, N_("Sigma 55-200mm F4.0-5.6 DC")
},
++ { { 1, 2, 16 }, N_("Sigma 19mm F2.8 EX DN")
},
+ { { 1, 3, 0 }, N_("Sigma 18-125mm F3.5-5.6 DC")
},
+ { { 1, 4, 0 }, N_("Sigma 18-125mm F3.5-5.6")
},
+ { { 1, 5, 0 }, N_("Sigma 30mm F1.4")
},
+@@ -1275,17 +1291,27 @@
+ { { 1, 16, 0 }, N_("Sigma 24mm F1.8 EX DG Aspherical Macro")
},
+ { { 1, 17, 0 }, N_("Sigma 135-400mm F4.5-5.6 DG ASP APO RF")
},
+ { { 1, 18, 0 }, N_("Sigma 300-800mm F5.6 EX DG APO")
},
++ { { 1, 19, 0 }, N_("Sigma 30mm F1.4 EX DC HSM")
},
+ { { 1, 20, 0 }, N_("Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF")
},
+ { { 1, 21, 0 }, N_("Sigma 10-20mm F4.0-5.6 EX DC HSM")
},
++ { { 1, 22, 0 }, N_("Sigma 70-200mm F2.8 EX DG Macro HSM II")
},
++ { { 1, 23, 0 }, N_("Sigma 50mm F1.4 EX DG HSM")
},
+ { { 2, 1, 0 }, N_("Leica D Vario Elmarit 14-50mm F2.8-3.5
Asph.") },
+ { { 2, 1, 16 }, N_("Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega
OIS") },
+ { { 2, 2, 0 }, N_("Leica D Summilux 25mm F1.4 Asph.")
},
+ { { 2, 2, 16 }, N_("Lumix G Vario 45-200mm F4-5.6 Mega OIS")
},
++ { { 2, 3, 0 }, N_("Leica D Vario Elmar 14-50mm F3.8-5.6 Asph.
Mega OIS") },
+ { { 2, 3, 1 }, N_("Leica D Vario Elmar 14-50mm F3.8-5.6
Asph.") },
+ { { 2, 3, 16 }, N_("Lumix G Vario HD 14-140mm F4-5.8 Asph.
Mega OIS") },
+ { { 2, 4, 0 }, N_("Leica D Vario Elmar 14-150mm F3.5-5.6")
},
+ { { 2, 4, 16 }, N_("Lumix G Vario 7-14mm F4 Asph.")
},
+ { { 2, 5, 16 }, N_("Lumix G 20mm F1.7 Asph.")
},
++ { { 2, 6, 16 }, N_("Leica DG Macro-Elmarit 45mm F2.8")
},
++ { { 2, 8, 16 }, N_("Lumix G Fisheye 8mm F3.5")
},
++ { { 2, 9, 16 }, N_("Lumix G Vario 100-300mm F4.0-5.6 OIS")
},
++ { { 2, 16, 16 }, N_("Lumix G 14mm F2.5 Asph.")
},
++ { { 2, 20, 16 }, N_("Lumix G X Vario PZ 14-42mm F3.5-5.6 ASPH
Power OIS") },
++ { { 2, 21, 16 }, N_("Lumix G X Vario 12-35mm F2.8 ASPH Power
OIS") },
+ { { 3, 1, 0 }, N_("Leica D Vario Elmarit 14-50mm F2.8-3.5
Asph.") },
+ { { 3, 2, 0 }, N_("Leica D Summilux 25mm F1.4 Asph.")
},
+ // End of list marker
diff --git a/graphics/exiv2/90_changeset_r2975.diff
b/graphics/exiv2/90_changeset_r2975.diff
new file mode 100644
index 0000000..c2bbc71
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2975.diff
@@ -0,0 +1,165 @@
+Index: trunk/src/olympusmn.cpp
+===================================================================
+--- trunk/src/olympusmn.cpp (revision 2974)
++++ trunk/src/olympusmn.cpp (revision 2975)
+@@ -1237,83 +1237,84 @@
+ byte val[3];
+ const char *label;
+ } lensTypes[] = {
+- { { 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 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 M.Zuiko Digital 17mm F2.8
Pancake") },
+- { { 0, 3, 0 }, N_("Olympus Zuiko Digital ED 300mm F2.8")
},
+- { { 0, 3, 16 }, N_("Olympus M.Zuiko Digital ED 14-150mm
F4.0-5.6") },
+- { { 0, 4, 16 }, N_("Olympus M.Zuiko Digital ED 9-18mm
F4.0-5.6") },
+- { { 0, 5, 0 }, N_("Olympus Zuiko Digital 14-54mm F2.8-3.5")
},
+- { { 0, 5, 1 }, N_("Olympus Zuiko Digital Pro ED 90-250mm
F2.8") },
+- { { 0, 5, 16 }, N_("Olympus M.Zuiko Digital ED 14-42mm
F3.5-5.6 L") },
+- { { 0, 6, 0 }, N_("Olympus Zuiko Digital ED 50-200mm
F2.8-3.5") },
+- { { 0, 6, 1 }, N_("Olympus Zuiko Digital ED 8mm F3.5
Fisheye") },
+- { { 0, 6, 16 }, N_("Olympus M.Zuiko Digital ED 40-150mm
F4.0-5.6") },
+- { { 0, 7, 0 }, N_("Olympus Zuiko Digital 11-22mm F2.8-3.5")
},
+- { { 0, 7, 1 }, N_("Olympus Zuiko Digital 18-180mm F3.5-6.3")
},
+- { { 0, 7, 16 }, N_("Olympus M.Zuiko Digital ED 12mm F2.0")
},
+- { { 0, 8, 1 }, N_("Olympus Zuiko Digital 70-300mm F4.0-5.6")
},
+- { { 0, 8, 16 }, N_("Olympus M.Zuiko Digital ED 75-300mm
F4.8-6.7") },
+- { { 0, 9, 16 }, N_("Olympus M.Zuiko Digital 14-42mm F3.5-5.6
II") },
+- { { 0, 16, 16 }, N_("Olympus M.Zuiko Digital ED 12-50mm
F3.5-6.3 EZ") },
+- { { 0, 17, 16 }, N_("Olympus M.Zuiko Digital 45mm F1.8")
},
+- { { 0, 18, 16 }, N_("Olympus M.Zuiko Digital ED 60mm F2.8
Macro") },
+- { { 0, 19, 16 }, N_("Olympus M.Zuiko Digital ED 14-42mm
F3.5-5.6 II R") },
++ { { 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 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 M.Zuiko Digital 17mm F2.8
Pancake") },
++ { { 0, 3, 0 }, N_("Olympus Zuiko Digital ED 300mm F2.8")
},
++ { { 0, 3, 16 }, N_("Olympus M.Zuiko Digital ED 14-150mm
F4.0-5.6") },
++ { { 0, 4, 16 }, N_("Olympus M.Zuiko Digital ED 9-18mm
F4.0-5.6") },
++ { { 0, 5, 0 }, N_("Olympus Zuiko Digital 14-54mm F2.8-3.5")
},
++ { { 0, 5, 1 }, N_("Olympus Zuiko Digital Pro ED 90-250mm
F2.8") },
++ { { 0, 5, 16 }, N_("Olympus M.Zuiko Digital ED 14-42mm
F3.5-5.6 L") },
++ { { 0, 6, 0 }, N_("Olympus Zuiko Digital ED 50-200mm
F2.8-3.5") },
++ { { 0, 6, 1 }, N_("Olympus Zuiko Digital ED 8mm F3.5
Fisheye") },
++ { { 0, 6, 16 }, N_("Olympus M.Zuiko Digital ED 40-150mm
F4.0-5.6") },
++ { { 0, 7, 0 }, N_("Olympus Zuiko Digital 11-22mm F2.8-3.5")
},
++ { { 0, 7, 1 }, N_("Olympus Zuiko Digital 18-180mm F3.5-6.3")
},
++ { { 0, 7, 16 }, N_("Olympus M.Zuiko Digital ED 12mm F2.0")
},
++ { { 0, 8, 1 }, N_("Olympus Zuiko Digital 70-300mm F4.0-5.6")
},
++ { { 0, 8, 16 }, N_("Olympus M.Zuiko Digital ED 75-300mm
F4.8-6.7") },
++ { { 0, 9, 16 }, N_("Olympus M.Zuiko Digital 14-42mm F3.5-5.6
II") },
++ { { 0, 16, 16 }, N_("Olympus M.Zuiko Digital ED 12-50mm
F3.5-6.3 EZ") },
++ { { 0, 17, 16 }, N_("Olympus M.Zuiko Digital 45mm F1.8")
},
++ { { 0, 18, 16 }, N_("Olympus M.Zuiko Digital ED 60mm F2.8
Macro") },
++ { { 0, 19, 16 }, N_("Olympus M.Zuiko Digital ED 14-42mm
F3.5-5.6 II R") },
+ { { 0, 20, 16 }, N_("Olympus M.Zuiko Digital ED 14-150mm II or
40-150mm R") },
+- { { 0, 21, 0 }, N_("Olympus Zuiko Digital ED 7-14mm F4.0")
},
+- { { 0, 21, 16 }, N_("Olympus M.Zuiko Digital ED 75mm F1.8")
},
+- { { 0, 22, 16 }, N_("Olympus M.Zuiko Digital 17mm F1.8")
},
+- { { 0, 23, 0 }, N_("Olympus Zuiko Digital Pro ED 35-100mm
F2.0") },
+- { { 0, 24, 0 }, N_("Olympus Zuiko Digital 14-45mm F3.5-5.6")
},
+- { { 0, 32, 0 }, N_("Olympus Zuiko Digital 35mm F3.5 Macro")
},
+- { { 0, 34, 0 }, N_("Olympus Zuiko Digital 17.5-45mm F3.5-5.6")
},
+- { { 0, 35, 0 }, N_("Olympus Zuiko Digital ED 14-42mm
F3.5-5.6") },
+- { { 0, 36, 0 }, N_("Olympus Zuiko Digital ED 40-150mm
F4.0-5.6") },
+- { { 0, 48, 0 }, N_("Olympus Zuiko Digital ED 50-200mm F2.8-3.5
SWD") },
+- { { 0, 49, 0 }, N_("Olympus Zuiko Digital ED 12-60mm F2.8-4.0
SWD") },
+- { { 0, 50, 0 }, N_("Olympus Zuiko Digital ED 14-35mm F2.0
SWD") },
+- { { 0, 51, 0 }, N_("Olympus Zuiko Digital 25mm F2.8")
},
+- { { 0, 52, 0 }, N_("Olympus Zuiko Digital ED 9-18mm F4.0-5.6")
},
+- { { 0, 53, 0 }, N_("Olympus Zuiko Digital 14-54mm F2.8-3.5
II") },
+- { { 1, 1, 0 }, N_("Sigma 18-50mm F3.5-5.6")
},
+- { { 1, 1, 16 }, N_("Sigma 30mm F2.8 EX DN")
},
+- { { 1, 2, 0 }, N_("Sigma 55-200mm F4.0-5.6 DC")
},
+- { { 1, 2, 16 }, N_("Sigma 19mm F2.8 EX DN")
},
+- { { 1, 3, 0 }, N_("Sigma 18-125mm F3.5-5.6 DC")
},
+- { { 1, 4, 0 }, N_("Sigma 18-125mm F3.5-5.6")
},
+- { { 1, 5, 0 }, N_("Sigma 30mm F1.4")
},
+- { { 1, 6, 0 }, N_("Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF")
},
+- { { 1, 7, 0 }, N_("Sigma 105mm F2.8 DG")
},
+- { { 1, 8, 0 }, N_("Sigma 150mm F2.8 DG HSM")
},
+- { { 1, 16, 0 }, N_("Sigma 24mm F1.8 EX DG Aspherical Macro")
},
+- { { 1, 17, 0 }, N_("Sigma 135-400mm F4.5-5.6 DG ASP APO RF")
},
+- { { 1, 18, 0 }, N_("Sigma 300-800mm F5.6 EX DG APO")
},
+- { { 1, 19, 0 }, N_("Sigma 30mm F1.4 EX DC HSM")
},
+- { { 1, 20, 0 }, N_("Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF")
},
+- { { 1, 21, 0 }, N_("Sigma 10-20mm F4.0-5.6 EX DC HSM")
},
+- { { 1, 22, 0 }, N_("Sigma 70-200mm F2.8 EX DG Macro HSM II")
},
+- { { 1, 23, 0 }, N_("Sigma 50mm F1.4 EX DG HSM")
},
+- { { 2, 1, 0 }, N_("Leica D Vario Elmarit 14-50mm F2.8-3.5
Asph.") },
+- { { 2, 1, 16 }, N_("Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega
OIS") },
+- { { 2, 2, 0 }, N_("Leica D Summilux 25mm F1.4 Asph.")
},
+- { { 2, 2, 16 }, N_("Lumix G Vario 45-200mm F4-5.6 Mega OIS")
},
+- { { 2, 3, 0 }, N_("Leica D Vario Elmar 14-50mm F3.8-5.6 Asph.
Mega OIS") },
+- { { 2, 3, 1 }, N_("Leica D Vario Elmar 14-50mm F3.8-5.6
Asph.") },
+- { { 2, 3, 16 }, N_("Lumix G Vario HD 14-140mm F4-5.8 Asph.
Mega OIS") },
+- { { 2, 4, 0 }, N_("Leica D Vario Elmar 14-150mm F3.5-5.6")
},
+- { { 2, 4, 16 }, N_("Lumix G Vario 7-14mm F4 Asph.")
},
+- { { 2, 5, 16 }, N_("Lumix G 20mm F1.7 Asph.")
},
+- { { 2, 6, 16 }, N_("Leica DG Macro-Elmarit 45mm F2.8")
},
+- { { 2, 8, 16 }, N_("Lumix G Fisheye 8mm F3.5")
},
+- { { 2, 9, 16 }, N_("Lumix G Vario 100-300mm F4.0-5.6 OIS")
},
+- { { 2, 16, 16 }, N_("Lumix G 14mm F2.5 Asph.")
},
+- { { 2, 20, 16 }, N_("Lumix G X Vario PZ 14-42mm F3.5-5.6 ASPH
Power OIS") },
+- { { 2, 21, 16 }, N_("Lumix G X Vario 12-35mm F2.8 ASPH Power
OIS") },
+- { { 3, 1, 0 }, N_("Leica D Vario Elmarit 14-50mm F2.8-3.5
Asph.") },
+- { { 3, 2, 0 }, N_("Leica D Summilux 25mm F1.4 Asph.")
},
++ { { 0, 21, 0 }, N_("Olympus Zuiko Digital ED 7-14mm F4.0")
},
++ { { 0, 21, 16 }, N_("Olympus M.Zuiko Digital ED 75mm F1.8")
},
++ { { 0, 22, 16 }, N_("Olympus M.Zuiko Digital 17mm F1.8")
},
++ { { 0, 23, 0 }, N_("Olympus Zuiko Digital Pro ED 35-100mm
F2.0") },
++ { { 0, 24, 0 }, N_("Olympus Zuiko Digital 14-45mm F3.5-5.6")
},
++ { { 0, 32, 0 }, N_("Olympus Zuiko Digital 35mm F3.5 Macro")
},
++ { { 0, 34, 0 }, N_("Olympus Zuiko Digital 17.5-45mm F3.5-5.6")
},
++ { { 0, 35, 0 }, N_("Olympus Zuiko Digital ED 14-42mm
F3.5-5.6") },
++ { { 0, 36, 0 }, N_("Olympus Zuiko Digital ED 40-150mm
F4.0-5.6") },
++ { { 0, 48, 0 }, N_("Olympus Zuiko Digital ED 50-200mm F2.8-3.5
SWD") },
++ { { 0, 49, 0 }, N_("Olympus Zuiko Digital ED 12-60mm F2.8-4.0
SWD") },
++ { { 0, 50, 0 }, N_("Olympus Zuiko Digital ED 14-35mm F2.0
SWD") },
++ { { 0, 51, 0 }, N_("Olympus Zuiko Digital 25mm F2.8")
},
++ { { 0, 52, 0 }, N_("Olympus Zuiko Digital ED 9-18mm F4.0-5.6")
},
++ { { 0, 53, 0 }, N_("Olympus Zuiko Digital 14-54mm F2.8-3.5
II") },
++ { { 1, 1, 0 }, N_("Sigma 18-50mm F3.5-5.6")
},
++ { { 1, 1, 16 }, N_("Sigma 30mm F2.8 EX DN")
},
++ { { 1, 2, 0 }, N_("Sigma 55-200mm F4.0-5.6 DC")
},
++ { { 1, 2, 16 }, N_("Sigma 19mm F2.8 EX DN")
},
++ { { 1, 3, 0 }, N_("Sigma 18-125mm F3.5-5.6 DC")
},
++ { { 1, 4, 0 }, N_("Sigma 18-125mm F3.5-5.6")
},
++ { { 1, 5, 0 }, N_("Sigma 30mm F1.4")
},
++ { { 1, 6, 0 }, N_("Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF")
},
++ { { 1, 7, 0 }, N_("Sigma 105mm F2.8 DG")
},
++ { { 1, 8, 0 }, N_("Sigma 150mm F2.8 DG HSM")
},
++ { { 1, 16, 0 }, N_("Sigma 24mm F1.8 EX DG Aspherical Macro")
},
++ { { 1, 17, 0 }, N_("Sigma 135-400mm F4.5-5.6 DG ASP APO RF")
},
++ { { 1, 18, 0 }, N_("Sigma 300-800mm F5.6 EX DG APO")
},
++ { { 1, 19, 0 }, N_("Sigma 30mm F1.4 EX DC HSM")
},
++ { { 1, 20, 0 }, N_("Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF")
},
++ { { 1, 21, 0 }, N_("Sigma 10-20mm F4.0-5.6 EX DC HSM")
},
++ { { 1, 22, 0 }, N_("Sigma 70-200mm F2.8 EX DG Macro HSM II")
},
++ { { 1, 23, 0 }, N_("Sigma 50mm F1.4 EX DG HSM")
},
++ { { 2, 1, 0 }, N_("Leica D Vario Elmarit 14-50mm F2.8-3.5
Asph.") },
++ { { 2, 1, 16 }, N_("Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega
OIS") },
++ { { 2, 2, 0 }, N_("Leica D Summilux 25mm F1.4 Asph.")
},
++ { { 2, 2, 16 }, N_("Lumix G Vario 45-200mm F4-5.6 Mega OIS")
},
++ { { 2, 3, 0 }, N_("Leica D Vario Elmar 14-50mm F3.8-5.6 Asph.
Mega OIS") },
++ { { 2, 3, 1 }, N_("Leica D Vario Elmar 14-50mm F3.8-5.6
Asph.") },
++ { { 2, 3, 16 }, N_("Lumix G Vario HD 14-140mm F4-5.8 Asph.
Mega OIS") },
++ { { 2, 4, 0 }, N_("Leica D Vario Elmar 14-150mm F3.5-5.6")
},
++ { { 2, 4, 16 }, N_("Lumix G Vario 7-14mm F4 Asph.")
},
++ { { 2, 5, 16 }, N_("Lumix G 20mm F1.7 Asph.")
},
++ { { 2, 6, 16 }, N_("Leica DG Macro-Elmarit 45mm F2.8")
},
++ { { 2, 8, 16 }, N_("Lumix G Fisheye 8mm F3.5")
},
++ { { 2, 9, 16 }, N_("Lumix G Vario 100-300mm F4.0-5.6 OIS")
},
++ { { 2, 16, 16 }, N_("Lumix G 14mm F2.5 Asph.")
},
++ { { 2, 18, 16 }, N_("Leica DG Summilux 25mm F1.4 Asph.")
},
++ { { 2, 20, 16 }, N_("Lumix G X Vario PZ 14-42mm F3.5-5.6 ASPH
Power OIS") },
++ { { 2, 21, 16 }, N_("Lumix G X Vario 12-35mm F2.8 ASPH Power
OIS") },
++ { { 3, 1, 0 }, N_("Leica D Vario Elmarit 14-50mm F2.8-3.5
Asph.") },
++ { { 3, 2, 0 }, N_("Leica D Summilux 25mm F1.4 Asph.")
},
+ // End of list marker
+ { { 0xff, 0, 0 }, "" }
+ };
diff --git a/graphics/exiv2/90_changeset_r2978.diff
b/graphics/exiv2/90_changeset_r2978.diff
new file mode 100644
index 0000000..e37bfd9
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2978.diff
@@ -0,0 +1,12 @@
+Index: trunk/src/olympusmn.cpp
+===================================================================
+--- trunk/src/olympusmn.cpp (revision 2977)
++++ trunk/src/olympusmn.cpp (revision 2978)
+@@ -756,6 +756,7 @@
+ TagInfo(0x0302, "ExtenderSerialNumber", N_("Extender Serial
Number"), N_("Extender serial number"), olympusEqId, makerTags, asciiString,
-1, printValue),
+ TagInfo(0x0303, "ExtenderModel", N_("Extender Model"), N_("Extender
model"), olympusEqId, makerTags, asciiString, -1, printValue),
+ TagInfo(0x0304, "ExtenderFirmwareVersion", N_("Extender Firmware
Version"), N_("Extender firmwareversion"), olympusEqId, makerTags,
unsignedLong, -1, printValue),
++ TagInfo(0x0403, "ConversionLens", N_("Conversion Lens"),
N_("Conversion Lens"), olympusEqId, makerTags, asciiString, -1, printValue),
+ TagInfo(0x1000, "FlashType", N_("Flash Type"), N_("Flash type"),
olympusEqId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusEqFlashType)),
+ TagInfo(0x1001, "FlashModel", N_("Flash Model"), N_("Flash model"),
olympusEqId, makerTags, unsignedShort, -1,
EXV_PRINT_TAG(olympusEqFlashModel)),
+ TagInfo(0x1002, "FlashFirmwareVersion", N_("Flash Firmware
Version"), N_("Flash firmware version"), olympusEqId, makerTags,
unsignedLong, -1, printValue),
diff --git a/graphics/exiv2/90_changeset_r2981.diff
b/graphics/exiv2/90_changeset_r2981.diff
new file mode 100644
index 0000000..e611a34
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2981.diff
@@ -0,0 +1,51 @@
+Index: trunk/src/olympusmn.cpp
+===================================================================
+--- trunk/src/olympusmn.cpp (revision 2980)
++++ trunk/src/olympusmn.cpp (revision 2981)
+@@ -1259,11 +1259,12 @@
+ { { 0, 8, 1 }, N_("Olympus Zuiko Digital 70-300mm F4.0-5.6")
},
+ { { 0, 8, 16 }, N_("Olympus M.Zuiko Digital ED 75-300mm
F4.8-6.7") },
+ { { 0, 9, 16 }, N_("Olympus M.Zuiko Digital 14-42mm F3.5-5.6
II") },
++ { { 0, 16, 1 }, N_("Kenko Tokina Reflex 300mm F6.3 MF Macro")
},
+ { { 0, 16, 16 }, N_("Olympus M.Zuiko Digital ED 12-50mm
F3.5-6.3 EZ") },
+ { { 0, 17, 16 }, N_("Olympus M.Zuiko Digital 45mm F1.8")
},
+ { { 0, 18, 16 }, N_("Olympus M.Zuiko Digital ED 60mm F2.8
Macro") },
+ { { 0, 19, 16 }, N_("Olympus M.Zuiko Digital ED 14-42mm
F3.5-5.6 II R") },
+- { { 0, 20, 16 }, N_("Olympus M.Zuiko Digital ED 14-150mm II or
40-150mm R") },
++ { { 0, 20, 16 }, N_("Olympus M.Zuiko Digital ED 40-150mm
F4.0-5.6 R") },
+ { { 0, 21, 0 }, N_("Olympus Zuiko Digital ED 7-14mm F4.0")
},
+ { { 0, 21, 16 }, N_("Olympus M.Zuiko Digital ED 75mm F1.8")
},
+ { { 0, 22, 16 }, N_("Olympus M.Zuiko Digital 17mm F1.8")
},
+@@ -1300,20 +1301,25 @@
+ { { 2, 1, 0 }, N_("Leica D Vario Elmarit 14-50mm F2.8-3.5
Asph.") },
+ { { 2, 1, 16 }, N_("Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega
OIS") },
+ { { 2, 2, 0 }, N_("Leica D Summilux 25mm F1.4 Asph.")
},
+- { { 2, 2, 16 }, N_("Lumix G Vario 45-200mm F4-5.6 Mega OIS")
},
++ { { 2, 2, 16 }, N_("Lumix G Vario 45-200mm F4.0-5.6 Mega OIS")
},
+ { { 2, 3, 0 }, N_("Leica D Vario Elmar 14-50mm F3.8-5.6 Asph.
Mega OIS") },
+ { { 2, 3, 1 }, N_("Leica D Vario Elmar 14-50mm F3.8-5.6
Asph.") },
+- { { 2, 3, 16 }, N_("Lumix G Vario HD 14-140mm F4-5.8 Asph.
Mega OIS") },
++ { { 2, 3, 16 }, N_("Lumix G Vario HD 14-140mm F4.0-5.8 Asph.
Mega OIS") },
+ { { 2, 4, 0 }, N_("Leica D Vario Elmar 14-150mm F3.5-5.6")
},
+- { { 2, 4, 16 }, N_("Lumix G Vario 7-14mm F4 Asph.")
},
++ { { 2, 4, 16 }, N_("Lumix G Vario 7-14mm F4.0 Asph.")
},
+ { { 2, 5, 16 }, N_("Lumix G 20mm F1.7 Asph.")
},
+- { { 2, 6, 16 }, N_("Leica DG Macro-Elmarit 45mm F2.8")
},
++ { { 2, 6, 16 }, N_("Leica DG Macro-Elmarit 45mm F2.8 Asph.
Mega OIS") },
++ { { 2, 7, 16 }, N_("Lumix G Vario 14-42mm F3.5-5.6 Asph. Mega
OIS") },
+ { { 2, 8, 16 }, N_("Lumix G Fisheye 8mm F3.5")
},
+- { { 2, 9, 16 }, N_("Lumix G Vario 100-300mm F4.0-5.6 OIS")
},
++ { { 2, 9, 16 }, N_("Lumix G Vario 100-300mm F4.0-5.6 Mega
OIS") },
+ { { 2, 16, 16 }, N_("Lumix G 14mm F2.5 Asph.")
},
++ { { 2, 17, 16 }, N_("Lumix G 3D 12.5mm F12")
},
+ { { 2, 18, 16 }, N_("Leica DG Summilux 25mm F1.4 Asph.")
},
+- { { 2, 20, 16 }, N_("Lumix G X Vario PZ 14-42mm F3.5-5.6 ASPH
Power OIS") },
+- { { 2, 21, 16 }, N_("Lumix G X Vario 12-35mm F2.8 ASPH Power
OIS") },
++ { { 2, 19, 16 }, N_("Lumix G X Vario PZ 45-175mm F4.0-5.6 Asph.
Power OIS") },
++ { { 2, 20, 16 }, N_("Lumix G X Vario PZ 14-42mm F3.5-5.6 Asph.
Power OIS") },
++ { { 2, 21, 16 }, N_("Lumix G X Vario 12-35mm F2.8 Asph. Power
OIS") },
++ { { 2, 22, 16 }, N_("Lumix G Vario 45-150mm F4.0-5.6 Asph. Mega
OIS") },
++ { { 2, 23, 16 }, N_("Lumix G X Vario 35-100mm F2.8 Power OIS")
},
+ { { 3, 1, 0 }, N_("Leica D Vario Elmarit 14-50mm F2.8-3.5
Asph.") },
+ { { 3, 2, 0 }, N_("Leica D Summilux 25mm F1.4 Asph.")
},
+ // End of list marker
diff --git a/graphics/exiv2/90_changeset_r2982.diff
b/graphics/exiv2/90_changeset_r2982.diff
new file mode 100644
index 0000000..84b17a7
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2982.diff
@@ -0,0 +1,21 @@
+Index: trunk/src/olympusmn.cpp
+===================================================================
+--- trunk/src/olympusmn.cpp (revision 2981)
++++ trunk/src/olympusmn.cpp (revision 2982)
+@@ -1280,7 +1280,7 @@
+ { { 0, 51, 0 }, N_("Olympus Zuiko Digital 25mm F2.8")
},
+ { { 0, 52, 0 }, N_("Olympus Zuiko Digital ED 9-18mm F4.0-5.6")
},
+ { { 0, 53, 0 }, N_("Olympus Zuiko Digital 14-54mm F2.8-3.5
II") },
+- { { 1, 1, 0 }, N_("Sigma 18-50mm F3.5-5.6")
},
++ { { 1, 1, 0 }, N_("Sigma 18-50mm F3.5-5.6 DC")
},
+ { { 1, 1, 16 }, N_("Sigma 30mm F2.8 EX DN")
},
+ { { 1, 2, 0 }, N_("Sigma 55-200mm F4.0-5.6 DC")
},
+ { { 1, 2, 16 }, N_("Sigma 19mm F2.8 EX DN")
},
+@@ -1290,6 +1290,7 @@
+ { { 1, 6, 0 }, N_("Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF")
},
+ { { 1, 7, 0 }, N_("Sigma 105mm F2.8 DG")
},
+ { { 1, 8, 0 }, N_("Sigma 150mm F2.8 DG HSM")
},
++ { { 1, 9, 0 }, N_("Sigma 18-50mm F2.8 EX DC Macro")
},
+ { { 1, 16, 0 }, N_("Sigma 24mm F1.8 EX DG Aspherical Macro")
},
+ { { 1, 17, 0 }, N_("Sigma 135-400mm F4.5-5.6 DG ASP APO RF")
},
+ { { 1, 18, 0 }, N_("Sigma 300-800mm F5.6 EX DG APO")
},
diff --git a/graphics/exiv2/90_changeset_r2984.diff
b/graphics/exiv2/90_changeset_r2984.diff
new file mode 100644
index 0000000..7bec0ad
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2984.diff
@@ -0,0 +1,22 @@
+Index: trunk/src/nikonmn.cpp
+===================================================================
+--- trunk/src/nikonmn.cpp (revision 2983)
++++ trunk/src/nikonmn.cpp (revision 2984)
+@@ -2051,6 +2051,7 @@
+ {0x7A,0x40,0x2D,0x80,0x2C,0x40,0x4B,0x0E,0x01,0x00,0x05, "Sigma", "888558",
"18-200mm F3.5-6.3 DC OS HSM"},
+ {0xED,0x40,0x2D,0x80,0x2C,0x40,0x4B,0x0E,0x01,0x00,0x05, "Sigma", "888558",
"18-200mm F3.5-6.3 DC OS HSM"},
+ {0xA5,0x40,0x2D,0x88,0x2C,0x40,0x4B,0x0E,0x01,0x00,0x05, "Sigma", "",
"18-250mm F3.5-6.3 DC OS HSM"},
++{0x92,0x40,0x2D,0x88,0x2C,0x40,0x4B,0x0E,0x01,0x00,0x05, "Sigma", "",
"18-250mm F3.5-6.3 DC Macro OS HSM"}, // stps varies with focal length for
this lens.
+ {0x26,0x48,0x31,0x49,0x24,0x24,0x1C,0x02,0x00,0x00,0x05, "Sigma", "",
"20-40mm F2.8"},
+ {0x26,0x48,0x37,0x56,0x24,0x24,0x1C,0x02,0x00,0x00,0x05, "Sigma", "547448",
"24-60mm F2.8 EX DG"},
+ {0xB6,0x48,0x37,0x56,0x24,0x24,0x1C,0x02,0x00,0x00,0x05, "Sigma", "547448",
"24-60mm F2.8 EX DG"},
+@@ -2338,7 +2339,8 @@
+
+ for (int i = 0; fmountlens[i].lensname != NULL; ++i) {
+ if ( raw[0] == fmountlens[i].lid
+- && raw[1] == fmountlens[i].stps
++ // stps varies with focal length for some Sigma zoom lenses.
++ &&(raw[1] == fmountlens[i].stps || fmountlens[i].mid ==
0x05)
+ && raw[2] == fmountlens[i].focs
+ && raw[3] == fmountlens[i].focl
+ && raw[4] == fmountlens[i].aps
diff --git a/graphics/exiv2/90_changeset_r2985.diff
b/graphics/exiv2/90_changeset_r2985.diff
new file mode 100644
index 0000000..f5093e4
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2985.diff
@@ -0,0 +1,14 @@
+Index: trunk/src/pentaxmn.cpp
+===================================================================
+--- trunk/src/pentaxmn.cpp (revision 2984)
++++ trunk/src/pentaxmn.cpp (revision 2985)
+@@ -687,7 +687,8 @@
+ { 0x031a, "smc PENTAX-F* 250-600mm F5.6 ED[IF]" },
+ { 0x031b, "smc PENTAX-F 28-80mm F3.5-4.5" }, //0
+ { 0x031b, "Tokina AT-X Pro AF 28-70mm F2.6-2.8" }, //1
+- { 0x031c, "smc PENTAX-F 35-70mm F3.5-4.5" },
++ { 0x031c, "smc PENTAX-F 35-70mm F3.5-4.5 or Tokina Lens" }, //0
++ { 0x031c, "Tokina AT-X AF 400mm F5.6" },
//1
+ { 0x031d, "PENTAX-F 28-80mm F3.5-4.5 or SIGMA AF 18-125mm F3.5-5.6
DC" },
+ { 0x031e, "PENTAX-F 70-200mm F4-5.6" },
+ { 0x031f, "smc PENTAX-F 70-210mm F4-5.6 or Tokina or Takumar Lens"
}, //0
diff --git a/graphics/exiv2/90_changeset_r2986.diff
b/graphics/exiv2/90_changeset_r2986.diff
new file mode 100644
index 0000000..9c6ad68
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2986.diff
@@ -0,0 +1,16 @@
+Index: trunk/src/nikonmn.cpp
+===================================================================
+--- trunk/src/nikonmn.cpp (revision 2985)
++++ trunk/src/nikonmn.cpp (revision 2986)
+@@ -1971,8 +1971,10 @@
+ {0xAF,0x54,0x44,0x44,0x0C,0x0C,0xB1,0x06,0x01,0x00,0x00, "Nikon",
"JAA134DA", "AF-S Nikkor 35mm f/1.4G"},
+ {0xB0,0x4C,0x50,0x50,0x14,0x14,0xB2,0x06,0x01,0x00,0x00, "Nikon",
"JAA015DA", "AF-S Nikkor 50mm f/1.8G"},
+ {0xB1,0x48,0x48,0x48,0x24,0x24,0xB3,0x06,0x01,0x00,0x00, "Nikon",
"JAA638DA", "AF-S DX Micro Nikkor 40mm f/2.8G"},
+-//B2
++//B2 B5
+ {0xB3,0x4C,0x62,0x62,0x14,0x14,0xB5,0x06,0x01,0x00,0x00, "Nikon",
"JAA341DA", "AF-S Nikkor 85mm f/1.8G"},
++{0xB4,0x40,0x37,0x62,0x2C,0x34,0xB6,0x0E,0x01,0x00,0x00, "Nikon", "", "AF-S
VR Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED"},
++{0xB5,0x4C,0x3C,0x3C,0x14,0x14,0xB7,0x06,0x01,0x00,0x00, "Nikon", "", "AF-S
Nikkor 28mm f/1.8G"},
+ //
+ {0x01,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00, "Nikon",
"JAA90701", "TC-16A"},
+ {0x01,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00, "Nikon",
"JAA90701", "TC-16A"},
diff --git a/graphics/exiv2/90_changeset_r2988.diff
b/graphics/exiv2/90_changeset_r2988.diff
new file mode 100644
index 0000000..e64711e
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2988.diff
@@ -0,0 +1,12 @@
+Index: trunk/src/easyaccess.cpp
+===================================================================
+--- trunk/src/easyaccess.cpp (revision 2987)
++++ trunk/src/easyaccess.cpp (revision 2988)
+@@ -256,6 +256,7 @@
+ ExifData::const_iterator lensName(const ExifData& ed)
+ {
+ static const char* keys[] = {
++ "Exif.Photo.LensModel",
+ "Exif.CanonCs.LensType",
+ "Exif.NikonLd1.LensIDNumber",
+ "Exif.NikonLd2.LensIDNumber",
diff --git a/graphics/exiv2/90_changeset_r2989.diff
b/graphics/exiv2/90_changeset_r2989.diff
new file mode 100644
index 0000000..ffd4878
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2989.diff
@@ -0,0 +1,21 @@
+Index: trunk/src/minoltamn.cpp
+===================================================================
+--- trunk/src/minoltamn.cpp (revision 2988)
++++ trunk/src/minoltamn.cpp (revision 2989)
+@@ -1863,15 +1863,7 @@
+ "Tamron SP AF 90mm F2.5"},
+ { 45751, "1.4x Teleconverter " },
+ { 45851, "Tamron SP AF 300mm F2.8 LD IF" },
+- { 65535, "T-Mount | "
+- "Arax MC 35mm F2.8 Tilt+Shift | "
+- "Arax MC 80mm F2.8 Tilt+Shift | "
+- "Zenitar MF 16mm F2.8 Fisheye M42 | "
+- "Samyang 500mm Mirror F8.0 | "
+- "Pentacon Auto 135mm F2.8 | "
+- "Pentacon Auto 29mm F2.8 | "
+- "Helios 44-2 58mm F2.0 | "
+- "No Lens" }
++ { 65535, "Manual Lens or No Lens" }
+ };
+
+ std::ostream& printMinoltaSonyLensID(std::ostream& os, const Value&
value, const ExifData* metadata)
diff --git a/graphics/exiv2/90_changeset_r2990.diff
b/graphics/exiv2/90_changeset_r2990.diff
new file mode 100644
index 0000000..9b1c960
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2990.diff
@@ -0,0 +1,31 @@
+Index: trunk/src/crwimage.cpp
+===================================================================
+--- trunk/src/crwimage.cpp (revision 2989)
++++ trunk/src/crwimage.cpp (revision 2990)
+@@ -825,7 +825,7 @@
+ if not found, create it
+ set value
+ */
+-
++ AutoPtr m;
+ CiffComponent* cc = 0;
+ const Components::iterator b = components_.begin();
+ const Components::iterator e = components_.end();
+@@ -842,7 +842,7 @@
+ }
+ if (cc == 0) {
+ // Directory doesn't exist yet, add it
+- AutoPtr m(new CiffDirectory(csd.crwDir_, csd.parent_));
++ m = AutoPtr(new CiffDirectory(csd.crwDir_, csd.parent_));
+ cc = m.get();
+ add(m);
+ }
+@@ -859,7 +859,7 @@
+ }
+ if (cc == 0) {
+ // Tag doesn't exist yet, add it
+- AutoPtr m(new CiffEntry(crwTagId, tag()));
++ m = AutoPtr(new CiffEntry(crwTagId, tag()));
+ cc = m.get();
+ add(m);
+ }
diff --git a/graphics/exiv2/90_changeset_r2991.diff
b/graphics/exiv2/90_changeset_r2991.diff
new file mode 100644
index 0000000..e4ea963
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2991.diff
@@ -0,0 +1,15 @@
+Index: trunk/src/tiffvisitor.cpp
+===================================================================
+--- trunk/src/tiffvisitor.cpp (revision 2990)
++++ trunk/src/tiffvisitor.cpp (revision 2991)
+@@ -1164,9 +1164,9 @@
+ void TiffReader::changeState(TiffRwState::AutoPtr state)
+ {
+ if (state.get() != 0) {
+- if (pOrigState_ != pState_) delete pState_;
+ // invalidByteOrder indicates 'no change'
+ if (state->byteOrder_ == invalidByteOrder) state->byteOrder_ =
pState_->byteOrder_;
++ if (pOrigState_ != pState_) delete pState_;
+ pState_ = state.release();
+ }
+ }
diff --git a/graphics/exiv2/90_changeset_r2992.diff
b/graphics/exiv2/90_changeset_r2992.diff
new file mode 100644
index 0000000..25e6fcf
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2992.diff
@@ -0,0 +1,12 @@
+Index: trunk/src/olympusmn.cpp
+===================================================================
+--- trunk/src/olympusmn.cpp (revision 2991)
++++ trunk/src/olympusmn.cpp (revision 2992)
+@@ -1270,6 +1270,7 @@
+ { { 0, 22, 16 }, N_("Olympus M.Zuiko Digital 17mm F1.8")
},
+ { { 0, 23, 0 }, N_("Olympus Zuiko Digital Pro ED 35-100mm
F2.0") },
+ { { 0, 24, 0 }, N_("Olympus Zuiko Digital 14-45mm F3.5-5.6")
},
++ { { 0, 24, 16 }, N_("Olympus M.Zuiko Digital ED 75-300mm
F4.8-6.7 II") },
+ { { 0, 32, 0 }, N_("Olympus Zuiko Digital 35mm F3.5 Macro")
},
+ { { 0, 34, 0 }, N_("Olympus Zuiko Digital 17.5-45mm F3.5-5.6")
},
+ { { 0, 35, 0 }, N_("Olympus Zuiko Digital ED 14-42mm
F3.5-5.6") },
diff --git a/graphics/exiv2/90_changeset_r2993.diff
b/graphics/exiv2/90_changeset_r2993.diff
new file mode 100644
index 0000000..f4a5720
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2993.diff
@@ -0,0 +1,95 @@
+Index: trunk/src/canonmn.cpp
+===================================================================
+--- trunk/src/canonmn.cpp (revision 2992)
++++ trunk/src/canonmn.cpp (revision 2993)
+@@ -481,7 +481,11 @@
+ { 32, "Sigma 15mm f/2.8 EX Fisheye"
}, // 1
+ { 33, "Voigtlander or Zeiss Lens"
}, // 0
+ { 33, "Voigtlander Ultron 40mm f/2 SLII Aspherical"
}, // 1
+- { 33, "Zeiss Distagon 35mm T* f/2 ZE"
}, // 2
++ { 33, "Zeiss Distagon 15mm T* f/2.8 ZE"
}, // 2
++ { 33, "Zeiss Distagon 18mm T* f/3.5 ZE"
}, // 3
++ { 33, "Zeiss Distagon 21mm T* f/2.8 ZE"
}, // 4
++ { 33, "Zeiss Distagon 28mm T* f/2 ZE"
}, // 5
++ { 33, "Zeiss Distagon 35mm T* f/2 ZE"
}, // 6
+ { 35, "Canon EF 35-80mm f/4-5.6"
},
+ { 36, "Canon EF 38-76mm f/4.5-5.6"
},
+ { 37, "Canon EF 35-80mm f/4-5.6"
}, // 0
+@@ -520,6 +524,7 @@
+ { 131, "Sigma APO 50-150mm f/2.8 EX DC HSM"
}, // 4
+ { 131, "Sigma APO 120-300mm f/2.8 EX DG HSM"
}, // 5
+ { 131, "Sigma 4.5mm F2.8 EX DC HSM Circular Fisheye"
}, // 6
++ { 131, "Sigma 70-200mm f/2.8 APO EX HSM"
}, // 7
+ { 132, "Canon EF 1200mm f/5.6L"
},
+ { 134, "Canon EF 600mm f/4L IS"
},
+ { 135, "Canon EF 200mm f/1.8L"
},
+@@ -533,8 +538,12 @@
+ { 137, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM"
}, // 6
+ { 137, "Sigma 17-50mm f/2.8 OS HSM"
}, // 7
+ { 137, "Sigma 18-200mm f/3.5-6.3 II DC OS HSM"
}, // 8
+- { 137, "Sigma 12-24mm f/4.5-5.6 DG HSM II"
}, // 9
+- { 137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD"
}, // 10
++ { 137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD"
}, // 9
++ { 137, "Sigma 12-24mm f/4.5-5.6 DG HSM II"
}, // 10
++ { 137, "Tamron SP 17-50mm f/2.8 XR Di II VC"
}, // 11
++ { 137, "Tamron SP 60mm f/2 Macro Di II"
}, // 12
++ { 137, "Sigma 10-20mm f/3.5 EX DC HSM"
}, // 13
++ { 137, "Tamron SP 24-70mm f/2.8 Di VC USD"
}, // 14
+ { 138, "Canon EF 28-80mm f/2.8-4L"
},
+ { 139, "Canon EF 400mm f/2.8L"
},
+ { 140, "Canon EF 500mm f/4.5L"
},
+@@ -576,6 +585,7 @@
+ { 161, "Sigma 28-70mm f/2.8 EX"
}, // 2
+ { 161, "Tamron AF 17-50mm f/2.8 Di-II LD Aspherical"
}, // 3
+ { 161, "Tamron 90mm f/2.8"
}, // 4
++ { 161, "Sigma 24-60mm f/2.8 EX DG"
}, // 5
+ { 162, "Canon EF 200mm f/2.8L"
},
+ { 163, "Canon EF 300mm f/4L"
},
+ { 164, "Canon EF 400mm f/5.6L"
},
+@@ -590,6 +600,7 @@
+ { 169, "Sigma 50mm f/1.4 EX DG HSM"
}, // 4
+ { 169, "Sigma 85mm f/1.4 EX DG HSM"
}, // 5
+ { 169, "Sigma 30mm f/1.4 EX DC HSM"
}, // 6
++ { 169, "Sigma 35mm f/1.4 DG HSM"
}, // 7
+ { 170, "Canon EF 200mm f/2.8L II"
},
+ { 171, "Canon EF 300mm f/4L"
},
+ { 172, "Canon EF 400mm f/5.6L"
},
+@@ -598,6 +609,7 @@
+ { 173, "Sigma APO Macro 150mm f/3.5 EX DG IF HSM"
}, // 2
+ { 174, "Canon EF 135mm f/2L"
}, // 0
+ { 174, "Sigma 70-200mm f/2.8 EX DG APO OS HSM"
}, // 1
++ { 174, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM"
}, // 2
+ { 175, "Canon EF 400mm f/2.8L"
},
+ { 176, "Canon EF 24-85mm f/3.5-4.5 USM"
},
+ { 177, "Canon EF 300mm f/4L IS"
},
+@@ -606,7 +618,8 @@
+ { 180, "Canon EF 35mm f/1.4L"
},
+ { 181, "Canon EF 100-400mm f/4.5-5.6L IS + 1.4x"
},
+ { 182, "Canon EF 100-400mm f/4.5-5.6L IS + 2x"
},
+- { 183, "Canon EF 100-400mm f/4.5-5.6L IS"
},
++ { 183, "Canon EF 100-400mm f/4.5-5.6L IS"
}, // 0
++ { 183, "Sigma 150mm f/2.8 EX DG OS HSM APO Macro"
}, // 1
+ { 184, "Canon EF 400mm f/2.8L + 2x"
},
+ { 185, "Canon EF 600mm f/4L IS"
},
+ { 186, "Canon EF 70-200mm f/4L"
},
+@@ -668,10 +681,19 @@
+ { 489, "Canon EF 70-300mm f/4-5.6L IS USM"
},
+ { 490, "Canon EF 8-15mm f/4L USM"
},
+ { 491, "Canon EF 300mm f/2.8L IS II USM"
},
++ { 492, "Canon EF 400mm f/2.8L IS II USM"
},
++ { 493, "Canon EF 24-105mm f/4L IS USM"
},
+ { 494, "Canon EF 600mm f/4.0L IS II USM"
},
+ { 495, "Canon EF 24-70mm f/2.8L II USM"
},
++ { 496, "Canon EF 200-400mm f/4L IS USM"
},
++ { 502, "Canon EF 28mm f/2.8 IS USM"
},
++ { 503, "Canon EF 24mm f/2.8 IS USM"
},
++ { 504, "Canon EF 24-70mm f/4L IS USM"
},
+ { 505, "Canon EF 35mm f/2 IS USM"
},
+- { 4144,"Canon EF 40mm f/2.8 STM"
}
++ { 4142,"Canon EF-S 18-135mm f/3.5-5.6 IS STM"
},
++ { 4143,"Canon EF-M 18-55mm f/3.5-5.6 IS STM"
},
++ { 4144,"Canon EF 40mm f/2.8 STM"
},
++ { 4145,"Canon EF-M 22mm f/2 STM"
}
+ };
+
+ //! A lens id and a pretty-print function for special treatment of the
id.
diff --git a/graphics/exiv2/90_changeset_r2994.diff
b/graphics/exiv2/90_changeset_r2994.diff
new file mode 100644
index 0000000..ca4e426
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2994.diff
@@ -0,0 +1,14 @@
+Index: trunk/src/canonmn.cpp
+===================================================================
+--- trunk/src/canonmn.cpp (revision 2993)
++++ trunk/src/canonmn.cpp (revision 2994)
+@@ -729,7 +729,8 @@
+ { 161, printCsLensByFocalLength },
+ { 169, printCsLensByFocalLength },
+ { 173, printCsLensByFocalLength }, // works partly
+- { 174, printCsLensByFocalLength } // not tested
++ { 174, printCsLensByFocalLength }, // not tested
++ { 183, printCsLensByFocalLength } // not tested
+ };
+
+ //! FlashActivity, tag 0x001c
diff --git a/graphics/exiv2/90_changeset_r2995.diff
b/graphics/exiv2/90_changeset_r2995.diff
new file mode 100644
index 0000000..865b91e8
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2995.diff
@@ -0,0 +1,135 @@
+Index: trunk/src/minoltamn.cpp
+===================================================================
+--- trunk/src/minoltamn.cpp (revision 2994)
++++ trunk/src/minoltamn.cpp (revision 2995)
+@@ -1644,10 +1644,12 @@
+ "Sigma 100-300mm F4 EX (APO (D) or D IF) | "
+ "Sigma 70mm F2.8 EX DG Macro | "
+ "Sigma 20mm F1.8 EX DG Aspherical RF | "
+- "Sigma 30mm F1.4 DG EX" },
++ "Sigma 30mm F1.4 DG EX | "
++ "Sigma 24mm F1.8 EX DG ASP Macro" },
+ { 27, "Minolta AF 85mm F1.4 G (D)" },
+ { 28, "Minolta/Sony AF 100mm F2.8 Macro (D) | "
+- "Tamron SP AF 90mm F2.8 Di Macro" },
++ "Tamron SP AF 90mm F2.8 Di Macro | "
++ "Tamron AF 180mm F3.5 SP Di LD [IF] Macro" },
+ { 29, "Minolta/Sony AF 75-300mm F4.5-5.6 (D) " },
+ { 30, "Minolta AF 28-80mm F3.5-5.6 (D) | "
+ "Sigma AF 10-20mm F4-5.6 EX DC | "
+@@ -1678,13 +1680,27 @@
+ { 50, "Sony AF DT 18-250mm F3.5-6.3" },
+ { 51, "Sony AF DT 16-105mm F3.5-5.6 | "
+ "Sony AF DT 55-200mm F4-5.5" },
+- { 52, "Sony 70-300mm F4.5-5.6 G SSM" },
++ { 52, "Sony 70-300mm F4.5-5.6 G SSM (SAL70300G) | "
++ "Tamron SP 70-300mm F4-5.6 Di VC USD" },
+ { 53, "Sony AF 70-400mm F4.5-5.6 G SSM (SAL-70400G)" },
+ { 54, "Carl Zeiss Vario-Sonnar T* 16-35mm F2.8 ZA SSM
(SAL-1635Z)" },
+ { 55, "Sony DT 18-55mm F3.5-5.6 SAM (SAL-1855)" },
+ { 56, "Sony AF DT 55-200mm F4-5.6 SAM" },
+- { 57, "Sony AF DT 50mm F1.8 SAM" },
++ { 57, "Sony DT 50mm F1.8 SAM (SAL50F18) | "
++ "Tamron SP AF 60mm F2 Di II LD [IF] Macro 1:1 | "
++ "Tamron 18-270mm F3.5-6.3 Di II PZD" },
+ { 58, "Sony AF DT 30mm F2.8 SAM Macro" },
++ { 59, "Sony 28-75mm F2.8 SAM (SAL2875)" },
++ { 60, "Carl Zeiss Distagon T* 24mm F2 ZA SSM (SAL24F20Z)" },
++ { 61, "Sony 85mm F2.8 SAM (SAL85F28)" },
++ { 62, "Sony DT 35mm F1.8 SAM (SAL35F18)" },
++ { 63, "Sony DT 16-50mm F2.8 SSM (SAL1650)" },
++ { 64, "Sony 500mm F4.0 G SSM (SAL500F40G)" },
++ { 65, "Sony DT 18-135mm F3.5-5.6 SAM (SAL18135)" },
++ { 66, "Sony 300mm F2.8 G SSM II (SAL300F28G2)" },
++ { 68, "Sony DT 55-300mm F4.5-5.6 SAM (SAL55300)" },
++ { 69, "Sony 70-400mm F4-5.6 G SSM II (SAL70400G2)" },
++ { 70, "Sony Carl Zeiss Planar T* 50mm F1.4 ZA SSM (SALF0F14Z)" },
+ { 128, "Sigma 70-200mm F2.8 APO EX DG MACRO | "
+ "Tamron 18-200mm F3.5-6.3 | "
+ "Tamron 28-300mm F3.5-6.3 | "
+@@ -1693,8 +1709,12 @@
+ "Tamron SP AF 17-35mm F2.8-4 Di LD Aspherical IF | "
+ "Sigma AF 50-150mm F2.8 EX DC APO HSM II | "
+ "Sigma 10-20mm F3.5 EX DC HSM | "
++ "Sigma 70-200mm F2.8 II EX DG APO MACRO HSM | "
++ "Sigma 10mm F2.8 EX DC HSM Fisheye | "
+ "Sigma 50mm F1.4 EX DG HSM | "
+- "Sigma 70-200mm F2.8 II EX DG APO MACRO HSM" },
++ "Sigma 85mm F1.4 EX DG HSM | "
++ "Sigma 24-70mm F2.8 IF EX DG HSM | "
++ "Sigma 18-250mm F3.5-6.3 DC OS HSM" },
+ { 129, "Tamron 200-400mm F5.6 LD | "
+ "Tamron 70-300mm F4-5.6 LD" },
+ { 131, "Tamron 20-40mm F2.7-3.5 SP Aspherical IF" },
+@@ -1729,7 +1749,8 @@
+ "Tokina AF PRO 28-80mm F2.8 AT-X 280 | "
+ "Tokina AT-X PRO II AF 28-70mm F2.6-2.8 270 | "
+ "Tamron AF 19-35mm F3.5-4.5 | "
+- "Angenieux AF 28-70mm F2.6" },
++ "Angenieux AF 28-70mm F2.6 | "
++ "Tokina AT-X 17 AF 17mm F3.5" },
+ { 25530, "Minolta AF 28-135mm F4-4.5" },
+ { 25531, "Minolta AF 28-135mm F4-4.5 | "
+ "Sigma ZOOM-alpha 35-135mm F3.5-4.5 | "
+@@ -1757,7 +1778,9 @@
+ "Sigma AF 170-500mm F5-6.3 APO Aspherical | "
+ "Tokina AT-X AF 300mm F4 | "
+ "Tokina AT-X AF 400mm F5.6 SD | "
+- "Tokina AF 730 II 75-300mm F4.5-5.6" },
++ "Tokina AF 730 II 75-300mm F4.5-5.6 | "
++ "Sigma 800mm F5.6 APO | "
++ "Sigma AF 400mm F5.6 APO Macro" },
+ { 25620, "Minolta AF 50mm F1.4" },
+ { 25621, "Minolta AF 50mm F1.4 [New]" },
+ { 25630, "Minolta AF 300mm F2.8G APO" },
+@@ -1799,6 +1822,9 @@
+ { 25890, "Minolta AF 80-200mm F2.8 APO" },
+ { 25891, "Minolta AF 80-200mm F2.8 APO | "
+ "Tokina 80-200mm F2.8" },
++ { 25900, "Minolta AF 200mm F2.8 G APO + Minolta AF 1.4x APO + 1.4x"
},
++ { 25901, "Minolta AF 200mm F2.8 G APO + Minolta AF 1.4x APO + 1.4x
| "
++ "Minolta AF 600mm F4 HS-APO G + Minolta AF 1.4x APO" },
+ { 25910, "Minolta AF 35mm F1.4G" },
+ { 25911, "Minolta AF 35mm F1.4" },
+ { 25920, "Minolta AF 85mm F1.4G" },
+@@ -1813,6 +1839,9 @@
+ { 25971, "Minolta AF 35mm F2 [New]" },
+ { 25980, "Minolta AF 100mm F2" },
+ { 25981, "Minolta AF 100mm F2" },
++ { 26010, "Minolta AF 200mm F2.8 G APO + Minolta AF 2x APO + 2x" },
++ { 26011, "Minolta AF 200mm F2.8 G APO + Minolta AF 2x APO + 2x | "
++ "Minolta AF 600mm F4 HS-APO G + Minolta AF 2x APO" },
+ { 26040, "Minolta AF 80-200mm F4.5-5.6" },
+ { 26041, "Minolta AF 80-200mm F4.5-5.6" },
+ { 26050, "Minolta AF 35-80mm F4-5.6" },
+@@ -1863,7 +1892,29 @@
+ "Tamron SP AF 90mm F2.5"},
+ { 45751, "1.4x Teleconverter " },
+ { 45851, "Tamron SP AF 300mm F2.8 LD IF" },
+- { 65535, "Manual Lens or No Lens" }
++ { 45871, "Tamron AF 70-210mm F2.8 SP LD" },
++ { 65535, "Manual Lens or No Lens | "
++ "Sony E 16mm F2.8 | "
++ "Sony E 20mm F2.8 | "
++ "Sony E 24mm F1.8 ZA | "
++ "Sony E 30mm F3.5 Macro | "
++ "Sony E 35mm F1.8 OSS | "
++ "Sony E 50mm F1.8 OSS | "
++ "Sony E 10-18mm F4 OSS | "
++ "Sony E PZ 16-50mm F3.5-5.6 OSS | "
++ "Sony E 18-55mm F3.5-5.6 OSS | "
++ "Sony E 18-200mm F3.5-6.3 OSS | "
++ "Sony E 55-210mm F4.5-6.3 OSS | "
++ "Sigma 19mm F2.8 EX DN | "
++ "Sigma 30mm F2.8 EX DN | "
++ "Tamron 18-200mm F3.5-6.3 Di III VC | "
++ "Arax MC 35mm F2.8 Tilt+Shift | "
++ "Arax MC 80mm F2.8 Tilt+Shift | "
++ "Zenitar MF 16mm F2.8 Fisheye M42 | "
++ "Samyang 500mm Mirror F8.0 | "
++ "Pentacon Auto 135mm F2.8 | "
++ "Pentacon Auto 29mm F2.8 | "
++ "Helios 44-2 58mm F2.0" }
+ };
+
+ std::ostream& printMinoltaSonyLensID(std::ostream& os, const Value&
value, const ExifData* metadata)
diff --git a/graphics/exiv2/90_changeset_r2998.diff
b/graphics/exiv2/90_changeset_r2998.diff
new file mode 100644
index 0000000..a212096
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r2998.diff
@@ -0,0 +1,53 @@
+Index: trunk/src/olympusmn.cpp
+===================================================================
+--- trunk/src/olympusmn.cpp (revision 2997)
++++ trunk/src/olympusmn.cpp (revision 2998)
+@@ -1005,7 +1005,7 @@
+ TagInfo(0x0301, "FocusStepCount", N_("Focus Step Count"), N_("Focus
step count"), olympusFiId, makerTags, unsignedShort, -1, printValue),
+ TagInfo(0x0303, "FocusStepInfinity", N_("Focus Step Infinity"),
N_("Focus step infinity"), olympusFiId, makerTags, unsignedShort, -1,
printValue),
+ TagInfo(0x0304, "FocusStepNear", N_("Focus Step Near"), N_("Focus
step near"), olympusFiId, makerTags, unsignedShort, -1, printValue),
+- TagInfo(0x0305, "FocusDistance", N_("Focus Distance"), N_("Focus
distance"), olympusFiId, makerTags, unsignedRational, -1, printValue),
++ TagInfo(0x0305, "FocusDistance", N_("Focus Distance"), N_("Focus
distance"), olympusFiId, makerTags, unsignedRational, -1, print0x0305),
+ TagInfo(0x0308, "AFPoint", N_("AF Point"), N_("AF point"),
olympusFiId, makerTags, unsignedShort, -1, print0x0308),
+ TagInfo(0x1201, "ExternalFlash", N_("External Flash"), N_("External
flash"), olympusFiId, makerTags, unsignedShort, -1,
EXV_PRINT_TAG(olympusOffOn)),
+ TagInfo(0x1203, "ExternalFlashGuideNumber", N_("External Flash
Guide Number"), N_("External flash guide number"), olympusFiId, makerTags,
signedRational, -1, printValue),
+@@ -1514,6 +1514,26 @@
+ return os;
+ } // OlympusMakerNote::print0x1209
+
++ // Olympus FocusDistance 0x0305
++ std::ostream& OlympusMakerNote::print0x0305(std::ostream& os, const
Value& value, const ExifData*) {
++ if (value.count() != 1 || value.typeId() != unsignedRational) {
++ return os << value;
++ }
++
++ Rational distance = value.toRational();
++ if(static_cast<uint32_t>(distance.first) == 0xffffffff) {
++ os << _("Infinity");
++ }
++ else {
++ std::ostringstream oss;
++ oss.copyfmt(os);
++ os << std::fixed << std::setprecision(2);
++ os << (float)distance.first/1000 << " m";
++ os.copyfmt(oss);
++ }
++ return os;
++ }
++
+ // Olympus FocusInfo tag 0x0308 AFPoint
+ std::ostream& OlympusMakerNote::print0x0308(std::ostream& os, const
Value&
+ value, const ExifData* metadata)
+Index: trunk/src/olympusmn_int.hpp
+===================================================================
+--- trunk/src/olympusmn_int.hpp (revision 2997)
++++ trunk/src/olympusmn_int.hpp (revision 2998)
+@@ -103,6 +103,8 @@
+ static std::ostream& print0x0529(std::ostream& os, const Value&
value, const ExifData*);
+ //! Print Olympus focus info ManualFlash
+ static std::ostream& print0x1209(std::ostream& os, const Value&
value, const ExifData*);
++ //! Print Olympus focus distance
++ static std::ostream& print0x0305(std::ostream& os, const Value&
value, const ExifData*);
+ //! Print Olympus focus info AF Point
+ static std::ostream& print0x0308(std::ostream& os, const Value&
value, const ExifData*);
+ //! Print Olympus generic
diff --git a/graphics/exiv2/90_changeset_r3002.diff
b/graphics/exiv2/90_changeset_r3002.diff
new file mode 100644
index 0000000..0904097
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r3002.diff
@@ -0,0 +1,79 @@
+Index: trunk/src/nikonmn.cpp
+===================================================================
+--- trunk/src/nikonmn.cpp (revision 3001)
++++ trunk/src/nikonmn.cpp (revision 3002)
+@@ -1869,6 +1869,7 @@
+ {0x53,0x48,0x60,0x80,0x24,0x24,0x57,0x02,0x00,0x00,0x00, "Nikon",
"JAA762DA", "AF Zoom-Nikkor 80-200mm f/2.8D ED"},
+ {0x53,0x48,0x60,0x80,0x24,0x24,0x60,0x02,0x00,0x00,0x00, "Nikon",
"JAA762DA", "AF Zoom-Nikkor 80-200mm f/2.8D ED"},
+ {0x54,0x44,0x5C,0x7C,0x34,0x3C,0x58,0x02,0x00,0x00,0x00, "Nikon",
"JAA763DA", "AF Zoom-Micro Nikkor 70-180mm f/4.5-5.6D ED"},
++{0x54,0x44,0x5C,0x7C,0x34,0x3C,0x61,0x02,0x00,0x00,0x00, "Nikon",
"JAA763DA", "AF Zoom-Micro Nikkor 70-180mm f/4.5-5.6D ED"},
+ //55
+ {0x56,0x48,0x5C,0x8E,0x30,0x3C,0x5A,0x02,0x00,0x00,0x00, "Nikon",
"JAA764DA", "AF Zoom-Nikkor 70-300mm f/4-5.6D ED"},
+ //57
+@@ -1928,8 +1929,7 @@
+ {0x89,0x3C,0x53,0x80,0x30,0x3C,0x8B,0x06,0x01,0x00,0x00, "Nikon",
"JAA793DA", "AF-S DX Zoom-Nikkor 55-200mm f/4-5.6G ED"},
+ {0x8A,0x54,0x6A,0x6A,0x24,0x24,0x8C,0x0E,0x53,0x00,0x00, "Nikon",
"JAA630DA", "AF-S VR Micro-Nikkor 105mm f/2.8G IF-ED"},
+ {0x8B,0x40,0x2D,0x80,0x2C,0x3C,0x8D,0x0E,0x01,0x00,0x00, "Nikon",
"JAA794DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED"},
+-{0x8B,0x40,0x2D,0x80,0x2C,0x3C,0xFD,0x0E,0x01,0x01,0x00, "Nikon",
"JAA794DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED"},
+-{0x8B,0x40,0x2D,0x80,0x2C,0x3C,0xFD,0x0E,0x01,0x02,0x00, "Nikon",
"JAA813DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED II"},
++{0x8B,0x40,0x2D,0x80,0x2C,0x3C,0xFD,0x0E,0x01,0x01,0x00, "Nikon",
"JAA813DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED II"},
+ {0x8C,0x40,0x2D,0x53,0x2C,0x3C,0x8E,0x06,0x01,0x00,0x00, "Nikon",
"JAA792DA", "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED"},
+ {0x8D,0x44,0x5C,0x8E,0x34,0x3C,0x8F,0x0E,0x31,0x00,0x00, "Nikon",
"JAA795DA", "AF-S VR Zoom-Nikkor 70-300mm f/4.5-5.6G IF-ED"},
+ //8E 90
+@@ -1967,15 +1967,20 @@
+ //AB AD
+ {0xAC,0x38,0x53,0x8E,0x34,0x3C,0xAE,0x0E,0x01,0x00,0x00, "Nikon",
"JAA814DA", "AF-S DX VR Nikkor 55-300mm 4.5-5.6G ED"},
+ //AD AF
++{0xAD,0x3C,0x2D,0x8E,0x2C,0x3C,0xAF,0x0E,0x01,0x00,0x00, "Nikon", "", "AF-S
DX Nikkor 18-300mm 3.5-5.6G ED VR"},
+ {0xAE,0x54,0x62,0x62,0x0C,0x0C,0xB0,0x06,0x01,0x00,0x00, "Nikon",
"JAA338DA", "AF-S Nikkor 85mm f/1.4G"},
+ {0xAF,0x54,0x44,0x44,0x0C,0x0C,0xB1,0x06,0x01,0x00,0x00, "Nikon",
"JAA134DA", "AF-S Nikkor 35mm f/1.4G"},
+ {0xB0,0x4C,0x50,0x50,0x14,0x14,0xB2,0x06,0x01,0x00,0x00, "Nikon",
"JAA015DA", "AF-S Nikkor 50mm f/1.8G"},
+ {0xB1,0x48,0x48,0x48,0x24,0x24,0xB3,0x06,0x01,0x00,0x00, "Nikon",
"JAA638DA", "AF-S DX Micro Nikkor 40mm f/2.8G"},
+ //B2 B5
++{0xB2,0x48,0x5C,0x80,0x30,0x30,0xB4,0x0E,0x01,0x00,0x00, "Nikon", "", "AF-S
Nikkor 70-200mm f/4G ED VR"},
+ {0xB3,0x4C,0x62,0x62,0x14,0x14,0xB5,0x06,0x01,0x00,0x00, "Nikon",
"JAA341DA", "AF-S Nikkor 85mm f/1.8G"},
+ {0xB4,0x40,0x37,0x62,0x2C,0x34,0xB6,0x0E,0x01,0x00,0x00, "Nikon", "", "AF-S
VR Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED"},
+ {0xB5,0x4C,0x3C,0x3C,0x14,0x14,0xB7,0x06,0x01,0x00,0x00, "Nikon", "", "AF-S
Nikkor 28mm f/1.8G"},
+ //
++{0x00,0x00,0x00,0x00,0x00,0x00,0xE1,0x12,0x00,0x00,0x00, "Nikon", "",
"TC-17E II"},
++{0x00,0x00,0x00,0x00,0x00,0x00,0xF1,0x0C,0x00,0x00,0x00, "Nikon", "",
"TC-14E II"},
++{0x00,0x00,0x00,0x00,0x00,0x00,0xF2,0x18,0x00,0x00,0x00, "Nikon", "",
"TC-20E II"},
+ {0x01,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00, "Nikon",
"JAA90701", "TC-16A"},
+ {0x01,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00, "Nikon",
"JAA90701", "TC-16A"},
+ //
+@@ -2112,6 +2117,9 @@
+ {0xA7,0x49,0x80,0xA0,0x24,0x24,0x4B,0x06,0x03,0x00,0x05, "Sigma", "", "APO
200-500mm F2.8 EX DG"},
+ {0x48,0x3C,0x8E,0xB0,0x3C,0x3C,0x4B,0x02,0x03,0x00,0x05, "Sigma", "595555",
"APO 300-800mm F5.6 EX DG HSM"},
+ //
++{0x00,0x00,0x00,0x00,0x00,0x00,0xF1,0x0C,0x00,0x00,0x05, "Sigma", "", "APO
Tele Converter 1.4x EX DG"},
++{0x00,0x00,0x00,0x00,0x00,0x00,0xF2,0x18,0x00,0x00,0x05, "Sigma", "", "APO
Tele Converter 2x EX DG"},
++//
+
//------------------------------------------------------------------------------
+ // Tamron lenses by focal length, first fixed then zoom lenses
+
//------------------------------------------------------------------------------
+@@ -2156,6 +2164,7 @@
+ //M "Tamron" "259D" "AF 28-70mm
F/3.5-4.5";
+ {0x33,0x54,0x3C,0x5E,0x24,0x24,0x62,0x02,0x00,0x00,0x02, "Tamron", "A09",
"SP AF 28-75mm F/2.8 XR Di LD Aspherical (IF) Macro"},
+ {0xFA,0x54,0x3C,0x5E,0x24,0x24,0x84,0x06,0x01,0x00,0x02, "Tamron",
"A09NII", "SP AF 28-75mm F/2.8 XR Di LD Aspherical (IF) Macro"},
++{0xFA,0x54,0x3C,0x5E,0x24,0x24,0xDF,0x06,0x01,0x00,0x02, "Tamron",
"A09NII", "SP AF 28-75mm F/2.8 XR Di LD Aspherical (IF) Macro"},
+ {0x10,0x3D,0x3C,0x60,0x2C,0x3C,0xD2,0x02,0x00,0x00,0x02, "Tamron", "177D",
"AF 28-80mm F/3.5-5.6 Aspherical"},
+ {0x45,0x3D,0x3C,0x60,0x2C,0x3C,0x48,0x02,0x00,0x00,0x02, "Tamron", "177D",
"AF 28-80mm F/3.5-5.6 Aspherical"},
+ {0x00,0x48,0x3C,0x6A,0x24,0x24,0x00,0x02,0x00,0x00,0x02, "Tamron", "176D",
"SP AF 28-105mm F/2.8 LD Aspherical IF"},
+@@ -2174,6 +2183,7 @@
+ //M "Tamron" "" "AF 35-135mm
F/3.5-4.5";
+ {0x00,0x47,0x53,0x80,0x30,0x3C,0x00,0x06,0x00,0x00,0x02, "Tamron", "A15",
"AF 55-200mm F/4-5.6 Di II LD"},
+ {0xF7,0x53,0x5C,0x80,0x24,0x24,0x84,0x06,0x01,0x00,0x02, "Tamron", "A001",
"SP AF 70-200mm F/2.8 Di LD (IF) Macro"},
++{0xF7,0x53,0x5C,0x80,0x24,0x24,0x40,0x06,0x01,0x00,0x02, "Tamron", "A001",
"SP AF 70-200mm F/2.8 Di LD (IF) Macro"},
+ {0xFE,0x53,0x5C,0x80,0x24,0x24,0x84,0x06,0x01,0x00,0x02, "Tamron", "A001",
"SP AF 70-200mm F/2.8 Di LD (IF) Macro"},
+ //M "Tamron" "67D" "SP AF
70-210mm f/2.8 LD";
+ //M "Tamron" "" "AF 70-210mm
F/3.5-4.5";
+@@ -2246,6 +2256,9 @@
+ //M "Tokina" "" "AF 130
EMZ II (AF 100-300mm f/5.6-6.7)"
+ //M "Tokina" "" "AF 140
EMZ (AF 100-400mm f/4.5-6.3)"
+ //
++{0x00,0x00,0x00,0x00,0x00,0x00,0xF1,0x0C,0x00,0x00,0x03, "Kenko", "",
"Teleplus PRO 300 DG 1.4x"},
++{0x00,0x00,0x00,0x00,0x00,0x00,0xF2,0x18,0x00,0x00,0x03, "Kenko", "",
"Teleplus PRO 300 DG 2.0x"},
++//
+
//------------------------------------------------------------------------------
+ // Lenses from various other brands
+
//------------------------------------------------------------------------------
diff --git a/graphics/exiv2/90_changeset_r3003.diff
b/graphics/exiv2/90_changeset_r3003.diff
new file mode 100644
index 0000000..09f5ecd
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r3003.diff
@@ -0,0 +1,291 @@
+Index: trunk/src/pentaxmn.cpp
+===================================================================
+--- trunk/src/pentaxmn.cpp (revision 3002)
++++ trunk/src/pentaxmn.cpp (revision 3003)
+@@ -665,55 +665,60 @@
+ //! LensType, combi-tag 0x003f (2 unsigned long)
+ extern const TagDetails pentaxLensType[] = {
+ { 0x0000, N_("M-42 or No Lens") },
+- { 0x0100, N_("K,M Lens") },
++ { 0x0100, N_("K or M Lens") },
+ { 0x0200, N_("A Series Lens") },
+- { 0x0300, "SIGMA" },
++ { 0x0300, "Sigma Lens" },
+ { 0x0311, "smc PENTAX-FA SOFT 85mm F2.8" },
+ { 0x0312, "smc PENTAX-F 1.7X AF ADAPTER" },
+ { 0x0313, "smc PENTAX-F 24-50mm F4" },
+ { 0x0314, "smc PENTAX-F 35-80mm F4-5.6" },
+ { 0x0315, "smc PENTAX-F 80-200mm F4.7-5.6" },
+ { 0x0316, "smc PENTAX-F FISH-EYE 17-28mm F3.5-4.5" },
+- { 0x0317, "smc PENTAX-F 100-300mm F4.5-5.6" }, //0
+- { 0x0317, "Sigma AF 28-300mm F3.5-5.6 DL IF" }, //1
+- { 0x0317, "Sigma AF 28-300mm F3.5-6.3 DG IF Macro" }, //2
++ { 0x0317, "smc PENTAX-F 100-300mm F4.5-5.6 or Sigma Lens" }, //0
++ { 0x0317, "Sigma AF 28-300mm F3.5-5.6 DL IF" },
//1
++ { 0x0317, "Sigma AF 28-300mm F3.5-6.3 DG IF Macro" }, //2
+ { 0x0318, "smc PENTAX-F 35-135mm F3.5-4.5" },
+- { 0x0319, "smc PENTAX-F 35-105mm F4-5.6 or SIGMA or Tokina" }, //0
+- { 0x0319, "Sigma AF 28-300mm F3.5-5.6 DL IF" }, //1
+- { 0x0319, "Sigma 55-200mm F4-5.6 DC" }, //2
+- { 0x0319, "Sigma AF 28-300mm F3.5-5.6 DL IF" }, //3
+- { 0x0319, "Sigma AF 28-300mm F3.5-6.3 DG IF Macro" }, //4
+- { 0x0319, "Tokina 80-200mm F2.8 ATX-Pro" }, //5
++ { 0x0319, "smc PENTAX-F 35-105mm F4-5.6 or Sigma or Tokina Lens"
},//0
++ { 0x0319, "Sigma AF 28-300mm F3.5-5.6 DL IF" },
//1
++ { 0x0319, "Sigma 55-200mm F4-5.6 DC" },
//2
++ { 0x0319, "Sigma AF 28-300mm F3.5-5.6 DL IF" },
//3
++ { 0x0319, "Sigma AF 28-300mm F3.5-6.3 DG IF Macro" }, //4
++ { 0x0319, "Tokina 80-200mm F2.8 ATX-Pro" }, //5
+ { 0x031a, "smc PENTAX-F* 250-600mm F5.6 ED[IF]" },
+- { 0x031b, "smc PENTAX-F 28-80mm F3.5-4.5" }, //0
+- { 0x031b, "Tokina AT-X Pro AF 28-70mm F2.6-2.8" }, //1
+- { 0x031c, "smc PENTAX-F 35-70mm F3.5-4.5 or Tokina Lens" }, //0
+- { 0x031c, "Tokina AT-X AF 400mm F5.6" },
//1
+- { 0x031d, "PENTAX-F 28-80mm F3.5-4.5 or SIGMA AF 18-125mm F3.5-5.6
DC" },
++ { 0x031b, "smc PENTAX-F 28-80mm F3.5-4.5 or Tokina Lens" }, //0
++ { 0x031b, "Tokina AT-X Pro AF 28-70mm F2.6-2.8" }, //1
++ { 0x031c, "smc PENTAX-F 35-70mm F3.5-4.5 or Tokina Lens" }, //0
++ { 0x031c, "Tokina 19-35mm F3.5-4.5 AF" }, //1
++ { 0x031c, "Tokina AT-X AF 400mm F5.6" }, //2
++ { 0x031d, "PENTAX-F 28-80mm F3.5-4.5 or Sigma or Tokina Lens" },//0
++ { 0x031d, "Sigma AF 18-125mm F3.5-5.6 DC" }, //1
++ { 0x031d, "Tokina AT-X PRO 28-70mm F2.6-2.8" },
//2
+ { 0x031e, "PENTAX-F 70-200mm F4-5.6" },
+- { 0x031f, "smc PENTAX-F 70-210mm F4-5.6 or Tokina or Takumar Lens"
}, //0
+- { 0x031f, "Tokina AF 730 75-300mm F4.5-5.6" },
//1
+- { 0x031f, "Tokina AF 730 75-300mm F4.5-5.6" },
//2
++ { 0x031f, "smc PENTAX-F 70-210mm F4-5.6 or Tokina or Takumar Lens"
},//0
++ { 0x031f, "Tokina AF 730 75-300mm F4.5-5.6" },
//1
++ { 0x031f, "Takumar-F 70-210mm F4-5.6" }, //2
+ { 0x0320, "smc PENTAX-F 50mm F1.4" },
+ { 0x0321, "smc PENTAX-F 50mm F1.7" },
+ { 0x0322, "smc PENTAX-F 135mm F2.8 [IF]" },
+ { 0x0323, "smc PENTAX-F 28mm F2.8" },
+- { 0x0324, "SIGMA 20mm F1.8 EX DG ASPHERICAL RF" },
++ { 0x0324, "Sigma 20mm F1.8 EX DG Aspherical RF" },
+ { 0x0326, "smc PENTAX-F* 300mm F4.5 ED[IF]" },
+ { 0x0327, "smc PENTAX-F* 600mm F4 ED[IF]" },
+- { 0x0328, "smc PENTAX-F MACRO 100mm F2.8" },
+- { 0x0329, "smc PENTAX-F MACRO 50mm F2.8 or Sigma 50mm F2,8 MACRO" },
+- { 0x032c, "Tamron 35-90mm F4 AF or various SIGMA models" }, // 0
+- { 0x032c, "Sigma 12-24mm F4.5 EX DG" }, // 1
+- { 0x032c, "Sigma 12-24mm F4.5 EX DG" }, // 2
+- { 0x032c, "Sigma 12-24mm F4.5 EX DG" }, // 3
+- { 0x032c, "Sigma 12-24mm F4.5 EX DG" }, // 4
+- { 0x032e, "SIGMA APO 70-200mm F2.8 EX" }, // 0
+- { 0x032e, "Sigma EX APO 100-300mm F4 IF" }, // 1
++ { 0x0328, "smc PENTAX-F Macro 100mm F2.8" },
++ { 0x0329, "smc PENTAX-F Macro 50mm F2.8 or Sigma Lens" }, //0
++ { 0x0329, "Sigma 50mm F2.8 Macro" }, //1
++ { 0x032c, "Tamron 35-90mm F4 AF or Sigma Lens" }, //0
++ { 0x032c, "Sigma AF 10-20mm F4-5.6 EX DC" }, //1
++ { 0x032c, "Sigma 12-24mm F4.5 EX DG" },
//2
++ { 0x032c, "Sigma 17-70mm F2.8-4.5 DC Macro" },
//3
++ { 0x032c, "Sigma 18-50mm F3.5-5.6 DC" }, //4
++ { 0x032e, "Sigma Lens" }, //0
++ { 0x032e, "Sigma APO 70-200mm F2.8 EX" }, //1
++ { 0x032e, "Sigma EX APO 100-300mm F4 IF" }, //2
+ { 0x0332, "smc PENTAX-FA 28-70mm F4 AL" },
+- { 0x0333, "SIGMA 28mm F1.8 EX DG ASPHERICAL MACRO" },
+- { 0x0334, "smc PENTAX-FA 28-200mm F3.8-5.6 AL[IF]" }, // 0
+- { 0x0334, "Tamron AF LD 28-200mm F3.8-5.6 [IF] Aspherical (171D)"
}, // 1
++ { 0x0333, "Sigma 28mm F1.8 EX DG Aspherical Macro" },
++ { 0x0334, "smc PENTAX-FA 28-200mm F3.8-5.6 AL[IF] or Tamron Lens"
},//0
++ { 0x0334, "Tamron AF LD 28-200mm F3.8-5.6 [IF] Aspherical (171D)"
},//1
+ { 0x0335, "smc PENTAX-FA 28-80mm F3.5-5.6 AL" },
+ { 0x03f7, "smc PENTAX-DA FISH-EYE 10-17mm F3.5-4.5 ED[IF]" },
+ { 0x03f8, "smc PENTAX-DA 12-24mm F4 ED AL[IF]" },
+@@ -722,63 +727,69 @@
+ { 0x03fc, "smc PENTAX-DA 18-55mm F3.5-5.6 AL" },
+ { 0x03fd, "smc PENTAX-DA 14mm F2.8 ED[IF]" },
+ { 0x03fe, "smc PENTAX-DA 16-45mm F4 ED AL" },
+- { 0x03ff, "SIGMA" }, // 0
+- { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 1
+- { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 2
+- { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 3
+- { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 4
+- { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 5
+- { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 6
+- { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 7
+- { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 8
+- { 0x03ff, "Sigma 18-50mm F2.8 EX DC" }, // 9
++ { 0x03ff, "Sigma Lens" }, //0
++ { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, //1
++ { 0x03ff, "Sigma DL-II 35-80mm F4-5.6" }, //2
++ { 0x03ff, "Sigma DL Zoom 75-300mm F4-5.6" }, //3
++ { 0x03ff, "Sigma DF EX Aspherical 28-70mm F2.8" }, //4
++ { 0x03ff, "Sigma AF Tele 400mm F5.6 Multi-coated" }, //5
++ { 0x03ff, "Sigma 24-60mm F2.8 EX DG" },
//6
++ { 0x03ff, "Sigma 70-300mm F4-5.6 Macro" }, //7
++ { 0x03ff, "Sigma 55-200mm F4-5.6 DC" },
//8
++ { 0x03ff, "Sigma 18-50mm F2.8 EX DC" },
//9
++ { 0x03ff, "Sigma 18-50mm F2.8 EX DC Macro" }, //10
+ { 0x0401, "smc PENTAX-FA SOFT 28mm F2.8" },
+ { 0x0402, "smc PENTAX-FA 80-320mm F4.5-5.6" },
+ { 0x0403, "smc PENTAX-FA 43mm F1.9 Limited" },
+ { 0x0406, "smc PENTAX-FA 35-80mm F4-5.6" },
+ { 0x040c, "smc PENTAX-FA 50mm F1.4" },
+ { 0x040f, "smc PENTAX-FA 28-105mm F4-5.6 [IF]" },
+- { 0x0410, "TAMRON AF 80-210mm F4-5.6 (178D)" },
+- { 0x0413, "TAMRON SP AF 90mm F2.8 (172E)" },
++ { 0x0410, "Tamron AF 80-210mm F4-5.6 (178D)" },
++ { 0x0413, "Tamron SP AF 90mm F2.8 (172E)" },
+ { 0x0414, "smc PENTAX-FA 28-80mm F3.5-5.6" },
+ { 0x0415, "Cosina AF 100-300mm F5.6-6.7" },
+- { 0x0416, "TOKINA 28-80mm F3.5-5.6" },
++ { 0x0416, "Tokina 28-80mm F3.5-5.6" },
+ { 0x0417, "smc PENTAX-FA 20-35mm F4 AL" },
+ { 0x0418, "smc PENTAX-FA 77mm F1.8 Limited" },
+- { 0x0419, "TAMRON SP AF 14mm F2.8" },
+- { 0x041a, "smc PENTAX-FA MACRO 100mm F3.5 or Cosina lens" }, //0
+- { 0x041a, "Cosina 100mm F3.5 Macro" }, //1
+- { 0x041b, "TAMRON AF28-300mm F/3.5-6.3 LD Aspherical[IF] MACRO
(285D)" },
++ { 0x0419, "Tamron SP AF 14mm F2.8" },
++ { 0x041a, "smc PENTAX-FA Macro 100mm F3.5 or Cosina lens" }, //0
++ { 0x041a, "Cosina 100mm F3.5 Macro" },
//1
++ { 0x041b, "Tamron AF28-300mm F/3.5-6.3 LD Aspherical[IF] Macro
(185D/285D)" },
+ { 0x041c, "smc PENTAX-FA 35mm F2 AL" },
+- { 0x041d, "TAMRON AF 28-200mm F/3.8-5.6 LD Super II MACRO (371D)" },
++ { 0x041d, "Tamron AF 28-200mm F/3.8-5.6 LD Super II Macro (371D)" },
+ { 0x0422, "smc PENTAX-FA 24-90mm F3.5-4.5 AL[IF]" },
+ { 0x0423, "smc PENTAX-FA 100-300mm F4.7-5.8" },
+- { 0x0424, "TAMRON AF70-300mm F/4-5.6 LD MACRO" },
+- { 0x0425, "TAMRON SP AF 24-135mm F3.5-5.6 AD AL (190D)" },
++ { 0x0424, "Tamron AF70-300mm F/4-5.6 LD Macro (572D/A17)" },
++ { 0x0425, "Tamron SP AF 24-135mm F3.5-5.6 AD AL (190D)" },
+ { 0x0426, "smc PENTAX-FA 28-105mm F3.2-4.5 AL[IF]" },
+ { 0x0427, "smc PENTAX-FA 31mm F1.8AL Limited" },
+- { 0x0429, "TAMRON AF 28-200mm Super Zoom F3.8-5.6 Aspherical XR
[IF] MACRO (A03)" },
++ { 0x0429, "Tamron AF 28-200mm Super Zoom F3.8-5.6 Aspherical XR
[IF] Macro (A03)" },
+ { 0x042b, "smc PENTAX-FA 28-90mm F3.5-5.6" },
+ { 0x042c, "smc PENTAX-FA J 75-300mm F4.5-5.8 AL" },
+- { 0x042d, "TAMRON 28-300mm F3.5-6.3 Ultra zoom XR or Tamron AF
28-300mm F3.5-6.3 XR Di LD Aspherical [IF] Macro" }, //0
++ { 0x042d, "Tamron Lens" }, //0
++ { 0x042d, "Tamron 28-300mm F3.5-6.3 Ultra zoom XR" }, //1
++ { 0x042d, "Tamron AF 28-300mm F3.5-6.3 XR Di LD Aspherical [IF]
Macro" },//2
+ { 0x042e, "smc PENTAX-FA J 28-80mm F3.5-5.6 AL" },
+ { 0x042f, "smc PENTAX-FA J 18-35mm F4-5.6 AL" },
+- { 0x0431, "TAMRON SP AF 28-75mm F2.8 XR Di (A09)" },
+- { 0x0433, "smc PENTAX-D FA 50mm F2.8 MACRO" },
+- { 0x0434, "smc PENTAX-D FA 100mm F2.8 MACRO" },
++ { 0x0431, "Tamron SP AF 28-75mm F2.8 XR Di (A09)" },
++ { 0x0433, "smc PENTAX-D FA 50mm F2.8 Macro" },
++ { 0x0434, "smc PENTAX-D FA 100mm F2.8 Macro" },
++ { 0x0438, "Samsung D-XENON 100mm F2.8 Macro" },
+ { 0x044b, "Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)" },
++ { 0x04d6, "smc PENTAX-DA 35mm F2.4 AL" },
+ { 0x04e5, "smc PENTAX-DA 18-55mm F3.5-5.6 AL II" },
+ { 0x04e6, "Tamron SP AF 17-50mm F2.8 XR Di II" },
+ { 0x04e7, "smc PENTAX-DA 18-250mm F3.5-6.3 ED AL [IF]" },
+ { 0x04ed, "Samsung/Schneider D-XENOGON 10-17mm F3.5-4.5" },
+ { 0x04ef, "Samsung D-XENON 12-24mm F4 ED AL [IF]" },
++ { 0x04f2, "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM (SDM unused)"
},
+ { 0x04f3, "smc PENTAX-DA 70mm F2.4 Limited" },
+ { 0x04f4, "smc PENTAX-DA 21mm F3.2 AL Limited" },
+ { 0x04f5, "Schneider D-XENON 50-200mm" },
+ { 0x04f6, "Schneider D-XENON 18-55mm" },
+- { 0x04f7, "smc PENTAX-DA 10-17mm F3.5-4.5 ED [IF] Fisheye zoom" },
++ { 0x04f7, "smc PENTAX-DA FISH-EYE 10-17mm F3.5-4.5 ED [IF]" },
+ { 0x04f8, "smc PENTAX-DA 12-24mm F4 ED AL [IF]" },
+- { 0x04f9, "TAMRON XR DiII 18-200mm F3.5-6.3 (A14)" },
++ { 0x04f9, "Tamron XR DiII 18-200mm F3.5-6.3 (A14)" },
+ { 0x04fa, "smc PENTAX-DA 50-200mm F4-5.6 ED" },
+ { 0x04fb, "smc PENTAX-DA 40mm F2.8 Limited" },
+ { 0x04fc, "smc PENTAX-DA 18-55mm F3.5-5.6 AL" },
+@@ -791,8 +802,8 @@
+ { 0x0505, "smc PENTAX-FA* 600mm F4 ED[IF]" },
+ { 0x0506, "smc PENTAX-FA* 300mm F4.5 ED[IF]" },
+ { 0x0507, "smc PENTAX-FA 135mm F2.8 [IF]" },
+- { 0x0508, "smc PENTAX-FA MACRO 50mm F2.8" },
+- { 0x0509, "smc PENTAX-FA MACRO 100mm F2.8" },
++ { 0x0508, "smc PENTAX-FA Macro 50mm F2.8" },
++ { 0x0509, "smc PENTAX-FA Macro 100mm F2.8" },
+ { 0x050a, "smc PENTAX-FA* 85mm F1.4 [IF]" },
+ { 0x050b, "smc PENTAX-FA* 200mm F2.8 ED[IF]" },
+ { 0x050c, "smc PENTAX-FA 28-80mm F3.5-4.7" },
+@@ -812,11 +823,11 @@
+ { 0x0609, "smc PENTAX-FA 20mm F2.8" },
+ { 0x060a, "smc PENTAX-FA* 400mm F5.6 ED[IF]" },
+ { 0x060d, "smc PENTAX-FA* 400mm F5.6 ED[IF]" },
+- { 0x060e, "smc PENTAX-FA* MACRO 200mm F4 ED[IF]" },
++ { 0x060e, "smc PENTAX-FA* Macro 200mm F4 ED[IF]" },
+ { 0x0700, "smc PENTAX-DA 21mm F3.2 AL Limited" },
+ { 0x073a, "smc PENTAX-D FA Macro 100mm F2.8 WR" },
+ { 0x074b, "Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)" },
+- { 0x07d4, "smc Pentax-DA 50mm F1.8" },
++ { 0x07d4, "smc PENTAX-DA 50mm F1.8" },
+ { 0x07d5, "smc PENTAX-DA 40mm F2.8 XS" },
+ { 0x07d6, "smc PENTAX-DA 35mm F2.4 AL" },
+ { 0x07d8, "smc PENTAX-DA L 55-300mm F4-5.8 ED" },
+@@ -829,7 +840,7 @@
+ { 0x07e0, "smc PENTAX-DA 15mm F4 ED AL Limited" },
+ { 0x07e1, "Samsung D-XENON 18-250mm F3.5-6.3" },
+ { 0x07e2, "smc PENTAX-DA* 55mm F1.4 SDM (SDM unused)" },
+- { 0x07e3, "smc PENTAX-DA* 55mm F1.4 SDM (SDM unused)" },
++ { 0x07e3, "smc PENTAX-DA* 60-250mm F4 [IF] SDM (SDM unused)" },
+ { 0x07e5, "smc PENTAX-DA 18-55mm F3.5-5.6 AL II" },
+ { 0x07e6, "Tamron AF 17-50mm F2.8 XR Di-II LD (Model A16)" },
+ { 0x07e7, "smc PENTAX-DA 18-250mm F3.5-6.3ED AL [IF]" },
+@@ -837,13 +848,13 @@
+ { 0x07ea, "smc PENTAX-DA* 300 mm F4ED [IF] SDM (SDM not used)" },
+ { 0x07eb, "smc PENTAX-DA* 200mm F2.8 ED [IF] SDM (SDM not used)" },
+ { 0x07ec, "smc PENTAX-DA 55-300mm F4-5.8 ED" },
+- { 0x07ee, "TAMRON AF 18-250mm F3.5-6.3 Di II LD Aspherical [IF]
MACRO" },
++ { 0x07ee, "Tamron AF 18-250mm F3.5-6.3 Di II LD Aspherical [IF]
Macro" },
+ { 0x07f1, "smc PENTAX-DA* 50-135mm F2.8 ED [IF] SDM (SDM not used)"
},
+ { 0x07f2, "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM (SDM not
used)" },
+ { 0x07f3, "smc PENTAX-DA 70mm F2.4 Limited" },
+ { 0x07f4, "smc PENTAX-DA 21mm F3.2 AL Limited" },
+ { 0x0804, "Sigma 50mm F1.4 EX DG HSM" },
+- { 0x0808, "SIGMA 18-250mm F3.5-6.3 DC OS HSM" },
++ { 0x0808, "Sigma 18-250mm F3.5-6.3 DC OS HSM" },
+ { 0x080b, "Sigma 10-20mm F3.5 EX DC HSM" },
+ { 0x080c, "Sigma 70-300mm F4-5.6 DG OS" },
+ { 0x080d, "Sigma 120-400mm F4.5-5.6 APO DG OS HSM" },
+@@ -856,7 +867,7 @@
+ { 0x0816, "Sigma 85mm F1.4 EX DG HSM" },
+ { 0x0817, "Sigma 70-200mm F2.8 APO EX DG OS HSM" },
+ { 0x081b, "Sigma 18-200mm F3.5-6.3 II DC HSM" },
+- { 0x08d2, "smc Pentax-DA 18-270mm F3.5-6.3 ED SDM" },
++ { 0x08d2, "smc PENTAX-DA 18-270mm F3.5-6.3 ED SDM" },
+ { 0x08d7, "smc PENTAX-DA 18-135mm F3.5-5.6 ED AL [IF] DC WR" },
+ { 0x08e2, "smc PENTAX-DA* 55mm F1.4 SDM" },
+ { 0x08e3, "smc PENTAX DA* 60-250mm F4 [IF] SDM"},
+@@ -865,19 +876,27 @@
+ { 0x08eb, "smc PENTAX-DA* 200mm F2.8 ED [IF] SDM" },
+ { 0x08f1, "smc PENTAX-DA* 50-135mm F2.8 ED [IF] SDM" },
+ { 0x08f2, "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM" },
+- { 0x08ff, "Sigma lens" }, //0
+- { 0x08ff, "Sigma 70-200mm F2.8 EX DG Macro HSM II" }, //1
+- { 0x08ff, "Sigma 70-200mm F2.8 EX DG Macro HSM II" }, //2
+- { 0x08ff, "Sigma 70-200mm F2.8 EX DG Macro HSM II" }, //3
+- { 0x08ff, "Sigma 70-200mm F2.8 EX DG Macro HSM II" }, //4
+- { 0x0900, "645 Manual lens" }, //1
+- { 0x0a00, "645 A Series lens" }, //1
+- { 0x0b04, "smc PENTAX-FA645 Zoom 45mm-85mm F4.5" },
+- { 0x0b07, "smc PENTAX-FA645 Macro 120mm F4" },
++ { 0x08ff, "Sigma Lens" }, //0
++ { 0x08ff, "Sigma 70-200mm F2.8 EX DG Macro HSM II" }, //1
++ { 0x08ff, "Sigma APO 150-500mm F5-6.3 DG OS HSM" }, //2
++ { 0x08ff, "Sigma 50-150mm F2.8 II APO EX DC HSM" }, //3
++ { 0x08ff, "Sigma 4.5mm F2.8 EX DC HSM Circular Fisheye" }, //4
++ { 0x08ff, "Sigma 50-200mm F4-5.6 DC OS" }, //5
++ { 0x0900, "645 Manual Lens" },
++ { 0x0a00, "645 A Series Lens" },
++ { 0x0b01, "smc PENTAX-FA 645 75mm F2.8" },
++ { 0x0b02, "smc PENTAX-FA 645 45mm F2.8" },
++ { 0x0b03, "smc PENTAX-FA* 645 300mm F4 ED [IF]" },
++ { 0x0b04, "smc PENTAX-FA 645 45mm-85mm F4.5" },
++ { 0x0b05, "smc PENTAX-FA 645 400mm F5.6 ED [IF]" },
++ { 0x0b07, "smc PENTAX-FA 645 Macro 120mm F4" },
+ { 0x0b08, "smc PENTAX-FA 645 80-160mm F4.5" },
++ { 0x0b09, "smc PENTAX-FA 645 200mm F4 [IF]" },
++ { 0x0b0a, "smc PENTAX-FA 645 150mm F2.8 [IF]" },
+ { 0x0b0b, "smc PENTAX-FA 645 35mm F3.5 AL [IF]" },
++ { 0x0b0e, "smc PENTAX-FA 645 55-110mm F5.6" },
+ { 0x0b10, "smc PENTAX-FA 645 33-55mm F4.5 AL" },
+- { 0x0b11, "smc PENTAX-FA645 Zoom 150mm-300mm F5.6 ED [IF]" },
++ { 0x0b11, "smc PENTAX-FA 645 150mm-300mm F5.6 ED [IF]" },
+ { 0x0d12, "smc PENTAX-D FA 645 55mm F2.8 AL [IF] SDM AW" },
+ { 0x0d13, "smc PENTAX-D FA 645 25mm F4 AL [IF] SDM AW" },
+ { 0x1500, "Pentax Q Manual Lens" },
diff --git a/graphics/exiv2/90_changeset_r3004.diff
b/graphics/exiv2/90_changeset_r3004.diff
new file mode 100644
index 0000000..2e2d5bf
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r3004.diff
@@ -0,0 +1,180 @@
+Index: trunk/src/canonmn.cpp
+===================================================================
+--- trunk/src/canonmn.cpp (revision 3003)
++++ trunk/src/canonmn.cpp (revision 3004)
+@@ -438,12 +438,12 @@
+ { 6, "Tokina AF193-2 19-35mm f/3.5-4.5"
}, // 3
+ { 6, "Sigma 28-80mm f/3.5-5.6 II Macro"
}, // 4
+ { 7, "Canon EF 100-300mm f/5.6L"
},
+- { 8, "Canon EF 100-300mm f/5.6"
}, // 0
+- { 8, "Sigma 70-300mm f/4-5.6 DG Macro"
}, // 1
+- { 8, "Tokina AT-X242AF 24-200mm f/3.5-5.6"
}, // 2
+- { 9, "Canon EF 70-210mm f/4"
}, // 0
++ { 8, "Canon EF 100-300mm f/5.6 or Sigma or Tokina Lens"
}, // 0
++ { 8, "Sigma 70-300mm f/4-5.6 [APO] DG Macro"
}, // 1
++ { 8, "Tokina AT-X 242 AF 24-200mm f/3.5-5.6"
}, // 2
++ { 9, "Canon EF 70-210mm f/4 or Sigma Lens"
}, // 0
+ { 9, "Sigma 55-200mm f/4-5.6 DC"
}, // 1
+- { 10, "Canon EF 50mm f/2.5 Macro"
}, // 0
++ { 10, "Canon EF 50mm f/2.5 Macro or Sigma Lens"
}, // 0
+ { 10, "Sigma 50mm f/2.8 EX"
}, // 1
+ { 10, "Sigma 28mm f/1.8"
}, // 2
+ { 10, "Sigma 105mm f/2.8 Macro EX"
}, // 3
+@@ -457,38 +457,38 @@
+ { 18, "Canon EF 28-70mm f/3.5-4.5"
},
+ { 20, "Canon EF 100-200mm f/4.5A"
},
+ { 21, "Canon EF 80-200mm f/2.8L"
},
+- { 22, "Canon EF 20-35mm f/2.8L"
}, // 0
+- { 22, "Tokina AT-X280AF PRO 28-80mm f/2.8 Aspherical"
}, // 1
++ { 22, "Canon EF 20-35mm f/2.8L or Tokina Lens"
}, // 0
++ { 22, "Tokina AT-X 280 AF PRO 28-80mm f/2.8 Aspherical"
}, // 1
+ { 23, "Canon EF 35-105mm f/3.5-4.5"
},
+ { 24, "Canon EF 35-80mm f/4-5.6 Power Zoom"
},
+ { 25, "Canon EF 35-80mm f/4-5.6 Power Zoom"
},
+- { 26, "Canon EF 100mm f/2.8 Macro or Cosina or Tamron Lens"
}, // 0
++ { 26, "Canon EF 100mm f/2.8 Macro or Cosina or Tamron or Carl
Zeiss Lens" }, // 0
+ { 26, "Cosina 100mm f/3.5 Macro AF"
}, // 1
+ { 26, "Tamron SP AF 90mm f/2.8 Di Macro"
}, // 2
+ { 26, "Tamron SP AF 180mm f/3.5 Di Macro"
}, // 3
+ { 26, "Carl Zeiss Planar T* 50mm f/1.4"
}, // 4
+ { 27, "Canon EF 35-80mm f/4-5.6"
},
+- { 28, "Canon EF 80-200mm f/4.5-5.6"
}, // 0
++ { 28, "Canon EF 80-200mm f/4.5-5.6 or Tamron Lens"
}, // 0
+ { 28, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF"
}, // 1
+ { 28, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro"
}, // 2
+ { 28, "Tamron AF 70-300mm f/4.5-5.6 Di LD 1:2 Macro Zoom"
}, // 3
+ { 28, "Tamron AF Aspherical 28-200mm f/3.8-5.6"
}, // 4
+ { 29, "Canon EF 50mm f/1.8 MkII"
},
+ { 30, "Canon EF 35-105mm f/4.5-5.6"
},
+- { 31, "Canon EF 75-300mm f/4-5.6"
}, // 0
++ { 31, "Canon EF 75-300mm f/4-5.6 or Tamron Lens"
}, // 0
+ { 31, "Tamron SP AF 300mm f/2.8 LD IF"
}, // 1
+- { 32, "Canon EF 24mm f/2.8"
}, // 0
++ { 32, "Canon EF 24mm f/2.8 or Sigma Lens"
}, // 0
+ { 32, "Sigma 15mm f/2.8 EX Fisheye"
}, // 1
+- { 33, "Voigtlander or Zeiss Lens"
}, // 0
++ { 33, "Voigtlander or Carl Zeiss Lens"
}, // 0
+ { 33, "Voigtlander Ultron 40mm f/2 SLII Aspherical"
}, // 1
+- { 33, "Zeiss Distagon 15mm T* f/2.8 ZE"
}, // 2
+- { 33, "Zeiss Distagon 18mm T* f/3.5 ZE"
}, // 3
+- { 33, "Zeiss Distagon 21mm T* f/2.8 ZE"
}, // 4
+- { 33, "Zeiss Distagon 28mm T* f/2 ZE"
}, // 5
+- { 33, "Zeiss Distagon 35mm T* f/2 ZE"
}, // 6
++ { 33, "Carl Zeiss Distagon 15mm T* f/2.8 ZE"
}, // 2
++ { 33, "Carl Zeiss Distagon 18mm T* f/3.5 ZE"
}, // 3
++ { 33, "Carl Zeiss Distagon 21mm T* f/2.8 ZE"
}, // 4
++ { 33, "Carl Zeiss Distagon 28mm T* f/2 ZE"
}, // 5
++ { 33, "Carl Zeiss Distagon 35mm T* f/2 ZE"
}, // 6
+ { 35, "Canon EF 35-80mm f/4-5.6"
},
+ { 36, "Canon EF 38-76mm f/4.5-5.6"
},
+- { 37, "Canon EF 35-80mm f/4-5.6"
}, // 0
++ { 37, "Canon EF 35-80mm f/4-5.6 or Tamron Lens"
}, // 0
+ { 37, "Tamron 70-200mm f/2.8 Di LD IF Macro"
}, // 1
+ { 37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF]
Macro Model A20" }, // 2
+ { 37, "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF] "
}, // 3
+@@ -497,7 +497,7 @@
+ { 39, "Canon EF 75-300mm f/4-5.6"
},
+ { 40, "Canon EF 28-80mm f/3.5-5.6"
},
+ { 41, "Canon EF 28-90mm f/4-5.6"
},
+- { 42, "Canon EF 28-200mm f/3.5-5.6"
}, // 0
++ { 42, "Canon EF 28-200mm f/3.5-5.6 or Tamron Lens"
}, // 0
+ { 42, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF]
Macro Model A20" }, // 1
+ { 43, "Canon EF 28-105mm f/4-5.6"
},
+ { 44, "Canon EF 90-300mm f/4.5-5.6"
},
+@@ -517,7 +517,7 @@
+ { 127, "Canon TS-E 90mm f/2.8"
},
+ { 129, "Canon EF 300mm f/2.8L"
},
+ { 130, "Canon EF 50mm f/1.0L"
},
+- { 131, "Canon EF 28-80mm f/2.8-4L"
}, // 0
++ { 131, "Canon EF 28-80mm f/2.8-4L or Sigma Lens"
}, // 0
+ { 131, "Sigma 8mm f/3.5 EX DG Circular Fisheye"
}, // 1
+ { 131, "Sigma 17-35mm f/2.8-4 EX DG Aspherical HSM"
}, // 2
+ { 131, "Sigma 17-70mm f/2.8-4.5 DC Macro"
}, // 3
+@@ -529,7 +529,7 @@
+ { 134, "Canon EF 600mm f/4L IS"
},
+ { 135, "Canon EF 200mm f/1.8L"
},
+ { 136, "Canon EF 300mm f/2.8L"
},
+- { 137, "Canon EF 85mm f/1.2L"
}, // 0
++ { 137, "Canon EF 85mm f/1.2L or Sigma or Tamron Lens"
}, // 0
+ { 137, "Sigma 18-50mm f/2.8-4.5 DC OS HSM"
}, // 1
+ { 137, "Sigma 50-200mm f/4-5.6 DC OS HSM"
}, // 2
+ { 137, "Sigma 18-250mm f/3.5-6.3 DC OS HSM"
}, // 3
+@@ -539,11 +539,12 @@
+ { 137, "Sigma 17-50mm f/2.8 OS HSM"
}, // 7
+ { 137, "Sigma 18-200mm f/3.5-6.3 II DC OS HSM"
}, // 8
+ { 137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD"
}, // 9
+- { 137, "Sigma 12-24mm f/4.5-5.6 DG HSM II"
}, // 10
++ { 137, "Sigma 8-16mm f/4.5-5.6 DC HSM"
}, // 10
+ { 137, "Tamron SP 17-50mm f/2.8 XR Di II VC"
}, // 11
+ { 137, "Tamron SP 60mm f/2 Macro Di II"
}, // 12
+ { 137, "Sigma 10-20mm f/3.5 EX DC HSM"
}, // 13
+ { 137, "Tamron SP 24-70mm f/2.8 Di VC USD"
}, // 14
++ { 137, "Sigma 12-24mm f/4.5-5.6 DG HSM II"
}, // 15
+ { 138, "Canon EF 28-80mm f/2.8-4L"
},
+ { 139, "Canon EF 400mm f/2.8L"
},
+ { 140, "Canon EF 500mm f/4.5L"
},
+@@ -556,31 +557,31 @@
+ { 147, "Canon EF 35-135mm f/4-5.6 USM"
},
+ { 148, "Canon EF 28-80mm f/3.5-5.6 USM"
},
+ { 149, "Canon EF 100mm f/2 USM"
},
+- { 150, "Canon EF 14mm f/2.8L"
}, // 0
++ { 150, "Canon EF 14mm f/2.8L or Sigma Lens"
}, // 0
+ { 150, "Sigma 20mm EX f/1.8"
}, // 1
+ { 150, "Sigma 30mm f/1.4 DC HSM"
}, // 2
+ { 150, "Sigma 24mm f/1.8 DG Macro EX"
}, // 3
+ { 151, "Canon EF 200mm f/2.8L"
},
+- { 152, "Canon EF 300mm f/4L IS"
}, // 0
++ { 152, "Canon EF 300mm f/4L IS or Sigma Lens"
}, // 0
+ { 152, "Sigma 12-24mm f/4.5-5.6 EX DG ASPHERICAL HSM"
}, // 1
+ { 152, "Sigma 14mm f/2.8 EX Aspherical HSM"
}, // 2
+ { 152, "Sigma 10-20mm f/4-5.6"
}, // 3
+ { 152, "Sigma 100-300mm f/4"
}, // 4
+- { 153, "Canon EF 35-350mm f/3.5-5.6L"
}, // 0
++ { 153, "Canon EF 35-350mm f/3.5-5.6L or Sigma og Tamron Lens"
}, // 0
+ { 153, "Sigma 50-500mm f/4-6.3 APO HSM EX"
}, // 1
+ { 153, "Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical [IF] Macro"
}, // 2
+ { 153, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF]
Macro Model A14" }, // 3
+ { 153, "Tamron 18-250mm f/3.5-6.3 Di II LD Aspherical [IF] Macro"
}, // 4
+ { 154, "Canon EF 20mm f/2.8 USM"
},
+ { 155, "Canon EF 85mm f/1.8 USM"
},
+- { 156, "Canon EF 28-105mm f/3.5-4.5 USM"
}, // 0
++ { 156, "Canon EF 28-105mm f/3.5-4.5 USM or Tamron Lens"
}, // 0
+ { 156, "Tamron SP AF 70-300mm F4-5.6 Di VC USD"
}, // 1
+- { 160, "Canon EF 20-35mm f/3.5-4.5 USM"
}, // 0
++ { 160, "Canon EF 20-35mm f/3.5-4.5 USM or Tamron or Tokina Lens"
}, // 0
+ { 160, "Tamron AF 19-35mm f/3.5-4.5"
}, // 1
+ { 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
+- { 161, "Canon EF 28-70mm f/2.8L"
}, // 0
++ { 161, "Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens"
}, // 0
+ { 161, "Sigma 24-70mm EX f/2.8"
}, // 1
+ { 161, "Sigma 28-70mm f/2.8 EX"
}, // 2
+ { 161, "Tamron AF 17-50mm f/2.8 Di-II LD Aspherical"
}, // 3
+@@ -593,7 +594,7 @@
+ { 166, "Canon EF 70-200mm f/2.8 L + 1.4x"
},
+ { 167, "Canon EF 70-200mm f/2.8 L + 2x"
},
+ { 168, "Canon EF 28mm f/1.8 USM"
},
+- { 169, "Canon EF 17-35mm f/2.8L"
}, // 0
++ { 169, "Canon EF 17-35mm f/2.8L or Sigma Lens"
}, // 0
+ { 169, "Sigma 18-200mm f/3.5-6.3 DC OS"
}, // 1
+ { 169, "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"
}, // 2
+ { 169, "Sigma 18-50mm f/2.8 Macro"
}, // 3
+@@ -607,7 +608,7 @@
+ { 173, "Canon EF 180mm Macro f/3.5L or Sigma Lens"
}, // 0
+ { 173, "Sigma 180mm EX HSM Macro f/3.5"
}, // 1
+ { 173, "Sigma APO Macro 150mm f/3.5 EX DG IF HSM"
}, // 2
+- { 174, "Canon EF 135mm f/2L"
}, // 0
++ { 174, "Canon EF 135mm f/2L or Sigma Lens"
}, // 0
+ { 174, "Sigma 70-200mm f/2.8 EX DG APO OS HSM"
}, // 1
+ { 174, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM"
}, // 2
+ { 175, "Canon EF 400mm f/2.8L"
},
+@@ -618,7 +619,7 @@
+ { 180, "Canon EF 35mm f/1.4L"
},
+ { 181, "Canon EF 100-400mm f/4.5-5.6L IS + 1.4x"
},
+ { 182, "Canon EF 100-400mm f/4.5-5.6L IS + 2x"
},
+- { 183, "Canon EF 100-400mm f/4.5-5.6L IS"
}, // 0
++ { 183, "Canon EF 100-400mm f/4.5-5.6L IS or Sigma Lens"
}, // 0
+ { 183, "Sigma 150mm f/2.8 EX DG OS HSM APO Macro"
}, // 1
+ { 184, "Canon EF 400mm f/2.8L + 2x"
},
+ { 185, "Canon EF 600mm f/4L IS"
},
diff --git a/graphics/exiv2/90_changeset_r3005.diff
b/graphics/exiv2/90_changeset_r3005.diff
new file mode 100644
index 0000000..0c44609
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r3005.diff
@@ -0,0 +1,113 @@
+Index: trunk/src/minoltamn.cpp
+===================================================================
+--- trunk/src/minoltamn.cpp (revision 3004)
++++ trunk/src/minoltamn.cpp (revision 3005)
+@@ -1637,7 +1637,6 @@
+ "Sigma 17-70mm F2.8-4.5 (D) | "
+ "Sigma 20-40mm F2.8 EX DG Aspherical IF | "
+ "Sigma 18-200mm F3.5-6.3 DC | "
+- "Sigma 20-40mm F2.8 EX DG Aspherical IF | "
+ "Sigma DC 18-125mm F4-5,6 D | "
+ "Tamron SP AF 28-75mm F2.8 XR Di (IF) Macro" },
+ { 25, "Minolta AF 100-300mm F4.5-5.6 APO (D) | "
+@@ -1656,10 +1655,10 @@
+ "Sigma AF 12-24mm F4.5-5.6 EX DG | "
+ "Sigma 28-70mm EX DG F2.8 | "
+ "Sigma 55-200mm F4-5.6 DC" },
+- { 31, "Minolta AF 50mm F2.8 Macro(D) | "
+- "Minolta AF 50mm F3.5 Macro" },
+- { 32, "Minolta AF 100-400mm F4.5-6.7(D) | "
+- "Minolta AF 300mm F2.8G APO(D) SSM" },
++ { 31, "Minolta/Sony AF 50mm F2.8 Macro (D) | "
++ "Minolta/Sony AF 50mm F3.5 Macro" },
++ { 32, "Minolta AF 100-400mm F4.5-6.7 (D) | "
++ "Minolta/Sony AF 300mm F2.8G APO (D) SSM" },
+ { 33, "Minolta/Sony AF 70-200mm F2.8 G" },
+ { 35, "Minolta AF 85mm F1.4 G (D) Limited" },
+ { 36, "Minolta AF 28-100mm F3.5-5.6 (D)" },
+@@ -1725,6 +1724,7 @@
+ { 142, "Voigtlander 70-300mm F4.5-5.6" },
+ { 146, "Voigtlander Macro APO-Lanthar 125mm F2.5 SL" },
+ { 193, "Minolta AF 1.4x APO II" },
++ { 194, "Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical [IF]" },
+ { 255, "Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical | "
+ "Tamron AF 18-250mm F3.5-6.3 XR Di II LD | "
+ "Tamron AF 55-200mm F4-5.6 Di II | "
+@@ -1735,7 +1735,7 @@
+ "Tamron SP AF 28-75mm F2.8 XR Di LD Aspherical IF" },
+ { 25500, "Minolta AF 50mm F1.7" },
+ { 25501, "Minolta AF 50mm F1.7" },
+- { 25510, "Minolta AF 35-70mm F1.4" },
++ { 25510, "Minolta AF 35-70mm F4" },
+ { 25511, "Minolta AF 35-70mm F4 | "
+ "Sigma UC AF 28-70mm F3.5-4.5 | "
+ "Sigma AF 28-70mm F2.8 | "
+@@ -1812,6 +1812,7 @@
+ "Sigma AF 90mm F2.8 Macro | "
+ "Sigma AF 105mm F2.8 EX [DG] Macro | "
+ "Sigma 180mm F5.6 Macro | "
++ "Sigma 180mm F3.5 EX DG Macro | "
+ "Tamron 90mm F2.8 Macro" },
+ { 25850, "Minolta AF 35-105mm F3.5-4.5" },
+ { 25851, "Beroflex 35-135mm F3.5-4.5" },
+@@ -1822,13 +1823,13 @@
+ { 25890, "Minolta AF 80-200mm F2.8 APO" },
+ { 25891, "Minolta AF 80-200mm F2.8 APO | "
+ "Tokina 80-200mm F2.8" },
+- { 25900, "Minolta AF 200mm F2.8 G APO + Minolta AF 1.4x APO + 1.4x"
},
+- { 25901, "Minolta AF 200mm F2.8 G APO + Minolta AF 1.4x APO + 1.4x
| "
++ { 25900, "Minolta AF 200mm F2.8 G APO + Minolta AF 1.4x APO" },
++ { 25901, "Minolta AF 200mm F2.8 G APO + Minolta AF 1.4x APO | "
+ "Minolta AF 600mm F4 HS-APO G + Minolta AF 1.4x APO" },
+ { 25910, "Minolta AF 35mm F1.4G" },
+ { 25911, "Minolta AF 35mm F1.4" },
+ { 25920, "Minolta AF 85mm F1.4G" },
+- { 25921, "Minolta AF 85mm F1.4G(D)" },
++ { 25921, "Minolta AF 85mm F1.4G (D)" },
+ { 25930, "Minolta AF 200mm F2.8 APO" },
+ { 25931, "Minolta AF 200mm F2.8 G APO" },
+ { 25940, "Minolta AF 3X-1X F1.7-2.8 Macro" },
+@@ -1839,24 +1840,24 @@
+ { 25971, "Minolta AF 35mm F2 [New]" },
+ { 25980, "Minolta AF 100mm F2" },
+ { 25981, "Minolta AF 100mm F2" },
+- { 26010, "Minolta AF 200mm F2.8 G APO + Minolta AF 2x APO + 2x" },
+- { 26011, "Minolta AF 200mm F2.8 G APO + Minolta AF 2x APO + 2x | "
++ { 26010, "Minolta AF 200mm F2.8 G APO + Minolta AF 2x APO" },
++ { 26011, "Minolta AF 200mm F2.8 G APO + Minolta AF 2x APO | "
+ "Minolta AF 600mm F4 HS-APO G + Minolta AF 2x APO" },
+ { 26040, "Minolta AF 80-200mm F4.5-5.6" },
+ { 26041, "Minolta AF 80-200mm F4.5-5.6" },
+ { 26050, "Minolta AF 35-80mm F4-5.6" },
+ { 26051, "Minolta AF 35-80mm F4-5.6" },
+ { 26060, "Minolta AF 100-300mm F4.5-5.6" },
+- { 26061, "Minolta AF 100-300mm F4.5-5.6(D) | "
+- "Sigma 105mm F2.8 Macro EX-DG" },
++ { 26061, "Minolta AF 100-300mm F4.5-5.6 (D) | "
++ "Sigma 105mm F2.8 Macro EX DG" },
+ { 26070, "Minolta AF 35-80mm F4-5.6" },
+ { 26071, "Minolta AF 35-80mm F4-5.6" },
+- { 26080, "Minolta AF 300mm F2.8G APO High Speed" },
+- { 26081, "Minolta AF 300mm F2.8G" },
+- { 26090, "Minolta AF 600mm F4G APO High Speed" },
+- { 26091, "Minolta AF 600mm F4 HS-APO G" },
+- { 26120, "Minolta AF 200mm F2.8G APO High Speed" },
+- { 26121, "Minolta AF 200mm F2.8G(D)" },
++ { 26080, "Minolta AF 300mm F2.8 G" },
++ { 26081, "Minolta AF 300mm F2.8 G APO High Speed" },
++ { 26090, "Minolta AF 600mm F4 G" },
++ { 26091, "Minolta AF 600mm F4 G APO High Speed" },
++ { 26120, "Minolta AF 200mm F2.8 G" },
++ { 26121, "Minolta AF 200mm F2.8 G APO High Speed" },
+ { 26130, "Minolta AF 50mm F1.7" },
+ { 26131, "Minolta AF 50mm F1.7 New" },
+ { 26150, "Minolta AF 28-105mm F3.5-4.5 Xi" },
+@@ -1870,7 +1871,7 @@
+ { 26201, "Minolta AF 28-70mm F2.8 G" },
+ { 26210, "Minolta AF 100-300mm F4.5-5.6 Xi" },
+ { 26211, "Minolta AF 100-300mm F4.5-5.6 xi" },
+- { 26240, "Minolta AF 35-80mm F4-5.6 Power" },
++ { 26240, "Minolta AF 35-80mm F4-5.6 Power Zoom" },
+ { 26241, "Minolta AF 35-80mm F4-5.6 Power Zoom" },
+ { 26281, "Minolta AF 80-200mm F2.8 G" },
+ { 26291, "Minolta AF 85mm F1.4 New" },
diff --git a/graphics/exiv2/90_changeset_r3006.diff
b/graphics/exiv2/90_changeset_r3006.diff
new file mode 100644
index 0000000..d1b63c2
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r3006.diff
@@ -0,0 +1,15 @@
+Index: trunk/src/minoltamn.cpp
+===================================================================
+--- trunk/src/minoltamn.cpp (revision 3005)
++++ trunk/src/minoltamn.cpp (revision 3006)
+@@ -1614,8 +1614,8 @@
+ { 4, "Minolta AF 85mm F1.4G" },
+ { 5, "Minolta AF 35-70mm F3.5-4.5 [II]" },
+ { 6, "Minolta AF 24-85mm F3.5-4.5 [New]" },
+- { 7, "Minolta AF 100-300mm F4.5-5.6(D) APO [New] | "
+- "Minolta AF 100-400mm F4.5-6.7(D) | "
++ { 7, "Minolta AF 100-300mm F4.5-5.6 (D) APO [New] | "
++ "Minolta AF 100-400mm F4.5-6.7 (D) | "
+ "Sigma AF 100-300mm F4 EX DG IF" },
+ { 8, "Minolta AF 70-210mm F4.5-5.6 [II]" },
+ { 9, "Minolta AF 50mm F3.5 Macro" },
diff --git a/graphics/exiv2/90_changeset_r3011.diff
b/graphics/exiv2/90_changeset_r3011.diff
new file mode 100644
index 0000000..2d963ce
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r3011.diff
@@ -0,0 +1,12 @@
+Index: trunk/src/canonmn.cpp
+===================================================================
+--- trunk/src/canonmn.cpp (revision 3010)
++++ trunk/src/canonmn.cpp (revision 3011)
+@@ -486,6 +486,7 @@
+ { 33, "Carl Zeiss Distagon 21mm T* f/2.8 ZE"
}, // 4
+ { 33, "Carl Zeiss Distagon 28mm T* f/2 ZE"
}, // 5
+ { 33, "Carl Zeiss Distagon 35mm T* f/2 ZE"
}, // 6
++ { 33, "Carl Zeiss Planar 50mm T* f/1.4 ZE"
}, // 7
+ { 35, "Canon EF 35-80mm f/4-5.6"
},
+ { 36, "Canon EF 38-76mm f/4.5-5.6"
},
+ { 37, "Canon EF 35-80mm f/4-5.6 or Tamron Lens"
}, // 0
diff --git a/graphics/exiv2/90_changeset_r3016.diff
b/graphics/exiv2/90_changeset_r3016.diff
new file mode 100644
index 0000000..7ec13cf
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r3016.diff
@@ -0,0 +1,47 @@
+Index: trunk/src/pentaxmn.cpp
+===================================================================
+--- trunk/src/pentaxmn.cpp (revision 3015)
++++ trunk/src/pentaxmn.cpp (revision 3016)
+@@ -112,7 +112,7 @@
+ { 0x12c32, N_("Optio M20") },
+ { 0x12c3c, N_("Optio W20") },
+ { 0x12c46, N_("Optio A20") },
+-// { 0x12c8c, N_("Optio M30") },
++ { 0x12c8c, N_("Optio M30") },
+ { 0x12c78, N_("Optio E30") },
+ { 0x12c7d, N_("Optio E35") },
+ { 0x12c82, N_("Optio T30") },
+@@ -175,6 +175,7 @@
+ { 0x12f66, N_("Q10") },
+ { 0x12f70, N_("K-5 II") },
+ { 0x12f71, N_("K-5 II s") },
++ { 0x12f84, N_("MX-1") },
+ };
+
+ //! Quality, tag 0x0008
+@@ -752,7 +753,7 @@
+ { 0x0417, "smc PENTAX-FA 20-35mm F4 AL" },
+ { 0x0418, "smc PENTAX-FA 77mm F1.8 Limited" },
+ { 0x0419, "Tamron SP AF 14mm F2.8" },
+- { 0x041a, "smc PENTAX-FA Macro 100mm F3.5 or Cosina lens" }, //0
++ { 0x041a, "smc PENTAX-FA Macro 100mm F3.5 or Cosina Lens" }, //0
+ { 0x041a, "Cosina 100mm F3.5 Macro" },
//1
+ { 0x041b, "Tamron AF28-300mm F/3.5-6.3 LD Aspherical[IF] Macro
(185D/285D)" },
+ { 0x041c, "smc PENTAX-FA 35mm F2 AL" },
+@@ -835,7 +836,7 @@
+ { 0x07da, "smc PENTAX-DA 18-55mm F3.5-5.6 AL WR" },
+ { 0x07dc, "Tamron SP AF 10-24mm F3.5-4.5 Di II LD Aspherical [IF]"
},
+ { 0x07dd, "smc PENTAX-DA L 50-200mm F4-5.6 ED" },
+- { 0x07de, "smc PENTAX-DA 18-55mm F3.5-5.6 AL II" },
++ { 0x07de, "smc PENTAX-DA L 18-55mm F3.5-5.6" },
+ { 0x07df, "Samsung D-XENON 18-55mm F3.5-5.6 II" },
+ { 0x07e0, "smc PENTAX-DA 15mm F4 ED AL Limited" },
+ { 0x07e1, "Samsung D-XENON 18-250mm F3.5-6.3" },
+@@ -867,6 +868,7 @@
+ { 0x0816, "Sigma 85mm F1.4 EX DG HSM" },
+ { 0x0817, "Sigma 70-200mm F2.8 APO EX DG OS HSM" },
+ { 0x081b, "Sigma 18-200mm F3.5-6.3 II DC HSM" },
++ { 0x081c, "Sigma 18-250mm F3.5-6.3 DC Macro HSM" },
+ { 0x08d2, "smc PENTAX-DA 18-270mm F3.5-6.3 ED SDM" },
+ { 0x08d7, "smc PENTAX-DA 18-135mm F3.5-5.6 ED AL [IF] DC WR" },
+ { 0x08e2, "smc PENTAX-DA* 55mm F1.4 SDM" },
diff --git a/graphics/exiv2/90_changeset_r3017.diff
b/graphics/exiv2/90_changeset_r3017.diff
new file mode 100644
index 0000000..9034cb9
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r3017.diff
@@ -0,0 +1,41 @@
+Index: trunk/src/nikonmn.cpp
+===================================================================
+--- trunk/src/nikonmn.cpp (revision 3016)
++++ trunk/src/nikonmn.cpp (revision 3017)
+@@ -1977,6 +1977,7 @@
+ {0xB3,0x4C,0x62,0x62,0x14,0x14,0xB5,0x06,0x01,0x00,0x00, "Nikon",
"JAA341DA", "AF-S Nikkor 85mm f/1.8G"},
+ {0xB4,0x40,0x37,0x62,0x2C,0x34,0xB6,0x0E,0x01,0x00,0x00, "Nikon", "", "AF-S
VR Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED"},
+ {0xB5,0x4C,0x3C,0x3C,0x14,0x14,0xB7,0x06,0x01,0x00,0x00, "Nikon", "", "AF-S
Nikkor 28mm f/1.8G"},
++{0xB7,0x44,0x60,0x98,0x34,0x3C,0xB9,0x0E,0x01,0x00,0x00, "Nikon", "", "AF-S
Nikkor 80-400mm f/4.5-5.6G ED VR"},
+ //
+ {0x00,0x00,0x00,0x00,0x00,0x00,0xE1,0x12,0x00,0x00,0x00, "Nikon", "",
"TC-17E II"},
+ {0x00,0x00,0x00,0x00,0x00,0x00,0xF1,0x0C,0x00,0x00,0x00, "Nikon", "",
"TC-14E II"},
+@@ -2291,6 +2292,8 @@
+ //
+ {0x00,0x54,0x56,0x56,0x30,0x30,0x00,0x00,0x00,0x00,0x0C, "Coastal Optical
Systems", "", "60mm 1:4 UV-VIS-IR Macro Apo"},
+ //
++{0x00,0x40,0x11,0x11,0x2C,0x2C,0x00,0x00,0x00,0x00,0x1D, "Samyang", "",
"Samyang 8mm f/3.5 Fish-Eye"},
++{0x4A,0x40,0x11,0x11,0x2C,0x0C,0x4D,0x02,0x00,0x00,0x1D, "Samyang", "",
"Samyang 8mm f/3.5 Fish-Eye CS"},
+ {0x4A,0x48,0x24,0x24,0x24,0x0C,0x4D,0x02,0x00,0x00,0x1D, "Samyang", "", "AE
14mm f/2.8 ED AS IF UMC"},
+ {0x4A,0x60,0x44,0x44,0x0C,0x0C,0x4D,0x02,0x00,0x00,0x1D, "Samyang", "",
"35mm f/1.4 AS UMC"},
+ {0x4A,0x60,0x62,0x62,0x0C,0x0C,0x4D,0x02,0x00,0x00,0x1D, "Samyang", "", "AE
85mm f/1.4 AS IF UMC"},
+Index: trunk/src/pentaxmn.cpp
+===================================================================
+--- trunk/src/pentaxmn.cpp (revision 3016)
++++ trunk/src/pentaxmn.cpp (revision 3017)
+@@ -870,6 +870,7 @@
+ { 0x081b, "Sigma 18-200mm F3.5-6.3 II DC HSM" },
+ { 0x081c, "Sigma 18-250mm F3.5-6.3 DC Macro HSM" },
+ { 0x08d2, "smc PENTAX-DA 18-270mm F3.5-6.3 ED SDM" },
++ { 0x08d3, "HD PENTAX-DA 560mm F5.6 ED AW" },
+ { 0x08d7, "smc PENTAX-DA 18-135mm F3.5-5.6 ED AL [IF] DC WR" },
+ { 0x08e2, "smc PENTAX-DA* 55mm F1.4 SDM" },
+ { 0x08e3, "smc PENTAX DA* 60-250mm F4 [IF] SDM"},
+@@ -901,6 +902,7 @@
+ { 0x0b11, "smc PENTAX-FA 645 150mm-300mm F5.6 ED [IF]" },
+ { 0x0d12, "smc PENTAX-D FA 645 55mm F2.8 AL [IF] SDM AW" },
+ { 0x0d13, "smc PENTAX-D FA 645 25mm F4 AL [IF] SDM AW" },
++ { 0x0d14, "HD PENTAX-D FA 645 90mm F2.8 ED AW SR" },
+ { 0x1500, "Pentax Q Manual Lens" },
+ { 0x1501, "01 Standard Prime 8.5mm F1.9" },
+ { 0x1502, "02 Standard Zoom 5-15mm F2.8-4.5" },
diff --git a/graphics/exiv2/90_changeset_r3023.diff
b/graphics/exiv2/90_changeset_r3023.diff
new file mode 100644
index 0000000..f8cc663
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r3023.diff
@@ -0,0 +1,293 @@
+Index: trunk/src/canonmn.cpp
+===================================================================
+--- trunk/src/canonmn.cpp (revision 3022)
++++ trunk/src/canonmn.cpp (revision 3023)
+@@ -60,7 +60,7 @@
+ };
+
+ //! Special treatment pretty-print function for non-unique lens ids.
+- std::ostream& printCsLensByFocalLength(std::ostream& os,
++ std::ostream& printCsLensByFocalLengthAndMaxAperture(std::ostream& os,
+ const Value& value,
+ const ExifData* metadata);
+
+@@ -429,21 +429,21 @@
+ { 1, "Canon EF 50mm f/1.8"
},
+ { 2, "Canon EF 28mm f/2.8"
},
+ { 3, "Canon EF 135mm f/2.8 Soft"
},
+- { 4, "Canon EF 35-105mm f/3.5-4.5 or Sigma Lens"
}, // 0
++ { 4, "Canon EF 35-105mm f/3.5-4.5 "
}, // 0
+ { 4, "Sigma UC Zoom 35-135mm f/4-5.6"
}, // 1
+ { 5, "Canon EF 35-70mm f/3.5-4.5"
},
+- { 6, "Canon EF 28-70mm f/3.5-4.5 or Sigma or Tokina Lens"
}, // 0
++ { 6, "Canon EF 28-70mm f/3.5-4.5"
}, // 0
+ { 6, "Sigma 18-50mm f/3.5-5.6 DC"
}, // 1
+ { 6, "Sigma 18-125mm f/3.5-5.6 DC IF ASP"
}, // 2
+ { 6, "Tokina AF193-2 19-35mm f/3.5-4.5"
}, // 3
+ { 6, "Sigma 28-80mm f/3.5-5.6 II Macro"
}, // 4
+ { 7, "Canon EF 100-300mm f/5.6L"
},
+- { 8, "Canon EF 100-300mm f/5.6 or Sigma or Tokina Lens"
}, // 0
++ { 8, "Canon EF 100-300mm f/5.6"
}, // 0
+ { 8, "Sigma 70-300mm f/4-5.6 [APO] DG Macro"
}, // 1
+ { 8, "Tokina AT-X 242 AF 24-200mm f/3.5-5.6"
}, // 2
+- { 9, "Canon EF 70-210mm f/4 or Sigma Lens"
}, // 0
++ { 9, "Canon EF 70-210mm f/4"
}, // 0
+ { 9, "Sigma 55-200mm f/4-5.6 DC"
}, // 1
+- { 10, "Canon EF 50mm f/2.5 Macro or Sigma Lens"
}, // 0
++ { 10, "Canon EF 50mm f/2.5 Macro"
}, // 0
+ { 10, "Sigma 50mm f/2.8 EX"
}, // 1
+ { 10, "Sigma 28mm f/1.8"
}, // 2
+ { 10, "Sigma 105mm f/2.8 Macro EX"
}, // 3
+@@ -457,27 +457,27 @@
+ { 18, "Canon EF 28-70mm f/3.5-4.5"
},
+ { 20, "Canon EF 100-200mm f/4.5A"
},
+ { 21, "Canon EF 80-200mm f/2.8L"
},
+- { 22, "Canon EF 20-35mm f/2.8L or Tokina Lens"
}, // 0
++ { 22, "Canon EF 20-35mm f/2.8L"
}, // 0
+ { 22, "Tokina AT-X 280 AF PRO 28-80mm f/2.8 Aspherical"
}, // 1
+ { 23, "Canon EF 35-105mm f/3.5-4.5"
},
+ { 24, "Canon EF 35-80mm f/4-5.6 Power Zoom"
},
+ { 25, "Canon EF 35-80mm f/4-5.6 Power Zoom"
},
+- { 26, "Canon EF 100mm f/2.8 Macro or Cosina or Tamron or Carl
Zeiss Lens" }, // 0
++ { 26, "Canon EF 100mm f/2.8 Macro"
}, // 0
+ { 26, "Cosina 100mm f/3.5 Macro AF"
}, // 1
+ { 26, "Tamron SP AF 90mm f/2.8 Di Macro"
}, // 2
+ { 26, "Tamron SP AF 180mm f/3.5 Di Macro"
}, // 3
+ { 26, "Carl Zeiss Planar T* 50mm f/1.4"
}, // 4
+ { 27, "Canon EF 35-80mm f/4-5.6"
},
+- { 28, "Canon EF 80-200mm f/4.5-5.6 or Tamron Lens"
}, // 0
++ { 28, "Canon EF 80-200mm f/4.5-5.6"
}, // 0
+ { 28, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF"
}, // 1
+ { 28, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro"
}, // 2
+ { 28, "Tamron AF 70-300mm f/4.5-5.6 Di LD 1:2 Macro Zoom"
}, // 3
+ { 28, "Tamron AF Aspherical 28-200mm f/3.8-5.6"
}, // 4
+ { 29, "Canon EF 50mm f/1.8 MkII"
},
+ { 30, "Canon EF 35-105mm f/4.5-5.6"
},
+- { 31, "Canon EF 75-300mm f/4-5.6 or Tamron Lens"
}, // 0
++ { 31, "Canon EF 75-300mm f/4-5.6"
}, // 0
+ { 31, "Tamron SP AF 300mm f/2.8 LD IF"
}, // 1
+- { 32, "Canon EF 24mm f/2.8 or Sigma Lens"
}, // 0
++ { 32, "Canon EF 24mm f/2.8"
}, // 0
+ { 32, "Sigma 15mm f/2.8 EX Fisheye"
}, // 1
+ { 33, "Voigtlander or Carl Zeiss Lens"
}, // 0
+ { 33, "Voigtlander Ultron 40mm f/2 SLII Aspherical"
}, // 1
+@@ -489,7 +489,7 @@
+ { 33, "Carl Zeiss Planar 50mm T* f/1.4 ZE"
}, // 7
+ { 35, "Canon EF 35-80mm f/4-5.6"
},
+ { 36, "Canon EF 38-76mm f/4.5-5.6"
},
+- { 37, "Canon EF 35-80mm f/4-5.6 or Tamron Lens"
}, // 0
++ { 37, "Canon EF 35-80mm f/4-5.6"
}, // 0
+ { 37, "Tamron 70-200mm f/2.8 Di LD IF Macro"
}, // 1
+ { 37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF]
Macro Model A20" }, // 2
+ { 37, "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF] "
}, // 3
+@@ -498,7 +498,7 @@
+ { 39, "Canon EF 75-300mm f/4-5.6"
},
+ { 40, "Canon EF 28-80mm f/3.5-5.6"
},
+ { 41, "Canon EF 28-90mm f/4-5.6"
},
+- { 42, "Canon EF 28-200mm f/3.5-5.6 or Tamron Lens"
}, // 0
++ { 42, "Canon EF 28-200mm f/3.5-5.6"
}, // 0
+ { 42, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF]
Macro Model A20" }, // 1
+ { 43, "Canon EF 28-105mm f/4-5.6"
},
+ { 44, "Canon EF 90-300mm f/4.5-5.6"
},
+@@ -518,7 +518,7 @@
+ { 127, "Canon TS-E 90mm f/2.8"
},
+ { 129, "Canon EF 300mm f/2.8L"
},
+ { 130, "Canon EF 50mm f/1.0L"
},
+- { 131, "Canon EF 28-80mm f/2.8-4L or Sigma Lens"
}, // 0
++ { 131, "Canon EF 28-80mm f/2.8-4L"
}, // 0
+ { 131, "Sigma 8mm f/3.5 EX DG Circular Fisheye"
}, // 1
+ { 131, "Sigma 17-35mm f/2.8-4 EX DG Aspherical HSM"
}, // 2
+ { 131, "Sigma 17-70mm f/2.8-4.5 DC Macro"
}, // 3
+@@ -530,7 +530,7 @@
+ { 134, "Canon EF 600mm f/4L IS"
},
+ { 135, "Canon EF 200mm f/1.8L"
},
+ { 136, "Canon EF 300mm f/2.8L"
},
+- { 137, "Canon EF 85mm f/1.2L or Sigma or Tamron Lens"
}, // 0
++ { 137, "Canon EF 85mm f/1.2L"
}, // 0
+ { 137, "Sigma 18-50mm f/2.8-4.5 DC OS HSM"
}, // 1
+ { 137, "Sigma 50-200mm f/4-5.6 DC OS HSM"
}, // 2
+ { 137, "Sigma 18-250mm f/3.5-6.3 DC OS HSM"
}, // 3
+@@ -558,31 +558,31 @@
+ { 147, "Canon EF 35-135mm f/4-5.6 USM"
},
+ { 148, "Canon EF 28-80mm f/3.5-5.6 USM"
},
+ { 149, "Canon EF 100mm f/2 USM"
},
+- { 150, "Canon EF 14mm f/2.8L or Sigma Lens"
}, // 0
++ { 150, "Canon EF 14mm f/2.8L"
}, // 0
+ { 150, "Sigma 20mm EX f/1.8"
}, // 1
+ { 150, "Sigma 30mm f/1.4 DC HSM"
}, // 2
+ { 150, "Sigma 24mm f/1.8 DG Macro EX"
}, // 3
+ { 151, "Canon EF 200mm f/2.8L"
},
+- { 152, "Canon EF 300mm f/4L IS or Sigma Lens"
}, // 0
++ { 152, "Canon EF 300mm f/4L IS"
}, // 0
+ { 152, "Sigma 12-24mm f/4.5-5.6 EX DG ASPHERICAL HSM"
}, // 1
+ { 152, "Sigma 14mm f/2.8 EX Aspherical HSM"
}, // 2
+ { 152, "Sigma 10-20mm f/4-5.6"
}, // 3
+ { 152, "Sigma 100-300mm f/4"
}, // 4
+- { 153, "Canon EF 35-350mm f/3.5-5.6L or Sigma og Tamron Lens"
}, // 0
++ { 153, "Canon EF 35-350mm f/3.5-5.6L"
}, // 0
+ { 153, "Sigma 50-500mm f/4-6.3 APO HSM EX"
}, // 1
+ { 153, "Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical [IF] Macro"
}, // 2
+ { 153, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF]
Macro Model A14" }, // 3
+ { 153, "Tamron 18-250mm f/3.5-6.3 Di II LD Aspherical [IF] Macro"
}, // 4
+ { 154, "Canon EF 20mm f/2.8 USM"
},
+ { 155, "Canon EF 85mm f/1.8 USM"
},
+- { 156, "Canon EF 28-105mm f/3.5-4.5 USM or Tamron Lens"
}, // 0
+- { 156, "Tamron SP AF 70-300mm F4-5.6 Di VC USD"
}, // 1
+- { 160, "Canon EF 20-35mm f/3.5-4.5 USM or Tamron or Tokina Lens"
}, // 0
++ { 156, "Canon EF 28-105mm f/3.5-4.5 USM"
}, // 0
++ { 156, "Tamron SP AF 70-300mm f/4-5.6 Di VC USD"
}, // 1
++ { 160, "Canon EF 20-35mm f/3.5-4.5 USM"
}, // 0
+ { 160, "Tamron AF 19-35mm f/3.5-4.5"
}, // 1
+ { 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
+- { 161, "Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens"
}, // 0
++ { 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
+ { 161, "Tamron AF 17-50mm f/2.8 Di-II LD Aspherical"
}, // 3
+@@ -595,7 +595,7 @@
+ { 166, "Canon EF 70-200mm f/2.8 L + 1.4x"
},
+ { 167, "Canon EF 70-200mm f/2.8 L + 2x"
},
+ { 168, "Canon EF 28mm f/1.8 USM"
},
+- { 169, "Canon EF 17-35mm f/2.8L or Sigma Lens"
}, // 0
++ { 169, "Canon EF 17-35mm f/2.8L"
}, // 0
+ { 169, "Sigma 18-200mm f/3.5-6.3 DC OS"
}, // 1
+ { 169, "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"
}, // 2
+ { 169, "Sigma 18-50mm f/2.8 Macro"
}, // 3
+@@ -606,10 +606,10 @@
+ { 170, "Canon EF 200mm f/2.8L II"
},
+ { 171, "Canon EF 300mm f/4L"
},
+ { 172, "Canon EF 400mm f/5.6L"
},
+- { 173, "Canon EF 180mm Macro f/3.5L or Sigma Lens"
}, // 0
++ { 173, "Canon EF 180mm Macro f/3.5L"
}, // 0
+ { 173, "Sigma 180mm EX HSM Macro f/3.5"
}, // 1
+ { 173, "Sigma APO Macro 150mm f/3.5 EX DG IF HSM"
}, // 2
+- { 174, "Canon EF 135mm f/2L or Sigma Lens"
}, // 0
++ { 174, "Canon EF 135mm f/2L"
}, // 0
+ { 174, "Sigma 70-200mm f/2.8 EX DG APO OS HSM"
}, // 1
+ { 174, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM"
}, // 2
+ { 175, "Canon EF 400mm f/2.8L"
},
+@@ -620,7 +620,7 @@
+ { 180, "Canon EF 35mm f/1.4L"
},
+ { 181, "Canon EF 100-400mm f/4.5-5.6L IS + 1.4x"
},
+ { 182, "Canon EF 100-400mm f/4.5-5.6L IS + 2x"
},
+- { 183, "Canon EF 100-400mm f/4.5-5.6L IS or Sigma Lens"
}, // 0
++ { 183, "Canon EF 100-400mm f/4.5-5.6L IS"
}, // 0
+ { 183, "Sigma 150mm f/2.8 EX DG OS HSM APO Macro"
}, // 1
+ { 184, "Canon EF 400mm f/2.8L + 2x"
},
+ { 185, "Canon EF 600mm f/4L IS"
},
+@@ -708,31 +708,31 @@
+
+ //! List of lens ids which require special treatment with the medicine
+ const LensIdFct lensIdFct[] = {
+- { 4, 0 }, // no known medicine
+- { 6, printCsLensByFocalLength },
+- { 8, printCsLensByFocalLength },
+- { 9, printCsLensByFocalLength },
+- { 10, printCsLensByFocalLength }, // works partly
+- { 22, printCsLensByFocalLength },
+- { 26, printCsLensByFocalLength }, // works partly
+- { 28, printCsLensByFocalLength },
+- { 31, printCsLensByFocalLength },
+- { 32, printCsLensByFocalLength },
+- { 33, printCsLensByFocalLength }, // not tested
+- { 37, printCsLensByFocalLength },
+- { 42, printCsLensByFocalLength },
+- { 131, printCsLensByFocalLength },
+- { 137, printCsLensByFocalLength }, // not tested
+- { 150, printCsLensByFocalLength },
+- { 152, printCsLensByFocalLength },
+- { 153, printCsLensByFocalLength },
+- { 156, printCsLensByFocalLength },
+- { 160, printCsLensByFocalLength },
+- { 161, printCsLensByFocalLength },
+- { 169, printCsLensByFocalLength },
+- { 173, printCsLensByFocalLength }, // works partly
+- { 174, printCsLensByFocalLength }, // not tested
+- { 183, printCsLensByFocalLength } // not tested
++ { 4, printCsLensByFocalLengthAndMaxAperture }, // not tested
++ { 6, printCsLensByFocalLengthAndMaxAperture },
++ { 8, printCsLensByFocalLengthAndMaxAperture },
++ { 9, printCsLensByFocalLengthAndMaxAperture },
++ { 10, printCsLensByFocalLengthAndMaxAperture }, // works partly
++ { 22, printCsLensByFocalLengthAndMaxAperture },
++ { 26, printCsLensByFocalLengthAndMaxAperture }, // works partly
++ { 28, printCsLensByFocalLengthAndMaxAperture },
++ { 31, printCsLensByFocalLengthAndMaxAperture },
++ { 32, printCsLensByFocalLengthAndMaxAperture },
++ { 33, printCsLensByFocalLengthAndMaxAperture }, // not tested
++ { 37, printCsLensByFocalLengthAndMaxAperture },
++ { 42, printCsLensByFocalLengthAndMaxAperture },
++ { 131, printCsLensByFocalLengthAndMaxAperture },
++ { 137, printCsLensByFocalLengthAndMaxAperture }, // not tested
++ { 150, printCsLensByFocalLengthAndMaxAperture },
++ { 152, printCsLensByFocalLengthAndMaxAperture },
++ { 153, printCsLensByFocalLengthAndMaxAperture },
++ { 156, printCsLensByFocalLengthAndMaxAperture },
++ { 160, printCsLensByFocalLengthAndMaxAperture },
++ { 161, printCsLensByFocalLengthAndMaxAperture },
++ { 169, printCsLensByFocalLengthAndMaxAperture },
++ { 173, printCsLensByFocalLengthAndMaxAperture }, // works partly
++ { 174, printCsLensByFocalLengthAndMaxAperture }, // not tested
++ { 183, printCsLensByFocalLengthAndMaxAperture } // not tested
+ };
+
+ //! FlashActivity, tag 0x001c
+@@ -1298,25 +1298,27 @@
+ }
+
+ //! Helper structure
+- struct LensTypeAndFocalLength {
++ struct LensTypeAndFocalLengthAndMaxAperture {
+ long lensType_; //!< Lens type
+ std::string focalLength_; //!< Focal length
++ std::string maxAperture_; //!< Aperture
+ };
+
+ //! Compare tag details with a lens entry
+- bool operator==(const TagDetails& td, const LensTypeAndFocalLength&
ltfl) {
++ bool operator==(const TagDetails& td, const
LensTypeAndFocalLengthAndMaxAperture& ltfl) {
+ return ( td.val_ == ltfl.lensType_
+- && std::string(td.label_).find(ltfl.focalLength_) !=
std::string::npos);
++ && std::string(td.label_).find(ltfl.focalLength_) !=
std::string::npos
++ && std::string(td.label_).find(ltfl.maxAperture_) !=
std::string::npos);
+ }
+
+- std::ostream& printCsLensByFocalLength(std::ostream& os,
++ std::ostream& printCsLensByFocalLengthAndMaxAperture(std::ostream& os,
+ const Value& value,
+ const ExifData* metadata)
+ {
+ if ( !metadata || value.typeId() != unsignedShort
+ || value.count() == 0) return os << value;
+
+- LensTypeAndFocalLength ltfl;
++ LensTypeAndFocalLengthAndMaxAperture ltfl;
+ ltfl.lensType_ = value.toLong();
+
+ ExifKey key("Exif.CanonCs.Lens");
+@@ -1340,6 +1342,23 @@
+ }
+ if (ltfl.focalLength_.empty()) return os << value;
+
++ ExifKey key2("Exif.CanonCs.MaxAperture");
++ pos = metadata->findKey(key2);
++ if ( pos != metadata->end()
++ && pos->value().count() == 1
++ && pos->value().typeId() == unsignedShort) {
++
++ long val = static_cast<int16_t>(pos->value().toLong(0));
++ if (val > 0)
++ {
++ std::ostringstream oss;
++ oss << std::setprecision(2);
++ oss << fnumber(canonEv(val));
++ ltfl.maxAperture_ = oss.str();
++ }
++ }
++ if (ltfl.maxAperture_.empty()) return os << value;
++
+ const TagDetails* td = find(canonCsLensType, ltfl);
+ if (!td) return os << value;
+ return os << td->label_;
diff --git a/graphics/exiv2/90_changeset_r3026.diff
b/graphics/exiv2/90_changeset_r3026.diff
new file mode 100644
index 0000000..f16f1fd
--- /dev/null
+++ b/graphics/exiv2/90_changeset_r3026.diff
@@ -0,0 +1,13 @@
+Index: trunk/src/canonmn.cpp
+===================================================================
+--- trunk/src/canonmn.cpp (revision 3025)
++++ trunk/src/canonmn.cpp (revision 3026)
+@@ -429,7 +429,7 @@
+ { 1, "Canon EF 50mm f/1.8"
},
+ { 2, "Canon EF 28mm f/2.8"
},
+ { 3, "Canon EF 135mm f/2.8 Soft"
},
+- { 4, "Canon EF 35-105mm f/3.5-4.5 "
}, // 0
++ { 4, "Canon EF 35-105mm f/3.5-4.5"
}, // 0
+ { 4, "Sigma UC Zoom 35-135mm f/4-5.6"
}, // 1
+ { 5, "Canon EF 35-70mm f/3.5-4.5"
},
+ { 6, "Canon EF 28-70mm f/3.5-4.5"
}, // 0
diff --git a/graphics/exiv2/95_post_r3026_cleanup.diff
b/graphics/exiv2/95_post_r3026_cleanup.diff
new file mode 100644
index 0000000..d77b4d9
--- /dev/null
+++ b/graphics/exiv2/95_post_r3026_cleanup.diff
@@ -0,0 +1,100 @@
+diff -Nurpd exiv2-0.23-orig/src/minoltamn.cpp
exiv2-0.23-clean/src/minoltamn.cpp
+--- exiv2-0.23-orig/src/minoltamn.cpp 2013-05-05 21:56:17.671412811 +0200
++++ exiv2-0.23-clean/src/minoltamn.cpp 2013-05-05 21:59:51.928475286 +0200
+@@ -1894,28 +1894,7 @@ namespace Exiv2 {
+ { 45751, "1.4x Teleconverter " },
+ { 45851, "Tamron SP AF 300mm F2.8 LD IF" },
+ { 45871, "Tamron AF 70-210mm F2.8 SP LD" },
+- { 65535, "Manual Lens or No Lens | "
+- "Sony E 16mm F2.8 | "
+- "Sony E 20mm F2.8 | "
+- "Sony E 24mm F1.8 ZA | "
+- "Sony E 30mm F3.5 Macro | "
+- "Sony E 35mm F1.8 OSS | "
+- "Sony E 50mm F1.8 OSS | "
+- "Sony E 10-18mm F4 OSS | "
+- "Sony E PZ 16-50mm F3.5-5.6 OSS | "
+- "Sony E 18-55mm F3.5-5.6 OSS | "
+- "Sony E 18-200mm F3.5-6.3 OSS | "
+- "Sony E 55-210mm F4.5-6.3 OSS | "
+- "Sigma 19mm F2.8 EX DN | "
+- "Sigma 30mm F2.8 EX DN | "
+- "Tamron 18-200mm F3.5-6.3 Di III VC | "
+- "Arax MC 35mm F2.8 Tilt+Shift | "
+- "Arax MC 80mm F2.8 Tilt+Shift | "
+- "Zenitar MF 16mm F2.8 Fisheye M42 | "
+- "Samyang 500mm Mirror F8.0 | "
+- "Pentacon Auto 135mm F2.8 | "
+- "Pentacon Auto 29mm F2.8 | "
+- "Helios 44-2 58mm F2.0" }
++ { 65535, "Manual Lens or No Lens" }
+ };
+
+ std::ostream& printMinoltaSonyLensID(std::ostream& os, const Value&
value, const ExifData* metadata)
+diff -Nurpd exiv2-0.23-orig/src/pentaxmn.cpp
exiv2-0.23-clean/src/pentaxmn.cpp
+--- exiv2-0.23-orig/src/pentaxmn.cpp 2013-05-05 21:56:17.691412913 +0200
++++ exiv2-0.23-clean/src/pentaxmn.cpp 2013-05-05 22:02:37.633296939 +0200
+@@ -675,27 +675,27 @@ namespace Exiv2 {
+ { 0x0314, "smc PENTAX-F 35-80mm F4-5.6" },
+ { 0x0315, "smc PENTAX-F 80-200mm F4.7-5.6" },
+ { 0x0316, "smc PENTAX-F FISH-EYE 17-28mm F3.5-4.5" },
+- { 0x0317, "smc PENTAX-F 100-300mm F4.5-5.6 or Sigma Lens" }, //0
++ { 0x0317, "smc PENTAX-F 100-300mm F4.5-5.6" },
//0
+ { 0x0317, "Sigma AF 28-300mm F3.5-5.6 DL IF" },
//1
+ { 0x0317, "Sigma AF 28-300mm F3.5-6.3 DG IF Macro" }, //2
+ { 0x0318, "smc PENTAX-F 35-135mm F3.5-4.5" },
+- { 0x0319, "smc PENTAX-F 35-105mm F4-5.6 or Sigma or Tokina Lens"
},//0
++ { 0x0319, "smc PENTAX-F 35-105mm F4-5.6" }, //0
+ { 0x0319, "Sigma AF 28-300mm F3.5-5.6 DL IF" },
//1
+ { 0x0319, "Sigma 55-200mm F4-5.6 DC" },
//2
+ { 0x0319, "Sigma AF 28-300mm F3.5-5.6 DL IF" },
//3
+ { 0x0319, "Sigma AF 28-300mm F3.5-6.3 DG IF Macro" }, //4
+ { 0x0319, "Tokina 80-200mm F2.8 ATX-Pro" }, //5
+ { 0x031a, "smc PENTAX-F* 250-600mm F5.6 ED[IF]" },
+- { 0x031b, "smc PENTAX-F 28-80mm F3.5-4.5 or Tokina Lens" }, //0
++ { 0x031b, "smc PENTAX-F 28-80mm F3.5-4.5" }, //0
+ { 0x031b, "Tokina AT-X Pro AF 28-70mm F2.6-2.8" }, //1
+- { 0x031c, "smc PENTAX-F 35-70mm F3.5-4.5 or Tokina Lens" }, //0
++ { 0x031c, "smc PENTAX-F 35-70mm F3.5-4.5" }, //0
+ { 0x031c, "Tokina 19-35mm F3.5-4.5 AF" }, //1
+ { 0x031c, "Tokina AT-X AF 400mm F5.6" }, //2
+- { 0x031d, "PENTAX-F 28-80mm F3.5-4.5 or Sigma or Tokina Lens" },//0
++ { 0x031d, "PENTAX-F 28-80mm F3.5-4.5" }, //0
+ { 0x031d, "Sigma AF 18-125mm F3.5-5.6 DC" }, //1
+ { 0x031d, "Tokina AT-X PRO 28-70mm F2.6-2.8" },
//2
+ { 0x031e, "PENTAX-F 70-200mm F4-5.6" },
+- { 0x031f, "smc PENTAX-F 70-210mm F4-5.6 or Tokina or Takumar Lens"
},//0
++ { 0x031f, "smc PENTAX-F 70-210mm F4-5.6" }, //0
+ { 0x031f, "Tokina AF 730 75-300mm F4.5-5.6" },
//1
+ { 0x031f, "Takumar-F 70-210mm F4-5.6" }, //2
+ { 0x0320, "smc PENTAX-F 50mm F1.4" },
+@@ -706,9 +706,9 @@ namespace Exiv2 {
+ { 0x0326, "smc PENTAX-F* 300mm F4.5 ED[IF]" },
+ { 0x0327, "smc PENTAX-F* 600mm F4 ED[IF]" },
+ { 0x0328, "smc PENTAX-F Macro 100mm F2.8" },
+- { 0x0329, "smc PENTAX-F Macro 50mm F2.8 or Sigma Lens" }, //0
++ { 0x0329, "smc PENTAX-F Macro 50mm F2.8" }, //0
+ { 0x0329, "Sigma 50mm F2.8 Macro" }, //1
+- { 0x032c, "Tamron 35-90mm F4 AF or Sigma Lens" }, //0
++ { 0x032c, "Tamron 35-90mm F4 AF" }, //0
+ { 0x032c, "Sigma AF 10-20mm F4-5.6 EX DC" }, //1
+ { 0x032c, "Sigma 12-24mm F4.5 EX DG" },
//2
+ { 0x032c, "Sigma 17-70mm F2.8-4.5 DC Macro" },
//3
+@@ -718,7 +718,7 @@ namespace Exiv2 {
+ { 0x032e, "Sigma EX APO 100-300mm F4 IF" }, //2
+ { 0x0332, "smc PENTAX-FA 28-70mm F4 AL" },
+ { 0x0333, "Sigma 28mm F1.8 EX DG Aspherical Macro" },
+- { 0x0334, "smc PENTAX-FA 28-200mm F3.8-5.6 AL[IF] or Tamron Lens"
},//0
++ { 0x0334, "smc PENTAX-FA 28-200mm F3.8-5.6 AL[IF]" }, //0
+ { 0x0334, "Tamron AF LD 28-200mm F3.8-5.6 [IF] Aspherical (171D)"
},//1
+ { 0x0335, "smc PENTAX-FA 28-80mm F3.5-5.6 AL" },
+ { 0x03f7, "smc PENTAX-DA FISH-EYE 10-17mm F3.5-4.5 ED[IF]" },
+@@ -753,7 +753,7 @@ namespace Exiv2 {
+ { 0x0417, "smc PENTAX-FA 20-35mm F4 AL" },
+ { 0x0418, "smc PENTAX-FA 77mm F1.8 Limited" },
+ { 0x0419, "Tamron SP AF 14mm F2.8" },
+- { 0x041a, "smc PENTAX-FA Macro 100mm F3.5 or Cosina Lens" }, //0
++ { 0x041a, "smc PENTAX-FA Macro 100mm F3.5" }, //0
+ { 0x041a, "Cosina 100mm F3.5 Macro" },
//1
+ { 0x041b, "Tamron AF28-300mm F/3.5-6.3 LD Aspherical[IF] Macro
(185D/285D)" },
+ { 0x041c, "smc PENTAX-FA 35mm F2 AL" },
diff --git a/graphics/exiv2/HISTORY b/graphics/exiv2/HISTORY
index 61bb59f..d74a5a3 100644
--- a/graphics/exiv2/HISTORY
+++ b/graphics/exiv2/HISTORY
@@ -1,3 +1,48 @@
+2012-08-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * 00_hyphens_used_as_minus.diff,
+ 90_changeset_r2743.diff,
+ 90_changeset_r2744.diff,
+ 90_changeset_r2756.diff,
+ 90_changeset_r2818_partial.diff,
+ 90_changeset_r2860.diff,
+ 90_changeset_r2889.diff,
+ 90_changeset_r2958.diff,
+ 90_changeset_r2959.diff,
+ 90_changeset_r2961.diff,
+ 90_changeset_r2963.diff,
+ 90_changeset_r2968.diff,
+ 90_changeset_r2969.diff,
+ 90_changeset_r2970.diff,
+ 90_changeset_r2975.diff,
+ 90_changeset_r2978.diff,
+ 90_changeset_r2981.diff,
+ 90_changeset_r2982.diff,
+ 90_changeset_r2984.diff,
+ 90_changeset_r2985.diff,
+ 90_changeset_r2986.diff,
+ 90_changeset_r2988.diff,
+ 90_changeset_r2989.diff,
+ 90_changeset_r2990.diff,
+ 90_changeset_r2991.diff,
+ 90_changeset_r2992.diff,
+ 90_changeset_r2993.diff,
+ 90_changeset_r2994.diff,
+ 90_changeset_r2995.diff,
+ 90_changeset_r2998.diff,
+ 90_changeset_r3002.diff,
+ 90_changeset_r3003.diff,
+ 90_changeset_r3004.diff,
+ 90_changeset_r3005.diff,
+ 90_changeset_r3006.diff,
+ 90_changeset_r3011.diff,
+ 90_changeset_r3016.diff,
+ 90_changeset_r3017.diff,
+ 90_changeset_r3023.diff,
+ 90_changeset_r3026.diff,
+ 95_post_r3026_cleanup.diff,
+ PRE_BUILD: add support for several recent cameras and lenses,
+ fix a memory leak, fix a use after delete
+
2012-04-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.23
* UP_TRIGGERS: update old soversion
diff --git a/graphics/exiv2/PRE_BUILD b/graphics/exiv2/PRE_BUILD
new file mode 100755
index 0000000..d4932ad
--- /dev/null
+++ b/graphics/exiv2/PRE_BUILD
@@ -0,0 +1,43 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/00_hyphens_used_as_minus.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2743.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2744.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2756.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2818_partial.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2860.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2889.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2958.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2959.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2961.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2963.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2968.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2969.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2970.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2975.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2978.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2981.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2982.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2984.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2985.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2986.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2988.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2989.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2990.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2991.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2992.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2993.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2994.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2995.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r2998.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r3002.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r3003.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r3004.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r3005.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r3006.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r3011.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r3016.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r3017.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r3023.diff &&
+patch -p1 < $SPELL_DIRECTORY/90_changeset_r3026.diff &&
+patch -p1 < $SPELL_DIRECTORY/95_post_r3026_cleanup.diff
diff --git a/utils/nocache/BUILD b/utils/nocache/BUILD
new file mode 100755
index 0000000..6dfecc1
--- /dev/null
+++ b/utils/nocache/BUILD
@@ -0,0 +1 @@
+default_build_make
diff --git a/utils/nocache/DETAILS b/utils/nocache/DETAILS
new file mode 100755
index 0000000..6c8af06
--- /dev/null
+++ b/utils/nocache/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=nocache
+ VERSION=0.9
+ SOURCE="nocache-${VERSION}.zip"
+ SOURCE_URL[0]=https://github.com/Feh/${SPELL}/archive/v${VERSION}.zip
+
SOURCE_HASH=sha512:bf1f9bf1e8c48f732e80c9fe0025e501e0bafe7e1f4953f55811cb6e0d4210708cf46ae7f0da50237075cf2b8b001958b50be3af91ee5c7cb6af4e5d0e5fd6cd
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="https://github.com/Feh/nocache";
+ LICENSE[0]=GPL
+ ENTERED=20130807
+ SHORT="the nocache tool tries to minimize the effect an
application has on the Linux file system cache"
+cat << EOF
+The nocache tool tries to minimize the effect an application has on the Linux
+file system cache. This is done by intercepting the open and close system
calls
+and calling posix_fadvise with the POSIX_FADV_DONTNEED parameter. Because
+the library remembers which pages (ie., 4K-blocks of the file) were already
+in file system cache when the file was opened, these will not be marked as
+"don't need", because other applications might need that, although they are
+not actively used (think: hot standby).
+
+Use case: backup processes that should not interfere with the present state
+of the cache.
+EOF
diff --git a/utils/nocache/HISTORY b/utils/nocache/HISTORY
new file mode 100644
index 0000000..0f263a0
--- /dev/null
+++ b/utils/nocache/HISTORY
@@ -0,0 +1,3 @@
+2013-08-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, BUILD, PRE_BUILD: spell created
+
diff --git a/utils/nocache/PRE_BUILD b/utils/nocache/PRE_BUILD
new file mode 100755
index 0000000..b8fef37
--- /dev/null
+++ b/utils/nocache/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+sedit 's:GCC = gcc :GCC = $(CC) :' Makefile &&
+sedit "s:/usr/local/:$INSTALL_ROOT/usr/:" Makefile

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (48808ff8ee13bec76f737b3a2a4e481e5f7e9c9c), Florian Franzmann, 08/07/2013