diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc
index 7d4ec4376..180eed1c0 100644
--- a/rtengine/dcraw.cc
+++ b/rtengine/dcraw.cc
@@ -1,12 +1,9 @@
 #ifdef __GNUC__
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Warray-bounds"
 #pragma GCC diagnostic ignored "-Wsign-compare"
-#pragma GCC diagnostic ignored "-Wparentheses"
 #if (__GNUC__ >= 6)
 #pragma GCC diagnostic ignored "-Wmisleading-indentation"
 #if (__GNUC__ >= 7)
-#pragma GCC diagnostic ignored "-Wdangling-else"
 #endif
 #endif
 #endif
@@ -1045,10 +1042,11 @@ void CLASS canon_sraw_load_raw()
   for (row=0; row < height; row++, ip+=width) {
     if (row & (jh.sraw >> 1))
       for (col=0; col < width; col+=2)
-	for (c=1; c < 3; c++)
+	for (c=1; c < 3; c++) {
 	  if (row == height-1)
 	       ip[col][c] =  ip[col-width][c];
 	  else ip[col][c] = (ip[col-width][c] + ip[col+width][c] + 1) >> 1;
+	}
     for (col=1; col < width; col+=2)
       for (c=1; c < 3; c++)
 	if (col == width-1)
diff --git a/rtengine/dcraw.h b/rtengine/dcraw.h
index 923d6190f..96d778815 100644
--- a/rtengine/dcraw.h
+++ b/rtengine/dcraw.h
@@ -343,7 +343,7 @@ void parse_qt (int end);
 // ph1_bithuff(int nbits, ushort *huff);
 class ph1_bithuff_t {
 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);
    unsigned operator()();
@@ -376,7 +376,6 @@ private:
         }
    }
 
-   DCraw *parent;
    short &order;
    IMFILE* const ifp;
    UINT64 bitbuf;