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

reduce silencing of warnings for dcraw code

Browse Source
This commit is contained in:
heckflosse 2018-12-08 01:30:09 +01:00
parent b3ee765bf0
commit 04d5ba3f91
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/dcraw.cc
View File

@ -1,12 +1,9 @@
#ifdef __GNUC__ #ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
#pragma GCC diagnostic ignored "-Wsign-compare" #pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wparentheses"
#if (__GNUC__ >= 6) #if (__GNUC__ >= 6)
#pragma GCC diagnostic ignored "-Wmisleading-indentation" #pragma GCC diagnostic ignored "-Wmisleading-indentation"
#if (__GNUC__ >= 7) #if (__GNUC__ >= 7)
#pragma GCC diagnostic ignored "-Wdangling-else"
#endif #endif
#endif #endif
#endif #endif
@ -1045,10 +1042,11 @@ void CLASS canon_sraw_load_raw()
for (row=0; row < height; row++, ip+=width) { for (row=0; row < height; row++, ip+=width) {
if (row & (jh.sraw >> 1)) if (row & (jh.sraw >> 1))
for (col=0; col < width; col+=2) for (col=0; col < width; col+=2)
for (c=1; c < 3; c++) for (c=1; c < 3; c++) {
if (row == height-1) if (row == height-1)
ip[col][c] = ip[col-width][c]; ip[col][c] = ip[col-width][c];
else ip[col][c] = (ip[col-width][c] + ip[col+width][c] + 1) >> 1; else ip[col][c] = (ip[col-width][c] + ip[col+width][c] + 1) >> 1;
}
for (col=1; col < width; col+=2) for (col=1; col < width; col+=2)
for (c=1; c < 3; c++) for (c=1; c < 3; c++)
if (col == width-1) if (col == width-1)

3
rtengine/dcraw.h
View File

@ -343,7 +343,7 @@ void parse_qt (int end);
// ph1_bithuff(int nbits, ushort *huff); // ph1_bithuff(int nbits, ushort *huff);
class ph1_bithuff_t { class ph1_bithuff_t {
public: public:
ph1_bithuff_t(DCraw *p, IMFILE *i, short &o):parent(p),order(o),ifp(i),bitbuf(0),vbits(0){} ph1_bithuff_t(DCraw *p, IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){}
unsigned operator()(int nbits, ushort *huff); unsigned operator()(int nbits, ushort *huff);
unsigned operator()(int nbits); unsigned operator()(int nbits);
unsigned operator()(); unsigned operator()();
@ -376,7 +376,6 @@ private:
} }
} }
DCraw *parent;
short &order; short &order;
IMFILE* const ifp; IMFILE* const ifp;
UINT64 bitbuf; UINT64 bitbuf;