liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support DNG 1.4 files with Floating Point data, Issue 2369, thanks to Javier Celaya

Browse Source
This commit is contained in:
Ingo
2014-05-11 22:23:40 +02:00
parent 9477ded6c5
commit 79ca151cd2
6 changed files with 658 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtengine/dcraw.h
View File

@@ -60,6 +60,7 @@ public:
,getbithuff(this,ifp,zero_after_ff)
,ph1_bithuff(this,ifp,order)
,pana_bits(ifp,load_flags)
,float_raw_image(NULL)
{
aber[0]=aber[1]=aber[2]=aber[3]=1;
gamm[0]=0.45;gamm[1]=4.5;gamm[2]=gamm[3]=gamm[4]=gamm[5]=0;
@@ -90,6 +91,7 @@ protected:
ushort raw_height, raw_width, height, width, top_margin, left_margin;
ushort shrink, iheight, iwidth, fuji_width, thumb_width, thumb_height;
ushort *raw_image;
float * float_raw_image;
ushort white[8][8], curve[0x10000], cr2_slice[3], sraw_mul[4];
int mask[8][4], flip, tiff_flip, colors;
double pixel_aspect;
@@ -123,7 +125,7 @@ protected:
struct tiff_ifd {
int width, height, bps, comp, phint, offset, flip, samples, bytes;
int tile_width, tile_length;
int tile_width, tile_length, sample_format, predictor;
} tiff_ifd[10];
struct ph1 {
@@ -215,6 +217,7 @@ void canon_sraw_load_raw();
void adobe_copy_pixel (unsigned row, unsigned col, ushort **rp);
void lossless_dng_load_raw();
void packed_dng_load_raw();
void deflate_dng_load_raw();
void pentax_load_raw();
void nikon_load_raw();
int nikon_is_compressed();