diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-03-20 17:09:28 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-03-20 17:09:28 -0700 |
| commit | 7b4c0028550c32b0b773368ff4bbcc1d1adcd928 (patch) | |
| tree | 99ae75ff0eca0f5272dcafbec32202ef3ae805f5 | |
| parent | ae702b094ba8fda303b4c7e6ddafb3ebae6db7b6 (diff) | |
| download | pdfium-7b4c0028550c32b0b773368ff4bbcc1d1adcd928.tar.xz | |
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
| -rw-r--r-- | samples/BUILD.gn | 6 | ||||
| -rw-r--r-- | samples/image_diff_png.cc | 10 |
2 files changed, 15 insertions, 1 deletions
diff --git a/samples/BUILD.gn b/samples/BUILD.gn index 1bb15a35f5..748a2af399 100644 --- a/samples/BUILD.gn +++ b/samples/BUILD.gn @@ -44,7 +44,11 @@ executable("pdfium_diff") { "//third_party/pdfium", ":fx_lpng", ] - configs += [ ":pdfium_samples_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ + ":pdfium_samples_config", + "//build/config/compiler:no_chromium_code", + ] } static_library("fx_lpng") { 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. |