Turn down warning level for GN build of image_diff utility

Next attempt to get GN build to work.  Once this lands, doing a DEPS
roll against the win8_chromium_gn_dbg trybot seems to catch the issue.

Restore image_diff_png.cc to its previous state.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1024243003

1 files changed, 10 insertions, 0 deletions

diff --git a/samples/image_diff_png.cc b/samples/image_diff_png.cc
index a54dc816cf..04c2591b60 100644
--- a/samples/image_diff_png.cc
+++ b/samples/image_diff_png.cc
@@ -219,6 +219,9 @@ void DecodeInfoCallback(png_struct* png_ptr, png_info* info_ptr) {
         state->row_converter = &ConvertRGBtoBGRA;
         state->output_channels = 4;
         break;
+      default:
+        NOTREACHED();
+        break;
     }
   } else if (channels == 4) {
     switch (state->output_format) {
@@ -234,6 +237,9 @@ void DecodeInfoCallback(png_struct* png_ptr, png_info* info_ptr) {
         state->row_converter = &ConvertBetweenBGRAandRGBA;
         state->output_channels = 4;
         break;
+      default:
+        NOTREACHED();
+        break;
     }
   } else {
     NOTREACHED();
@@ -562,6 +568,10 @@ bool EncodeWithCompressionLevel(const unsigned char* input, ColorFormat format,
         converter = ConvertBetweenBGRAandRGBA;
       }
       break;
+
+    default:
+      NOTREACHED();
+      return false;
   }
 
   // Row stride should be at least as long as the length of the data.