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

Merge pull request #2974 from innir/dcraw_signed_char

Browse Source 
Change type of src to 'signed char' as it contains negative numbers.
This commit is contained in:
Ingo Weyrich 2015-11-12 00:27:13 +01:00
commit 3ea11fcfcd
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/dcraw.cc
View File

@ -2434,7 +2434,7 @@ void CLASS quicktake_100_load_raw()
void CLASS kodak_radc_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,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, 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, 2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8,

13
rtengine/dcraw.patch
View File

@ -1,5 +1,5 @@
--- dcraw.c 2015-11-09 18:41:53 +0000 --- dcraw.c 2015-08-14 17:00:16.510826333 +0200
+++ dcraw.cc 2015-11-10 17:09:14 +0000 +++ dcraw.cc 2015-11-11 19:33:55.576308113 +0100
@@ -1,3 +1,15 @@ @@ -1,3 +1,15 @@
+/*RT*/#include <glib.h> +/*RT*/#include <glib.h>
+/*RT*/#include <glib/gstdio.h> +/*RT*/#include <glib/gstdio.h>
@ -587,6 +587,15 @@
int byte; int byte;
if (!nbits) return vbits=0; if (!nbits) return vbits=0;
@@ -2140,7 +2434,7 @@
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,
@@ -2246,11 +2540,11 @@ @@ -2246,11 +2540,11 @@
METHODDEF(boolean) METHODDEF(boolean)
fill_input_buffer (j_decompress_ptr cinfo) fill_input_buffer (j_decompress_ptr cinfo)