]>
Commit | Line | Data |
---|---|---|
b5d616e4 JB |
1 | --- exact-image-0.9.2/codecs/dcraw.h.orig 2015-07-16 17:20:12.000000000 +0200 |
2 | +++ exact-image-0.9.2/codecs/dcraw.h 2017-02-27 21:56:41.760310486 +0100 | |
3 | @@ -4387,7 +4387,7 @@ | |
4 | */ | |
5 | void CLASS vng_interpolate() | |
6 | { | |
7 | - static const signed char *cp, terms[] = { | |
8 | + static const short *cp, terms[] = { | |
9 | -2,-2,+0,-1,0,0x01, -2,-2,+0,+0,1,0x01, -2,-1,-1,+0,0,0x01, | |
10 | -2,-1,+0,-1,0,0x02, -2,-1,+0,+0,0,0x03, -2,-1,+0,+1,1,0x01, | |
11 | -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03, | |
12 | @@ -6979,7 +6979,7 @@ | |
13 | { | |
14 | static const struct { | |
15 | const char *prefix; | |
16 | - short black, maximum, trans[12]; | |
17 | + unsigned short black, maximum; short trans[12]; | |
18 | } table[] = { | |
19 | { "AgfaPhoto DC-833m", 0, 0, /* DJC */ | |
20 | { 11438,-3762,-1115,-2409,9914,2497,-1227,2295,5300 } }, | |
21 | @@ -7915,11 +7915,11 @@ | |
22 | sprintf (name, "%s %s", make, model); | |
23 | for (i=0; i < sizeof table / sizeof *table; i++) | |
24 | if (!strncmp (name, table[i].prefix, strlen(table[i].prefix))) { | |
25 | - if (table[i].black) black = (ushort) table[i].black; | |
26 | - if (table[i].maximum) maximum = (ushort) table[i].maximum; | |
27 | + if (table[i].black) black = table[i].black; | |
28 | + if (table[i].maximum) maximum = table[i].maximum; | |
29 | if (table[i].trans[0]) { | |
30 | for (raw_color = j=0; j < 12; j++) | |
0f3a6839 | 31 | - ((double *)cam_xyz)[j] = table[i].trans[j] / 10000.0; |
b5d616e4 JB |
32 | + cam_xyz[j / 3][j % 3] = table[i].trans[j] / 10000.0; |
33 | cam_xyz_coeff (rgb_cam, cam_xyz); | |
34 | } | |
35 | break; | |
36 | @@ -9547,7 +9547,7 @@ | |
37 | strncpy (th->desc, desc, 512); | |
38 | strncpy (th->make, make, 64); | |
39 | strncpy (th->model, model, 64); | |
40 | - strcpy (th->soft, "dcraw v"DCRAW_VERSION); | |
41 | + strcpy (th->soft, "dcraw v" DCRAW_VERSION); | |
42 | t = localtime (×tamp); | |
43 | sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d", | |
44 | t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec); |