diff options
Diffstat (limited to 'graphics/exact-image/files/patch-codecs_dcraw.h')
| -rw-r--r-- | graphics/exact-image/files/patch-codecs_dcraw.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/graphics/exact-image/files/patch-codecs_dcraw.h b/graphics/exact-image/files/patch-codecs_dcraw.h index ddd61241f099..1f24056e75d5 100644 --- a/graphics/exact-image/files/patch-codecs_dcraw.h +++ b/graphics/exact-image/files/patch-codecs_dcraw.h @@ -1,8 +1,8 @@ ---- codecs/dcraw.h.orig 2015-07-16 15:20:12 UTC +--- codecs/dcraw.h.orig 2018-06-06 15:17:56 UTC +++ codecs/dcraw.h -@@ -843,8 +843,9 @@ int CLASS ljpeg_start (struct jhead *jh, int info_only +@@ -825,8 +825,9 @@ int CLASS ljpeg_start (struct jhead *jh, int info_only do { - fread (data, 2, 2, ifp); + if (!fread (data, 2, 2, ifp)) return 0; tag = data[0] << 8 | data[1]; - len = (data[2] << 8 | data[3]) - 2; - if (tag <= 0xff00) return 0; @@ -12,7 +12,7 @@ fread (data, 1, len, ifp); switch (tag) { case 0xffc3: -@@ -4393,22 +4394,22 @@ void CLASS vng_interpolate() +@@ -4438,22 +4439,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, @@ -40,16 +40,16 @@ +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; -@@ -7771,7 +7772,7 @@ void CLASS adobe_coeff (const char *make, const char * - { 8035,435,-962,-6001,13872,2320,-1159,3065,5434 } }, - { "Phase One P65", 0, 0, +@@ -8096,7 +8097,7 @@ void CLASS adobe_coeff (const char *make, const char * { 8035,435,-962,-6001,13872,2320,-1159,3065,5434 } }, + { "Photron BC2-HD", 0, 0, /* DJC */ + { 14603,-4122,-528,-1810,9794,2017,-297,2763,5936 } }, - { "Red One", 704, 0xffff, /* DJC */ + { "Red One", 704, -1, /* DJC */ { 21014,-7891,-2613,-3056,12201,856,-2203,5125,8042 } }, - { "Samsung EX1", 0, 0x3e00, - { 8898,-2498,-994,-3144,11328,2066,-760,1381,4576 } }, -@@ -9547,7 +9548,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full) + { "Ricoh GR II", 0, 0, + { 4630,-834,-423,-4977,12805,2417,-638,1467,6115 } }, +@@ -9956,7 +9957,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full) strncpy (th->desc, desc, 512); strncpy (th->make, make, 64); strncpy (th->model, model, 64); |