forked from Lainports/opnsense-ports
60 lines
3.1 KiB
C++
60 lines
3.1 KiB
C++
https://github.com/LibRaw/LibRaw/commit/f4c0b98581a6
|
|
https://github.com/LibRaw/LibRaw/commit/2cef10389486
|
|
|
|
--- Source/LibRawLite/internal/dcraw_common.cpp.orig 2014-02-07 19:48:10 UTC
|
|
+++ Source/LibRawLite/internal/dcraw_common.cpp
|
|
@@ -2027,7 +2027,7 @@ void CLASS quicktake_100_load_raw()
|
|
|
|
void CLASS kodak_radc_load_raw()
|
|
{
|
|
- static const char src[] = {
|
|
+ static const signed char src[] = {
|
|
1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8,
|
|
1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8,
|
|
2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8,
|
|
@@ -3782,22 +3782,22 @@ void CLASS vng_interpolate()
|
|
-2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03,
|
|
-2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06,
|
|
-2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04,
|
|
- -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
|
|
- -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40,
|
|
+ -1,-2,-1,+0,0,-128, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
|
|
+ -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,-120, -1,-1,+1,-2,0,0x40,
|
|
-1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11,
|
|
-1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11,
|
|
-1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22,
|
|
-1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44,
|
|
-1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10,
|
|
-1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04,
|
|
- +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40,
|
|
+ +0,-2,+0,+0,1,-128, +0,-1,+0,+1,1,-120, +0,-1,+1,-2,0,0x40,
|
|
+0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20,
|
|
+0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08,
|
|
+0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20,
|
|
+0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44,
|
|
+0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60,
|
|
- +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80,
|
|
- +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
|
|
+ +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,-128,
|
|
+ +1,-1,+1,+1,0,-120, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
|
|
+1,+0,+2,+1,0,0x10
|
|
}, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 };
|
|
ushort (*brow[5])[4], *pix;
|
|
@@ -7380,7 +7380,7 @@ void CLASS adobe_coeff (const char *t_make, const char
|
|
{ 8035,435,-962,-6001,13872,2320,-1159,3065,5434 } },
|
|
{ "Phase One P65", 0, 0,
|
|
{ 8035,435,-962,-6001,13872,2320,-1159,3065,5434 } },
|
|
- { "Red One", 704, 0xffff, /* DJC */
|
|
+ { "Red One", 704, -1, /* DJC */
|
|
{ 21014,-7891,-2613,-3056,12201,856,-2203,5125,8042 } },
|
|
{ "Samsung EK-GN120", 0, 0, /* Adobe; Galaxy NX */
|
|
{ 7557,-2522,-739,-4679,12949,1894,-840,1777,5311 } },
|
|
@@ -9235,7 +9235,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full)
|
|
strncpy (th->t_desc, desc, 512);
|
|
strncpy (th->t_make, make, 64);
|
|
strncpy (th->t_model, model, 64);
|
|
- strcpy (th->soft, "dcraw v"DCRAW_VERSION);
|
|
+ strcpy (th->soft, "dcraw v" DCRAW_VERSION);
|
|
t = localtime (×tamp);
|
|
sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d",
|
|
t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);
|