From 0926416b6a8cf319211d50eb62c930d5e2669175 Mon Sep 17 00:00:00 2001
From: ffsup2 <ffsup2@localhost>
Date: Mon, 3 Jan 2011 16:43:11 +0100
Subject: [PATCH] Pentax new lens

---
 rtexif/pentaxattribs.cc | 1 +
 rtexif/rtexif.cc        | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/rtexif/pentaxattribs.cc b/rtexif/pentaxattribs.cc
index 6574fba18..ca0498eb2 100644
--- a/rtexif/pentaxattribs.cc
+++ b/rtexif/pentaxattribs.cc
@@ -600,6 +600,7 @@ class PALensTypeInterpreter : public IntLensInterpreter< int > {
             choices.insert(p_t(256*6+ 13, "smc PENTAX-FA* 400mm f/5.6 ED[IF]"));
             choices.insert(p_t(256*6+ 14, "smc PENTAX-FA* MACRO 200mm f/4 ED[IF]"));
             choices.insert(p_t(256*7+ 0, "smc PENTAX-DA 21mm f/3.2 AL Limited"));
+            choices.insert(p_t(256*7+ 58, "smc PENTAX-D FA MACRO 100mm f/2.8 WR"));
             choices.insert(p_t(256*7+ 75, "Tamron SP AF 70-200mm f/2.8 Di LD [IF] Macro (A001)"));
             choices.insert(p_t(256*7+ 214, "smc PENTAX-DA 35mm f/2.4 AL"));
             choices.insert(p_t(256*7+ 216, "smc PENTAX-DA L 55-300mm f/4-5.8 ED"));
diff --git a/rtexif/rtexif.cc b/rtexif/rtexif.cc
index be8c03026..93f0b9aab 100644
--- a/rtexif/rtexif.cc
+++ b/rtexif/rtexif.cc
@@ -571,6 +571,8 @@ Tag::Tag (TagDirectory* p, FILE* f, int base)
 					int offsetFirst = 4;
 					if( strstr(model, "*ist") || strstr(model, "GX-1") || strstr(model, "K100D") || strstr(model, "K110D") )
 						offsetFirst = 3;
+					if( strstr(model, "K-5") || strstr(model, "K-r") )
+						offsetFirst = 12;
 			        directory = new TagDirectory*[2];
 			        directory[1] = NULL;
 					directory[0] = new TagDirectoryTable (parent, f, valuesize,offsetFirst,BYTE , attrib->subdirAttribs, getOrder());