Update to dcraw 9.25, Revision: 1.475

This commit is contained in:
Ingo
2015-04-28 15:36:50 +02:00
parent ae6dccacfa
commit 34a419a6ca
4 changed files with 1074 additions and 573 deletions

View File

@@ -91,9 +91,9 @@ protected:
unsigned tile_width, tile_length, gpsdata[32], load_flags;
ushort raw_height, raw_width, height, width, top_margin, left_margin;
ushort shrink, iheight, iwidth, fuji_width, thumb_width, thumb_height;
ushort *raw_image;
ushort *raw_image;
float * float_raw_image;
ushort white[8][8], curve[0x10000], cr2_slice[3], sraw_mul[4];
ushort white[8][8], curve[0x10000], cr2_slice[3], sraw_mul[4];
int mask[8][4], flip, tiff_flip, colors;
double pixel_aspect;
double aber[4];
@@ -130,9 +130,9 @@ protected:
} tiff_ifd[10];
struct ph1 {
int format, key_off, tag_21a;
int black, split_col, black_col, split_row, black_row;
float tag_210;
int format, key_off, tag_21a;
int black, split_col, black_col, split_row, black_row;
float tag_210;
} ph1;
struct hbd {
off_t levels, unknown1, flatfield;
@@ -239,6 +239,11 @@ int raw (unsigned row, unsigned col);
void phase_one_flat_field (int is_float, int nc);
void phase_one_correct();
void phase_one_load_raw();
void nikon_yuv_load_raw();
void kodak_c330_load_raw();
void kodak_c603_load_raw();
void samsung3_load_raw();
void parse_qt (int end);
// ph1_bithuff(int nbits, ushort *huff);
class ph1_bithuff_t {