From 77cf129bf23e8cb7aff9048f67fe4e56f849f8fa Mon Sep 17 00:00:00 2001
From: heckflosse <heckflosse67@gmx.de>
Date: Tue, 24 Nov 2015 21:29:35 +0100
Subject: [PATCH] Fix Sony 12 bit uncompressed bug

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

diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc
index 321cc919f..aba4d38d7 100644
--- a/rtengine/dcraw.cc
+++ b/rtengine/dcraw.cc
@@ -6206,7 +6206,12 @@ void CLASS apply_tiff()
 	  case  8: load_raw = &CLASS eight_bit_load_raw;	break;
 	  case 12: if (tiff_ifd[raw].phint == 2)
 		     load_flags = 6;
-		   load_raw = &CLASS packed_load_raw;			break;
+           if(tiff_ifd[raw].comp != 1) {
+		     load_raw = &CLASS packed_load_raw;
+		     break;
+           } else {
+               tiff_bps = 14;
+           }
 	  case 14: load_flags = 0;
 	  case 16: load_raw = &CLASS unpacked_load_raw;
 		   if (!strncmp(make,"OLYMPUS",7) &&