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

Fix all warnings in demosaic_algos.cc

Browse Source
This commit is contained in:
heckflosse 2017-03-31 19:07:58 +02:00
parent 7fca8c16ee
commit 071d960035
5 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/dcraw.cc
View File

@ -5897,7 +5897,7 @@ int CLASS parse_tiff_ifd (int base)
break; break;
case 33422: /* CFAPattern */ case 33422: /* CFAPattern */
if (filters == 9) { if (filters == 9) {
FORC(36) ((char *)xtrans)[c] = fgetc(ifp) & 3; FORC(36) ((int *)xtrans)[c] = fgetc(ifp) & 3;
break; break;
} }
case 64777: /* Kodak P-series */ case 64777: /* Kodak P-series */
@ -9020,7 +9020,7 @@ canon_a5:
} }
if (fuji_layout) raw_width *= is_raw; if (fuji_layout) raw_width *= is_raw;
if (filters == 9) if (filters == 9)
FORC(36) ((char *)xtrans)[c] = FORC(36) ((int *)xtrans)[c] =
xtrans_abs[(c/6+top_margin) % 6][(c+left_margin) % 6]; xtrans_abs[(c/6+top_margin) % 6][(c+left_margin) % 6];
} else if (!strcmp(model,"KD-400Z")) { } else if (!strcmp(model,"KD-400Z")) {
height = 1712; height = 1712;

3
rtengine/dcraw.h
View File

@ -76,7 +76,8 @@ protected:
FILE *ofp; FILE *ofp;
short order; short order;
const char *ifname; const char *ifname;
char *meta_data, xtrans[6][6],xtrans_abs[6][6]; char *meta_data;
int xtrans[6][6],xtrans_abs[6][6];
char cdesc[5], desc[512], make[64], model[64], model2[64], model3[64], artist[64]; char cdesc[5], desc[512], make[64], model[64], model2[64], model3[64], artist[64];
float flash_used, canon_ev, iso_speed, shutter, aperture, focal_len; float flash_used, canon_ev, iso_speed, shutter, aperture, focal_len;
time_t timestamp; time_t timestamp;

64
rtengine/demosaic_algos.cc
View File

@ -1,4 +1,3 @@
/*
/* /*
* This file is part of RawTherapee. * This file is part of RawTherapee.
* *
@ -602,7 +601,7 @@ void RawImageSource::vng4_demosaic ()
const unsigned prefilters = ri->prefilters; const unsigned prefilters = ri->prefilters;
const int width = W, height = H; const int width = W, height = H;
const int colors = 4; constexpr unsigned int colors = 4;
float (*image)[4]; float (*image)[4];
image = (float (*)[4]) calloc (height * width, sizeof * image); image = (float (*)[4]) calloc (height * width, sizeof * image);
@ -648,7 +647,7 @@ void RawImageSource::vng4_demosaic ()
int colcount = 0; int colcount = 0;
for (int c = 0; c < colors; c++) for (unsigned int c = 0; c < colors; c++)
if (c != fc(row, col)) { if (c != fc(row, col)) {
*ip++ = c; *ip++ = c;
csum[row][col][colcount] = sum[c]; csum[row][col][colcount] = sum[c];
@ -671,7 +670,7 @@ void RawImageSource::vng4_demosaic ()
sum[ip[1]] += pix[ip[0]] * mul[row & 15][col & 15][i]; sum[ip[1]] += pix[ip[0]] * mul[row & 15][col & 15][i];
} }
for (int i = 0; i < colors - 1; i++, ip++) { for (unsigned int i = 0; i < colors - 1; i++, ip++) {
pix[ip[0]] = sum[ip[0]] / csum[row & 15][col & 15][i]; pix[ip[0]] = sum[ip[0]] / csum[row & 15][col & 15][i];
} }
} }
@ -694,7 +693,7 @@ void RawImageSource::vng4_demosaic ()
int x2 = *cp++; int x2 = *cp++;
int weight = *cp++; int weight = *cp++;
int grads = *cp++; int grads = *cp++;
int color = fc(row + y1, col + x1); unsigned int color = fc(row + y1, col + x1);
if (fc(row + y2, col + x2) != color) { if (fc(row + y2, col + x2) != color) {
continue; continue;
@ -724,7 +723,7 @@ void RawImageSource::vng4_demosaic ()
int y = *cp++; int y = *cp++;
int x = *cp++; int x = *cp++;
*ip++ = (y * width + x) * 4; *ip++ = (y * width + x) * 4;
int color = fc(row, col); unsigned int color = fc(row, col);
if (fc(row + y, col + x) != color && fc(row + y * 2, col + x * 2) == color) { if (fc(row + y, col + x) != color && fc(row + y * 2, col + x * 2) == color) {
*ip++ = (y * width + x) * 8 + color; *ip++ = (y * width + x) * 8 + color;
@ -878,7 +877,7 @@ void RawImageSource::vng4_demosaic ()
#define fc(row,col) \ #define fc(row,col) \
(ri->get_filters() >> ((((row) << 1 & 14) + ((col) & 1)) << 1) & 3) (ri->get_filters() >> ((((row) << 1 & 14) + ((col) & 1)) << 1) & 3)
#define FORCC for (int c=0; c < colors; c++) #define FORCC for (unsigned int c=0; c < colors; c++)
/* /*
Patterned Pixel Grouping Interpolation by Alain Desbiolles Patterned Pixel Grouping Interpolation by Alain Desbiolles
@ -887,7 +886,7 @@ void RawImageSource::ppg_demosaic()
{ {
int width = W, height = H; int width = W, height = H;
int dir[5] = { 1, width, -1, -width, 1 }; int dir[5] = { 1, width, -1, -width, 1 };
int row, col, diff[2], guess[2], c, d, i; int row, col, diff[2] = {}, guess[2], c, d, i;
float (*pix)[4]; float (*pix)[4];
float (*image)[4]; float (*image)[4];
@ -998,7 +997,7 @@ void RawImageSource::ppg_demosaic()
void RawImageSource::border_interpolate(unsigned int border, float (*image)[4], unsigned int start, unsigned int end) void RawImageSource::border_interpolate(unsigned int border, float (*image)[4], unsigned int start, unsigned int end)
{ {
unsigned row, col, y, x, f, c, sum[8]; unsigned row, col, y, x, f, sum[8];
unsigned int width = W, height = H; unsigned int width = W, height = H;
unsigned int colors = 3; unsigned int colors = 3;
@ -1338,7 +1337,7 @@ SSEFUNCTION void RawImageSource::lmmse_interpolate_omp(int winw, int winh, array
h2 /= hs; h2 /= hs;
h3 /= hs; h3 /= hs;
h4 /= hs; h4 /= hs;
int passref; int passref = 0;
int iter; int iter;
if(iterations <= 4) { if(iterations <= 4) {
@ -2631,7 +2630,7 @@ void RawImageSource::ahd_demosaic(int winx, int winy, int winw, int winh)
int width = W, height = H; int width = W, height = H;
float (*image)[4]; float (*image)[4];
int colors = 3; unsigned int colors = 3;
const double xyz_rgb[3][3] = { /* XYZ from RGB */ const double xyz_rgb[3][3] = { /* XYZ from RGB */
{ 0.412453, 0.357580, 0.180423 }, { 0.412453, 0.357580, 0.180423 },
@ -2661,7 +2660,7 @@ void RawImageSource::ahd_demosaic(int winx, int winy, int winw, int winh)
} }
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
for (j = 0; j < colors; j++) for (unsigned int j = 0; j < colors; j++)
for (xyz_cam[i][j] = k = 0; k < 3; k++) { for (xyz_cam[i][j] = k = 0; k < 3; k++) {
xyz_cam[i][j] += xyz_rgb[i][k] * imatrices.rgb_cam[k][j] / d65_white[i]; xyz_cam[i][j] += xyz_rgb[i][k] * imatrices.rgb_cam[k][j] / d65_white[i];
} }
@ -3293,12 +3292,12 @@ void RawImageSource::fill_raw( float (*cache )[3], int x0, int y0, float** rawDa
void RawImageSource::fill_border( float (*cache )[3], int border, int x0, int y0) void RawImageSource::fill_border( float (*cache )[3], int border, int x0, int y0)
{ {
unsigned row, col, y, x, f, c; unsigned f;
float sum[8]; float sum[8];
const unsigned int colors = 3; // used in FORCC constexpr unsigned int colors = 3; // used in FORCC
for (row = y0; row < y0 + TILESIZE + TILEBORDER && row < H; row++) { for (int row = y0; row < y0 + TILESIZE + TILEBORDER && row < H; row++) {
for (col = x0; col < x0 + TILESIZE + TILEBORDER && col < W; col++) { for (int col = x0; col < x0 + TILESIZE + TILEBORDER && col < W; col++) {
if (col >= border && col < W - border && row >= border && row < H - border) { if (col >= border && col < W - border && row >= border && row < H - border) {
col = W - border; col = W - border;
@ -3309,8 +3308,8 @@ void RawImageSource::fill_border( float (*cache )[3], int border, int x0, int y0
memset(sum, 0, sizeof sum); memset(sum, 0, sizeof sum);
for (y = row - 1; y != row + 2; y++) for (int y = row - 1; y != row + 2; y++)
for (x = col - 1; x != col + 2; x++) for (int x = col - 1; x != col + 2; x++)
if (y < H && y < y0 + TILESIZE + TILEBORDER && x < W && x < x0 + TILESIZE + TILEBORDER) { if (y < H && y < y0 + TILESIZE + TILEBORDER && x < W && x < x0 + TILESIZE + TILEBORDER) {
f = fc(y, x); f = fc(y, x);
sum[f] += cache[(y - y0 + TILEBORDER) * CACHESIZE + TILEBORDER + x - x0][f]; sum[f] += cache[(y - y0 + TILEBORDER) * CACHESIZE + TILEBORDER + x - x0][f];
@ -3361,13 +3360,13 @@ void RawImageSource::restore_from_buffer(float (*image)[3], float (*buffer)[2])
void RawImageSource::dcb_hid(float (*image)[3], int x0, int y0) void RawImageSource::dcb_hid(float (*image)[3], int x0, int y0)
{ {
const int u = CACHESIZE; const int u = CACHESIZE;
int rowMin, colMin, rowMax, colMax, c; int rowMin, colMin, rowMax, colMax;
dcb_initTileLimits(colMin, rowMin, colMax, rowMax, x0, y0, 2); dcb_initTileLimits(colMin, rowMin, colMax, rowMax, x0, y0, 2);
// simple green bilinear in R and B pixels // simple green bilinear in R and B pixels
for (int row = rowMin; row < rowMax; row++) for (int row = rowMin; row < rowMax; row++)
for (int col = colMin + (FC(y0 - TILEBORDER + row, x0 - TILEBORDER + colMin) & 1), indx = row * CACHESIZE + col, c = FC(y0 - TILEBORDER + row, x0 - TILEBORDER + col); col < colMax; col += 2, indx += 2) { for (int col = colMin + (FC(y0 - TILEBORDER + row, x0 - TILEBORDER + colMin) & 1), indx = row * CACHESIZE + col; col < colMax; col += 2, indx += 2) {
assert(indx - u - 1 >= 0 && indx + u + 1 < u * u && c >= 0 && c < 3); assert(indx - u - 1 >= 0 && indx + u + 1 < u * u);
image[indx][1] = 0.25*(image[indx-1][1]+image[indx+1][1]+image[indx-u][1]+image[indx+u][1]); image[indx][1] = 0.25*(image[indx-1][1]+image[indx+1][1]+image[indx-u][1]+image[indx+u][1]);
} }
@ -3418,13 +3417,13 @@ void RawImageSource::dcb_color(float (*image)[3], int x0, int y0)
// green correction // green correction
void RawImageSource::dcb_hid2(float (*image)[3], int x0, int y0) void RawImageSource::dcb_hid2(float (*image)[3], int x0, int y0)
{ {
const int u = CACHESIZE, v = 2 * CACHESIZE; const int v = 2 * CACHESIZE;
int rowMin, colMin, rowMax, colMax; int rowMin, colMin, rowMax, colMax;
dcb_initTileLimits(colMin, rowMin, colMax, rowMax, x0, y0, 2); dcb_initTileLimits(colMin, rowMin, colMax, rowMax, x0, y0, 2);
for (int row = rowMin; row < rowMax; row++) { for (int row = rowMin; row < rowMax; row++) {
for (int col = colMin + (FC(y0 - TILEBORDER + row, x0 - TILEBORDER + colMin) & 1), indx = row * CACHESIZE + col, c = FC(y0 - TILEBORDER + row, x0 - TILEBORDER + col); col < colMax; col += 2, indx += 2) { for (int col = colMin + (FC(y0 - TILEBORDER + row, x0 - TILEBORDER + colMin) & 1), indx = row * CACHESIZE + col, c = FC(y0 - TILEBORDER + row, x0 - TILEBORDER + col); col < colMax; col += 2, indx += 2) {
assert(indx - v >= 0 && indx + v < u * u); assert(indx - v >= 0 && indx + v < CACHESIZE * CACHESIZE);
//Jacek comment: one multiplication less //Jacek comment: one multiplication less
image[indx][1] = image[indx][c] + image[indx][1] = image[indx][c] +
@ -3592,11 +3591,11 @@ void RawImageSource::dcb_correction2(float (*image)[3], uint8_t *map, int x0, in
// image refinement // image refinement
void RawImageSource::dcb_refinement(float (*image)[3], uint8_t *map, int x0, int y0) void RawImageSource::dcb_refinement(float (*image)[3], uint8_t *map, int x0, int y0)
{ {
const int u = CACHESIZE, v = 2 * CACHESIZE, w = 3 * CACHESIZE; const int u = CACHESIZE, v = 2 * CACHESIZE;
int rowMin, colMin, rowMax, colMax; int rowMin, colMin, rowMax, colMax;
dcb_initTileLimits(colMin, rowMin, colMax, rowMax, x0, y0, 4); dcb_initTileLimits(colMin, rowMin, colMax, rowMax, x0, y0, 4);
float f0, f1, f2, g1, h0, h1, h2, g2, current; float f0, f1, f2, g1, h0, h1, h2, g2;
for (int row = rowMin; row < rowMax; row++) for (int row = rowMin; row < rowMax; row++)
for (int col = colMin + (FC(y0 - TILEBORDER + row, x0 - TILEBORDER + colMin) & 1), indx = row * CACHESIZE + col, c = FC(y0 - TILEBORDER + row, x0 - TILEBORDER + col); col < colMax; col += 2, indx += 2) { for (int col = colMin + (FC(y0 - TILEBORDER + row, x0 - TILEBORDER + colMin) & 1), indx = row * CACHESIZE + col, c = FC(y0 - TILEBORDER + row, x0 - TILEBORDER + col); col < colMax; col += 2, indx += 2) {
@ -3937,7 +3936,7 @@ void RawImageSource::xtransborder_interpolate (int border)
{ {
const int height = H, width = W; const int height = H, width = W;
char xtrans[6][6]; int xtrans[6][6];
ri->getXtransMatrix(xtrans); ri->getXtransMatrix(xtrans);
for (int row = 0; row < height; row++) for (int row = 0; row < height; row++)
@ -4001,7 +4000,7 @@ void RawImageSource::xtrans_interpolate (const int passes, const bool useCieLab)
plistener->setProgress (progress); plistener->setProgress (progress);
} }
char xtrans[6][6]; int xtrans[6][6];
ri->getXtransMatrix(xtrans); ri->getXtransMatrix(xtrans);
constexpr short orth[12] = { 1, 0, 0, 1, -1, 0, 0, -1, 1, 0, 0, 1 }, constexpr short orth[12] = { 1, 0, 0, 1, -1, 0, 0, -1, 1, 0, 0, 1 },
@ -4721,17 +4720,16 @@ void RawImageSource::xtrans_interpolate (const int passes, const bool useCieLab)
/* Average the most homogeneous pixels for the final result: */ /* Average the most homogeneous pixels for the final result: */
uint8_t hm[8]; uint8_t hm[8] = {};
for (int row = MIN(top, 8); row < mrow - 8; row++) for (int row = MIN(top, 8); row < mrow - 8; row++)
for (int col = MIN(left, 8); col < mcol - 8; col++) { for (int col = MIN(left, 8); col < mcol - 8; col++) {
int d = 0;
for (; d < 4; d++) { for (int d = 0; d < 4; d++) {
hm[d] = homosum[d][row][col]; hm[d] = homosum[d][row][col];
} }
for (; d < ndir; d++) { for (int d = 4; d < ndir; d++) {
hm[d] = homosum[d][row][col]; hm[d] = homosum[d][row][col];
if (hm[d - 4] < hm[d]) { if (hm[d - 4] < hm[d]) {
@ -4745,7 +4743,7 @@ void RawImageSource::xtrans_interpolate (const int passes, const bool useCieLab)
uint8_t maxval = homosummax[row][col]; uint8_t maxval = homosummax[row][col];
for (d = 0; d < ndir; d++) for (int d = 0; d < ndir; d++)
if (hm[d] >= maxval) { if (hm[d] >= maxval) {
FORC3 avg[c] += rgb[d][row][col][c]; FORC3 avg[c] += rgb[d][row][col][c];
avg[3]++; avg[3]++;
@ -4792,7 +4790,7 @@ void RawImageSource::fast_xtrans_interpolate ()
const int height = H, width = W; const int height = H, width = W;
xtransborder_interpolate (1); xtransborder_interpolate (1);
char xtrans[6][6]; int xtrans[6][6];
ri->getXtransMatrix(xtrans); ri->getXtransMatrix(xtrans);
#pragma omp parallel for #pragma omp parallel for

2
rtengine/rawimage.cc
View File

@ -779,7 +779,7 @@ RawImage::is_ppmThumb() const
!thumb_load_raw ); !thumb_load_raw );
} }
void RawImage::getXtransMatrix( char XtransMatrix[6][6]) void RawImage::getXtransMatrix( int XtransMatrix[6][6])
{ {
for(int row = 0; row < 6; row++) for(int row = 0; row < 6; row++)
for(int col = 0; col < 6; col++) { for(int col = 0; col < 6; col++) {

2
rtengine/rawimage.h
View File

@ -180,7 +180,7 @@ public:
eSensorType getSensorType(); eSensorType getSensorType();
void getRgbCam (float rgbcam[3][4]); void getRgbCam (float rgbcam[3][4]);
void getXtransMatrix ( char xtransMatrix[6][6]); void getXtransMatrix ( int xtransMatrix[6][6]);
void clearXtransCblack( ) void clearXtransCblack( )
{ {
for(int c = 0; c < 4; c++) { for(int c = 0; c < 4; c++) {