Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 434102 Details for
Bug 582852
media-libs/libraw-0.17.1: building w/ gcc-6: error: narrowing conversion of '128' from 'int' to 'signed char' inside { } [-Wnarrowing]
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
libraw-0.17.1-gcc6.patch
libraw-0.17.1-gcc6.patch (text/plain), 9.39 KB, created by
Peter Levine
on 2016-05-12 19:04:50 UTC
(
hide
)
Description:
libraw-0.17.1-gcc6.patch
Filename:
MIME Type:
Creator:
Peter Levine
Created:
2016-05-12 19:04:50 UTC
Size:
9.39 KB
patch
obsolete
>diff --git a/dcraw/dcraw.c b/dcraw/dcraw.c >index 3667404..39edcaa 100755 >--- a/dcraw/dcraw.c >+++ b/dcraw/dcraw.c >@@ -5788,30 +5788,37 @@ void CLASS lin_interpolate() > */ > void CLASS vng_interpolate() > { >- static const signed char *cp, terms[] = { >- -2,-2,+0,-1,0,0x01, -2,-2,+0,+0,1,0x01, -2,-1,-1,+0,0,0x01, >- -2,-1,+0,-1,0,0x02, -2,-1,+0,+0,0,0x03, -2,-1,+0,+1,1,0x01, >- -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,-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,-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, >- +1,+0,+2,+1,0,0x10 >- }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 }; >+ struct interpolate_terms { >+ signed char y1, x1, y2, x2, weight; >+ unsigned char grads; >+ }; >+ static const interpolate_terms terms[] = { >+ {-2,-2,+0,-1,0,0x01}, {-2,-2,+0,+0,1,0x01}, {-2,-1,-1,+0,0,0x01}, >+ {-2,-1,+0,-1,0,0x02}, {-2,-1,+0,+0,0,0x03}, {-2,-1,+0,+1,1,0x01}, >+ {-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,-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,-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}, >+ {+1,+0,+2,+1,0,0x10} >+ }; >+ const interpolate_terms *cpt; >+ signed char *cp; >+ signed char chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 }; > ushort (*brow[5])[4], *pix; > int prow=8, pcol=2, *ip, *code[16][16], gval[8], gmin, gmax, sum[4]; > int row, col, x, y, x1, x2, y1, y2, t, weight, grads, color, diag; >@@ -5829,11 +5836,11 @@ void CLASS vng_interpolate() > for (row=0; row < prow; row++) /* Precalculate for VNG */ > for (col=0; col < pcol; col++) { > code[row][col] = ip; >- for (cp=terms, t=0; t < 64; t++) { >- y1 = *cp++; x1 = *cp++; >- y2 = *cp++; x2 = *cp++; >- weight = *cp++; >- grads = *cp++; >+ for (cpt=&terms[0], t=0; t < 64, cpt = &terms[t]; t++) { >+ y1 = cpt->y1; x1 = cpt->x1; >+ y2 = cpt->y2; x2 = cpt->x2; >+ weight = cpt->weight; >+ grads = cpt->grads; > color = fcol(row+y1,col+x1); > if (fcol(row+y2,col+x2) != color) continue; > diag = (fcol(row,col+1) == color && fcol(row+1,col) == color) ? 2:1; >@@ -16289,7 +16296,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); >- 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); >diff --git a/internal/dcraw_common.cpp b/internal/dcraw_common.cpp >index 56f3624..85ef98b 100644 >--- a/internal/dcraw_common.cpp >+++ b/internal/dcraw_common.cpp >@@ -4618,30 +4618,37 @@ void CLASS lin_interpolate() > */ > void CLASS vng_interpolate() > { >- static const signed char *cp, terms[] = { >- -2,-2,+0,-1,0,0x01, -2,-2,+0,+0,1,0x01, -2,-1,-1,+0,0,0x01, >- -2,-1,+0,-1,0,0x02, -2,-1,+0,+0,0,0x03, -2,-1,+0,+1,1,0x01, >- -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,-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,-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, >- +1,+0,+2,+1,0,0x10 >- }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 }; >+ struct interpolate_terms { >+ signed char y1, x1, y2, x2, weight; >+ unsigned char grads; >+ }; >+ static const interpolate_terms terms[] = { >+ {-2,-2,+0,-1,0,0x01}, {-2,-2,+0,+0,1,0x01}, {-2,-1,-1,+0,0,0x01}, >+ {-2,-1,+0,-1,0,0x02}, {-2,-1,+0,+0,0,0x03}, {-2,-1,+0,+1,1,0x01}, >+ {-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,-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,-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}, >+ {+1,+0,+2,+1,0,0x10} >+ }; >+ const interpolate_terms *cpt; >+ signed char *cp; >+ signed char chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 }; > ushort (*brow[5])[4], *pix; > int prow=8, pcol=2, *ip, *code[16][16], gval[8], gmin, gmax, sum[4]; > int row, col, x, y, x1, x2, y1, y2, t, weight, grads, color, diag; >@@ -4659,11 +4666,11 @@ void CLASS vng_interpolate() > for (row=0; row < prow; row++) /* Precalculate for VNG */ > for (col=0; col < pcol; col++) { > code[row][col] = ip; >- for (cp=terms, t=0; t < 64; t++) { >- y1 = *cp++; x1 = *cp++; >- y2 = *cp++; x2 = *cp++; >- weight = *cp++; >- grads = *cp++; >+ for (cpt=&terms[0], t=0; t < 64, cpt = &terms[t]; t++) { >+ y1 = cpt->y1; x1 = cpt->x1; >+ y2 = cpt->y2; x2 = cpt->x2; >+ weight = cpt->weight; >+ grads = cpt->grads; > color = fcol(row+y1,col+x1); > if (fcol(row+y2,col+x2) != color) continue; > diag = (fcol(row,col+1) == color && fcol(row+1,col) == color) ? 2:1; >diff --git a/libraw/libraw_const.h b/libraw/libraw_const.h >index dd716b1..20e043f 100644 >--- a/libraw/libraw_const.h >+++ b/libraw/libraw_const.h >@@ -255,8 +255,7 @@ enum LibRaw_progress > > LIBRAW_PROGRESS_THUMB_LOAD = 1<<28, > LIBRAW_PROGRESS_TRESERVED1 = 1<<29, >- LIBRAW_PROGRESS_TRESERVED2 = 1<<30, >- LIBRAW_PROGRESS_TRESERVED3 = 1<<31 >+ LIBRAW_PROGRESS_TRESERVED2 = 1<<30 > }; > #define LIBRAW_PROGRESS_THUMB_MASK 0x0fffffff >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=434102">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 582852
: 434102
