19 19
copy them from an earlier, non-GPL Revision of dcraw.c, or (c)
20 20
purchase a license from the author.
21 21 22 -
$Revision: 1.282 $
23 -
$Date: 2005/09/06 19:17:07 $
22 +
$Revision: 1.283 $
23 +
$Date: 2005/09/07 06:01:08 $
24 24
*/
25 25 26 26
#define _GNU_SOURCE
@@ -2751,6 +2751,7 @@ void CLASS colorcheck()
2751 2751
for (row=cut[sq][3]; row < cut[sq][3]+cut[sq][1]; row++)
2752 2752
for (col=cut[sq][2]; col < cut[sq][2]+cut[sq][0]; col++) {
2753 2753
c = FC(row,col);
2754 +
if (c >= colors) c -= 2;
2754 2755
gmb_cam[sq][c] += BAYER(row,col);
2755 2756
count[c]++;
2756 2757
}
@@ -2834,6 +2835,7 @@ void CLASS scale_colors()
2834 2835
pre_mul[0] *= red_scale;
2835 2836
pre_mul[2] *= blue_scale;
2836 2837
}
2838 +
if (pre_mul[3] == 0) pre_mul[3] = colors < 4 ? pre_mul[1] : 1;
2837 2839
dmin = DBL_MAX;
2838 2840
FORC4 if (dmin > pre_mul[c])
2839 2841
dmin = pre_mul[c];
@@ -4360,6 +4362,8 @@ void CLASS adobe_coeff()
4360 4362
{ 10473,-3277,-1222,-6421,14252,2352,-1907,2596,7460 } },
4361 4363
{ "SONY DSC-F828",
4362 4364
{ 7924,-1910,-777,-8226,15459,2998,-1517,2199,6818,-7242,11401,3481 } },
4365 +
{ "SONY DSC-R1", /* DJC */
4366 +
{ 10528,-3695,-517,-2822,10699,2124,406,1240,5342 } },
4363 4367
{ "SONY DSC-V3",
4364 4368
{ 9877,-3775,-871,-7613,14807,3072,-1448,1305,7485 } },
4365 4369
};
@@ -5134,6 +5138,11 @@ int CLASS identify (int will_decode)
5134 5138
left_margin = 59;
5135 5139
data_offset = 787392;
5136 5140
load_raw = sony_load_raw;
5141 +
} else if (!strcmp(model,"DSC-R1")) {
5142 +
width = 3925;
5143 +
order = 0x4d4d;
5144 +
load_raw = unpacked_load_raw;
5145 +
black = 512;
5137 5146
} else if (!strcasecmp(make,"KODAK")) {
5138 5147
filters = 0x61616161;
5139 5148
if (!strcmp(model,"NC2000F")) {
@@ -5378,8 +5387,6 @@ int CLASS identify (int will_decode)
5378 5387
if ((filters >> i & 15) == 6)
5379 5388
filters |= 8 << i;
5380 5389
}
5381 -
if (pre_mul[3] == 0) pre_mul[3] = colors < 4 ? pre_mul[1] : 1;
5382 -
if (cam_mul[3] == 0) cam_mul[3] = colors < 4 ? cam_mul[1] : 1;
5383 5390
fseek (ifp, data_offset, SEEK_SET);
5384 5391
return 0;
5385 5392
}
@@ -5665,7 +5672,7 @@ int CLASS main (int argc, char **argv)
5665 5672
if (argc == 1)
5666 5673
{
5667 5674
fprintf (stderr,
5668 -
"\nRaw Photo Decoder \"dcraw\" v7.62"
5675 +
"\nRaw Photo Decoder \"dcraw\" v7.63"
5669 5676
"\nby Dave Coffin, dcoffin a cybercom o net"
5670 5677
"\n\nUsage: %s [options] file1 file2 ...\n"
5671 5678
"\nValid options:"
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4