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

Fix all warnings in rawimage.cc

Browse Source
This commit is contained in:
heckflosse
2017-03-30 18:23:18 +02:00
parent 348b393583
commit f0b7547cbb
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
rtengine/rawimage.cc
View File

@@ -25,9 +25,9 @@ RawImage::RawImage( const Glib::ustring &name )
: data(nullptr) : data(nullptr)
, prefilters(0) , prefilters(0)
, filename(name) , filename(name)
, rotate_deg(0)
, profile_data(nullptr) , profile_data(nullptr)
, allocation(nullptr) , allocation(nullptr)
, rotate_deg(0)
{ {
memset(maximum_c4, 0, sizeof(maximum_c4)); memset(maximum_c4, 0, sizeof(maximum_c4));
RT_matrix_from_constant = 0; RT_matrix_from_constant = 0;
@@ -84,9 +84,9 @@ eSensorType RawImage::getSensorType()
*/ */
void RawImage::get_colorsCoeff( float *pre_mul_, float *scale_mul_, float *cblack_, bool forceAutoWB) void RawImage::get_colorsCoeff( float *pre_mul_, float *scale_mul_, float *cblack_, bool forceAutoWB)
{ {
unsigned row, col, x, y, c, sum[8]; unsigned sum[8], c;
unsigned W = this->get_width(); unsigned W = this->get_width();
unsigned H = this->get_height(); unsigned H = this->get_height();
float val; float val;
double dsum[8], dmin, dmax; double dsum[8], dmin, dmax;
@@ -118,7 +118,7 @@ void RawImage::get_colorsCoeff( float *pre_mul_, float *scale_mul_, float *cblac
dsum[FC(1, 0) + 4] += (int)(((W + 1) / 2) * (H / 2)); dsum[FC(1, 0) + 4] += (int)(((W + 1) / 2) * (H / 2));
dsum[FC(1, 1) + 4] += (int)((W / 2) * (H / 2)); dsum[FC(1, 1) + 4] += (int)((W / 2) * (H / 2));
#pragma omp parallel private(val,row,col,x,y) #pragma omp parallel private(val)
{ {
double dsumthr[8]; double dsumthr[8];
memset(dsumthr, 0, sizeof dsumthr); memset(dsumthr, 0, sizeof dsumthr);
@@ -135,15 +135,15 @@ void RawImage::get_colorsCoeff( float *pre_mul_, float *scale_mul_, float *cblac
float *tempdata = data[0]; float *tempdata = data[0];
#pragma omp for nowait #pragma omp for nowait
for (row = 0; row < H; row += 8) { for (size_t row = 0; row < H; row += 8) {
int ymax = row + 8 < H ? row + 8 : H; size_t ymax = row + 8 < H ? row + 8 : H;
for (col = 0; col < W ; col += 8) { for (size_t col = 0; col < W ; col += 8) {
int xmax = col + 8 < W ? col + 8 : W; size_t xmax = col + 8 < W ? col + 8 : W;
memset(sum, 0, sizeof sum); memset(sum, 0, sizeof sum);
for (y = row; y < ymax; y++) for (size_t y = row; y < ymax; y++)
for (x = col; x < xmax; x++) { for (size_t x = col; x < xmax; x++) {
int c = FC(y, x); int c = FC(y, x);
val = tempdata[y * W + x]; val = tempdata[y * W + x];
@@ -204,13 +204,13 @@ skip_block2:
#pragma omp for nowait #pragma omp for nowait
for (int row = 0; row < H; row += 8) for (size_t row = 0; row < H; row += 8)
for (int col = 0; col < W ; col += 8) for (size_t col = 0; col < W ; col += 8)
{ {
memset(sum, 0, sizeof sum); memset(sum, 0, sizeof sum);
for (int y = row; y < row + 8 && y < H; y++) for (size_t y = row; y < row + 8 && y < H; y++)
for (int x = col; x < col + 8 && x < W; x++) { for (size_t x = col; x < col + 8 && x < W; x++) {
int c = XTRANSFC(y, x); int c = XTRANSFC(y, x);
float val = data[y][x]; float val = data[y][x];
@@ -248,12 +248,12 @@ skip_block3:
pre_mul_[c] = 1; pre_mul_[c] = 1;
} }
} else { } else {
for (row = 0; row < H; row += 8) for (size_t row = 0; row < H; row += 8)
for (col = 0; col < W ; col += 8) { for (size_t col = 0; col < W ; col += 8) {
memset(sum, 0, sizeof sum); memset(sum, 0, sizeof sum);
for (y = row; y < row + 8 && y < H; y++) for (size_t y = row; y < row + 8 && y < H; y++)
for (x = col; x < col + 8 && x < W; x++) for (size_t x = col; x < col + 8 && x < W; x++)
for (int c = 0; c < 3; c++) { for (int c = 0; c < 3; c++) {
if (this->isBayer()) { if (this->isBayer()) {
c = FC(y, x); c = FC(y, x);
@@ -294,8 +294,8 @@ skip_block:
} else { } else {
memset(sum, 0, sizeof sum); memset(sum, 0, sizeof sum);
for (row = 0; row < 8; row++) for (size_t row = 0; row < 8; row++)
for (col = 0; col < 8; col++) { for (size_t col = 0; col < 8; col++) {
int c = FC(row, col); int c = FC(row, col);
if ((val = white[row][col] - cblack_[c]) > 0) { if ((val = white[row][col] - cblack_[c]) > 0) {
@@ -604,7 +604,7 @@ int RawImage::loadRaw (bool loadData, unsigned int imageNum, bool closeFile, Pro
if(tiff_bps > 0 && maximum_c4[i] > 0 && !isFoveon()) { if(tiff_bps > 0 && maximum_c4[i] > 0 && !isFoveon()) {
unsigned compare = ((uint64_t)1 << tiff_bps) - 1; // use uint64_t to avoid overflow if tiff_bps == 32 unsigned compare = ((uint64_t)1 << tiff_bps) - 1; // use uint64_t to avoid overflow if tiff_bps == 32
while(maximum_c4[i] > compare) { while(static_cast<uint64_t>(maximum_c4[i]) > compare) {
maximum_c4[i] >>= 1; maximum_c4[i] >>= 1;
} }
} }
@@ -632,7 +632,7 @@ int RawImage::loadRaw (bool loadData, unsigned int imageNum, bool closeFile, Pro
} }
for (int c = 0; c < 4; c++) { for (int c = 0; c < 4; c++) {
if (cblack[c] < black_c4[c]) { if (static_cast<int>(cblack[c]) < black_c4[c]) {
cblack[c] = black_c4[c]; cblack[c] = black_c4[c];
} }
} }
@@ -1074,7 +1074,7 @@ DCraw::dcraw_coeff_overrides(const char make[], const char model[], const int is
char name[strlen(make) + strlen(model) + 32]; char name[strlen(make) + strlen(model) + 32];
sprintf(name, "%s %s", make, model); sprintf(name, "%s %s", make, model);
for (int i = 0; i < sizeof table / sizeof(table[0]); i++) { for (size_t i = 0; i < sizeof table / sizeof(table[0]); i++) {
if (strcasecmp(name, table[i].prefix) == 0) { if (strcasecmp(name, table[i].prefix) == 0) {
*black_level = table[i].black_level; *black_level = table[i].black_level;
*white_level = table[i].white_level; *white_level = table[i].white_level;