From 134f88e221eceb5aa849709a9f28cce0c48fd21b Mon Sep 17 00:00:00 2001
From: Wyatt Olson <wyatt@digitalcave.ca>
Date: Mon, 18 Oct 2010 18:51:27 -0600
Subject: [PATCH] Updated dcraw to work better with Pentax files (thanks to
 Bill Siegmund)

---
 rtengine/dcraw.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc
index 9b14bdb8a..ca2543678 100644
--- a/rtengine/dcraw.cc
+++ b/rtengine/dcraw.cc
@@ -6909,6 +6909,8 @@ void CLASS identify()
   if (height == 3136 && width == 4736)	/* Pentax K-7 */
     { height  = 3122;   width  = 4684;
       top_margin = 2;  filters = 0x16161616; }
+  if (height == 2868 && width == 4352)	/* Pentax K-x */
+                        width  = 4308;
   if (height == 3014 && width == 4096)	/* Ricoh GX200 */
 			width  = 4014;
   if (dng_version) {
@@ -7456,7 +7458,7 @@ konica_400z:
   } else if (!strcmp(model,"K20D")) {
     filters = 0x16161616;
   } else if (!strcmp(model,"K-x")) {
-    width = 4309;
+    width = 4308;
     filters = 0x16161616;
   } else if (!strcmp(model,"Optio S")) {
     if (fsize == 3178560) {