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

Support for Fuji X-Trans-Sensor, Issue 2415 (thanks to Hombre for the changes to gui); Clip Control for Flat Field correction, Issue 2441; Update to dcraw 9.22 1.467

Browse Source
This commit is contained in:
Ingo
2014-07-10 00:33:33 +02:00
parent 3cf0da217a
commit 617b888fa0
65 changed files with 3832 additions and 1330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
rtengine/dcraw.patch
View File

@@ -1,5 +1,5 @@
--- dcraw.c 2014-06-18 17:38:12 +0000
+++ dcraw.cc 2014-06-18 17:46:28 +0000
--- dcraw.c 2014-07-09 20:35:27 +0000
+++ dcraw.cc 2014-07-09 10:46:35 +0000
@@ -1,3 +1,15 @@
+/*RT*/#include <glib.h>
+/*RT*/#include <glib/gstdio.h>
@@ -77,7 +77,7 @@
-FILE *ifp, *ofp;
-short order;
-const char *ifname;
-char *meta_data, xtrans[6][6];
-char *meta_data, xtrans[6][6], xtrans_abs[6][6];
-char cdesc[5], desc[512], make[64], model[64], model2[64], artist[64];
-float flash_used, canon_ev, iso_speed, shutter, aperture, focal_len;
-time_t timestamp;
@@ -160,7 +160,7 @@
@@ -255,6 +216,7 @@
if (filters == 1) return filter[(row+top_margin)&15][(col+left_margin)&15];
if (filters == 9) return xtrans[(row+top_margin+6)%6][(col+left_margin+6)%6];
if (filters == 9) return xtrans[(row+6) % 6][(col+6) % 6];
+
return FC(row,col);
}
@@ -182,7 +182,7 @@
}
void CLASS cubic_spline (const int *x_, const int *y_, const int len)
@@ -595,10 +558,10 @@
@@ -597,10 +560,10 @@
return 0;
}
@@ -196,7 +196,7 @@
unsigned c;
if (nbits > 25) return 0;
@@ -1263,14 +1226,14 @@
@@ -1265,14 +1228,14 @@
int i, nz;
char tail[424];
@@ -213,7 +213,7 @@
void CLASS ppm_thumb()
{
@@ -1632,10 +1595,10 @@
@@ -1634,10 +1597,10 @@
}
}
@@ -227,7 +227,7 @@
unsigned c;
if (nbits == -1)
@@ -1901,10 +1864,10 @@
@@ -1903,10 +1866,10 @@
maximum = curve[0x3ff];
}
@@ -241,7 +241,7 @@
int byte;
if (!nbits) return vbits=0;
@@ -2193,11 +2156,11 @@
@@ -2195,11 +2158,11 @@
METHODDEF(boolean)
fill_input_buffer (j_decompress_ptr cinfo)
{
@@ -255,7 +255,7 @@
cinfo->src->next_input_byte = jpeg_buffer;
cinfo->src->bytes_in_buffer = nbytes;
return TRUE;
@@ -2522,10 +2485,9 @@
@@ -2524,10 +2487,9 @@
maximum = (1 << (thumb_misc & 31)) - 1;
}
@@ -268,7 +268,7 @@
if (start) {
for (p=0; p < 4; p++)
pad[p] = key = key * 48828125 + 1;
@@ -2610,11 +2572,13 @@
@@ -2612,11 +2574,13 @@
bit += 7;
}
for (i=0; i < 16; i++, col+=2)
@@ -283,7 +283,7 @@
}
void CLASS samsung_load_raw()
@@ -2861,7 +2825,7 @@
@@ -2863,7 +2827,7 @@
void CLASS foveon_decoder (unsigned size, unsigned code)
{
@@ -292,7 +292,7 @@
struct decode *cur;
int i, len;
@@ -3584,10 +3548,13 @@
@@ -3586,10 +3550,13 @@
}
}
} else {
@@ -308,7 +308,7 @@
if (mask[0][3] > 0) goto mask_set;
if (load_raw == &CLASS canon_load_raw ||
load_raw == &CLASS lossless_jpeg_load_raw) {
@@ -4183,239 +4150,8 @@
@@ -4191,239 +4158,8 @@
}
}
@@ -549,7 +549,7 @@
void CLASS cielab (ushort rgb[3], short lab[3])
{
@@ -4676,112 +4412,7 @@
@@ -4684,112 +4420,7 @@
}
#undef fcol
@@ -662,7 +662,7 @@
#undef TS
void CLASS median_filter()
@@ -4951,7 +4582,7 @@
@@ -4959,7 +4590,7 @@
}
}
@@ -671,7 +671,7 @@
void CLASS parse_makernote (int base, int uptag)
{
@@ -5108,7 +4739,8 @@
@@ -5116,7 +4747,8 @@
cam_mul[2] = get4() << 2;
}
}
@@ -681,7 +681,7 @@
fread (model, 64, 1, ifp);
if (strstr(make,"PENTAX")) {
if (tag == 0x1b) tag = 0x1018;
@@ -5359,7 +4991,7 @@
@@ -5367,7 +4999,7 @@
{ "","DCB2","Volare","Cantare","CMost","Valeo 6","Valeo 11","Valeo 22",
"Valeo 11p","Valeo 17","","Aptus 17","Aptus 22","Aptus 75","Aptus 65",
"Aptus 54S","Aptus 65S","Aptus 75S","AFi 5","AFi 6","AFi 7",
@@ -690,7 +690,7 @@
"","","","","Aptus-II 10R","Aptus-II 8","","Aptus-II 12","","AFi-II 12" };
float romm_cam[3][3];
@@ -5448,6 +5080,8 @@
@@ -5456,6 +5088,8 @@
wbi = -2;
}
if (tag == 2118) wbtemp = getint(type);
@@ -699,7 +699,7 @@
if (tag == 2130 + wbi)
FORC3 mul[c] = getreal(type);
if (tag == 2140 + wbi && wbi >= 0)
@@ -5467,8 +5101,8 @@
@@ -5475,8 +5109,8 @@
}
}
@@ -710,7 +710,7 @@
int CLASS parse_tiff_ifd (int base)
{
@@ -5481,7 +5115,7 @@
@@ -5489,7 +5123,7 @@
unsigned sony_curve[] = { 0,0,0,0,0,4095 };
unsigned *buf, sony_offset=0, sony_length=0, sony_key=0;
struct jhead jh;
@@ -719,7 +719,7 @@
if (tiff_nifds >= sizeof tiff_ifd / sizeof tiff_ifd[0])
return 1;
@@ -5555,7 +5189,8 @@
@@ -5564,7 +5198,8 @@
fgets (make, 64, ifp);
break;
case 272: /* Model */
@@ -729,7 +729,7 @@
break;
case 280: /* Panasonic RW2 offset */
if (type != 4) break;
@@ -5611,6 +5246,9 @@
@@ -5620,6 +5255,9 @@
case 315: /* Artist */
fread (artist, 64, 1, ifp);
break;
@@ -739,7 +739,7 @@
case 322: /* TileWidth */
tiff_ifd[ifd].tile_width = getint(type);
break;
@@ -5626,6 +5264,9 @@
@@ -5635,6 +5273,9 @@
is_raw = 5;
}
break;
@@ -749,7 +749,7 @@
case 330: /* SubIFDs */
if (!strcmp(model,"DSLR-A100") && tiff_ifd[ifd].width == 3872) {
load_raw = &CLASS sony_arw_load_raw;
@@ -5639,6 +5280,9 @@
@@ -5648,6 +5289,9 @@
fseek (ifp, i+4, SEEK_SET);
}
break;
@@ -759,7 +759,7 @@
case 400:
strcpy (make, "Sarnoff");
maximum = 0xfff;
@@ -5820,6 +5464,9 @@
@@ -5828,6 +5472,9 @@
if (!make[0]) strcpy (make, "DNG");
is_raw = 1;
break;
@@ -769,7 +769,7 @@
case 50710: /* CFAPlaneColor */
if (filters == 9) break;
if (len > 4) len = 4;
@@ -5851,10 +5498,21 @@
@@ -5859,10 +5506,21 @@
case 61450:
cblack[4] = cblack[5] = MIN(sqrt(len),64);
case 50714: /* BlackLevel */
@@ -795,7 +795,7 @@
case 50715: /* BlackLevelDeltaH */
case 50716: /* BlackLevelDeltaV */
for (num=i=0; i < len; i++)
@@ -5932,12 +5590,15 @@
@@ -5940,12 +5598,15 @@
fread (buf, sony_length, 1, ifp);
sony_decrypt (buf, sony_length/4, 1, sony_key);
sfp = ifp;
@@ -817,7 +817,7 @@
ifp = sfp;
free (buf);
}
@@ -5961,6 +5622,7 @@
@@ -5969,6 +5630,7 @@
int CLASS parse_tiff (int base)
{
int doff;
@@ -825,7 +825,7 @@
fseek (ifp, base, SEEK_SET);
order = get2();
@@ -6038,7 +5700,7 @@
@@ -6046,7 +5708,7 @@
case 8: load_raw = &CLASS eight_bit_load_raw; break;
case 12: if (tiff_ifd[raw].phint == 2)
load_flags = 6;
@@ -834,7 +834,7 @@
case 14: load_flags = 0;
case 16: load_raw = &CLASS unpacked_load_raw;
if (!strncmp(make,"OLYMPUS",7) &&
@@ -6071,6 +5733,7 @@
@@ -6079,6 +5741,7 @@
case 32803: load_raw = &CLASS kodak_65000_load_raw;
}
case 32867: case 34892: break;
@@ -842,7 +842,7 @@
default: is_raw = 0;
}
if (!dng_version)
@@ -6156,7 +5819,7 @@
@@ -6164,7 +5827,7 @@
{
const char *file, *ext;
char *jname, *jfile, *jext;
@@ -851,7 +851,7 @@
ext = strrchr (ifname, '.');
file = strrchr (ifname, '/');
@@ -6178,13 +5841,14 @@
@@ -6186,13 +5849,14 @@
} else
while (isdigit(*--jext)) {
if (*jext != '9') {
@@ -868,7 +868,7 @@
if (verbose)
fprintf (stderr,_("Reading metadata from %s ...\n"), jname);
parse_tiff (12);
@@ -6529,7 +6193,11 @@
@@ -6537,7 +6201,11 @@
order = get2();
hlen = get4();
if (get4() == 0x48454150) /* "HEAP" */
@@ -880,7 +880,7 @@
if (parse_tiff (save+6)) apply_tiff();
fseek (ifp, save+len, SEEK_SET);
}
@@ -6781,7 +6449,8 @@
@@ -6789,7 +6457,8 @@
{
static const struct {
const char *prefix;
@@ -890,7 +890,7 @@
} table[] = {
{ "AgfaPhoto DC-833m", 0, 0, /* DJC */
{ 11438,-3762,-1115,-2409,9914,2497,-1227,2295,5300 } },
@@ -7668,6 +7337,27 @@
@@ -7690,6 +7359,27 @@
}
break;
}
@@ -918,7 +918,7 @@
}
void CLASS simple_coeff (int index)
@@ -7945,7 +7635,7 @@
@@ -7967,7 +7657,7 @@
tiff_flip = flip = filters = UINT_MAX; /* unknown */
raw_height = raw_width = fuji_width = fuji_layout = cr2_slice[0] = 0;
maximum = height = width = top_margin = left_margin = 0;
@@ -927,7 +927,7 @@
iso_speed = shutter = aperture = focal_len = unique_id = 0;
tiff_nifds = 0;
memset (tiff_ifd, 0, sizeof tiff_ifd);
@@ -7977,13 +7667,20 @@
@@ -7999,13 +7689,20 @@
fread (head, 1, 32, ifp);
fseek (ifp, 0, SEEK_END);
flen = fsize = ftell(ifp);
@@ -950,7 +950,7 @@
parse_ciff (hlen, flen-hlen, 0);
load_raw = &CLASS canon_load_raw;
} else if (parse_tiff(0)) apply_tiff();
@@ -8029,6 +7726,7 @@
@@ -8051,6 +7748,7 @@
fseek (ifp, 100+28*(shot_select > 0), SEEK_SET);
parse_tiff (data_offset = get4());
parse_tiff (thumb_offset+12);
@@ -958,7 +958,7 @@
apply_tiff();
} else if (!memcmp (head,"RIFF",4)) {
fseek (ifp, 0, SEEK_SET);
@@ -8138,15 +7836,18 @@
@@ -8160,15 +7858,18 @@
if (make[0] == 0) parse_smal (0, flen);
if (make[0] == 0) {
parse_jpeg(0);
@@ -986,7 +986,7 @@
}
for (i=0; i < sizeof corp / sizeof *corp; i++)
@@ -8179,7 +7880,7 @@
@@ -8201,7 +7902,7 @@
if (height == 3136 && width == 4864) /* Pentax K20D and Samsung GX20 */
{ height = 3124; width = 4688; filters = 0x16161616; }
if (width == 4352 && (!strcmp(model,"K-r") || !strcmp(model,"K-x")))
@@ -995,7 +995,7 @@
if (width >= 4960 && !strncmp(model,"K-5",3))
{ left_margin = 10; width = 4950; filters = 0x16161616; }
if (width == 4736 && !strcmp(model,"K-7"))
@@ -8198,6 +7899,7 @@
@@ -8220,6 +7921,7 @@
switch (tiff_compress) {
case 1: load_raw = &CLASS packed_dng_load_raw; break;
case 7: load_raw = &CLASS lossless_dng_load_raw; break;
@@ -1003,7 +1003,7 @@
case 34892: load_raw = &CLASS lossy_dng_load_raw; break;
default: load_raw = 0;
}
@@ -8325,7 +8027,7 @@
@@ -8347,7 +8049,7 @@
width -= 44;
} else if (!strcmp(model,"D3200") ||
!strcmp(model,"D600") ||
@@ -1012,7 +1012,7 @@
width -= 46;
} else if (!strcmp(model,"D4") ||
!strcmp(model,"Df")) {
@@ -8542,6 +8244,7 @@
@@ -8567,6 +8269,7 @@
if (load_raw == &CLASS lossless_jpeg_load_raw)
load_raw = &CLASS hasselblad_load_raw;
if (raw_width == 7262) {
@@ -1020,7 +1020,7 @@
height = 5444;
width = 7248;
top_margin = 4;
@@ -8553,13 +8256,31 @@
@@ -8578,13 +8281,31 @@
top_margin = 4;
left_margin = 41;
filters = 0x61616161;
@@ -1054,7 +1054,7 @@
} else if (raw_width == 4090) {
strcpy (model, "V96C");
height -= (top_margin = 6);
@@ -8612,6 +8333,7 @@
@@ -8637,6 +8358,7 @@
filters = 0x16161616;
}
} else if (!strcmp(make,"Leica") || !strcmp(make,"Panasonic")) {
@@ -1062,7 +1062,7 @@
if ((flen - data_offset) / (raw_width*8/7) == raw_height)
load_raw = &CLASS panasonic_load_raw;
if (!load_raw) {
@@ -8629,6 +8351,7 @@
@@ -8654,6 +8376,7 @@
}
filters = 0x01010101 * (uchar) "\x94\x61\x49\x16"
[((filters-1) ^ (left_margin & 1) ^ (top_margin << 1)) & 3];
@@ -1070,7 +1070,7 @@
} else if (!strcmp(model,"C770UZ")) {
height = 1718;
width = 2304;
@@ -8856,6 +8579,10 @@
@@ -8883,6 +8606,10 @@
memcpy (rgb_cam, cmatrix, sizeof cmatrix);
raw_color = 0;
}
@@ -1081,7 +1081,7 @@
if (raw_color) adobe_coeff (make, model);
if (load_raw == &CLASS kodak_radc_load_raw)
if (raw_color) adobe_coeff ("Apple","Quicktake");
@@ -8872,7 +8599,7 @@
@@ -8899,7 +8626,7 @@
if (!tiff_bps) tiff_bps = 12;
if (!maximum) maximum = (1 << tiff_bps) - 1;
if (!load_raw || height < 22 || width < 22 ||
@@ -1090,7 +1090,7 @@
is_raw = 0;
#ifdef NO_JASPER
if (load_raw == &CLASS redcine_load_raw) {
@@ -8951,194 +8678,245 @@
@@ -8978,194 +8705,245 @@
}
#endif
@@ -1511,7 +1511,7 @@
struct tiff_tag {
ushort tag, type;
@@ -9161,585 +8939,12 @@
@@ -9188,585 +8966,12 @@
unsigned gps[26];
char desc[512], make[64], model[64], soft[32], date[20], artist[64];
};