Correction to last commit

This commit is contained in:
heckflosse
2015-11-27 13:46:02 +01:00
parent a27327de33
commit 156fe7cdf4
2 changed files with 13 additions and 13 deletions

View File

@@ -1,5 +1,5 @@
--- dcraw.c 2015-11-24 19:17:16 +0000
+++ dcraw.cc 2015-11-24 20:04:38 +0000
+++ dcraw.cc 2015-11-27 12:35:05 +0000
@@ -1,3 +1,15 @@
+/*RT*/#include <glib.h>
+/*RT*/#include <glib/gstdio.h>
@@ -1287,12 +1287,12 @@
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;
+ }
+ if(!strncmp(make,"SONY",4) && tiff_ifd[raw].comp == 1) { // hack for some sony cameras which report as 12 bit uncompressed but in fact are 14 bit uncompressed
+ tiff_bps = 14;
+ } else {
+ load_raw = &CLASS packed_load_raw;
+ break;
+ }
case 14: load_flags = 0;
case 16: load_raw = &CLASS unpacked_load_raw;
if (!strncmp(make,"OLYMPUS",7) &&