diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-03-16 14:58:06 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-03-16 14:58:06 -0700 |
| commit | 49d805b160328df3950403d8b61282c1a46cf4a3 (patch) | |
| tree | 04fb188c50c29da3bcbe0c0483957658c3ea7e0d | |
| parent | 1a316363ee3b17f07ac97f0073dd7480f84b8195 (diff) | |
| download | pdfium-49d805b160328df3950403d8b61282c1a46cf4a3.tar.xz | |
Merge to XFA: Speculative fix for breakage in pdfum DEPS roll
Original Review URL: https://codereview.chromium.org/1011803003
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1015543002
| -rw-r--r-- | samples/image_diff.cc | 2 | ||||
| -rw-r--r-- | samples/image_diff_png.cc | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/samples/image_diff.cc b/samples/image_diff.cc index 3f82b66527..c7560e1aa1 100644 --- a/samples/image_diff.cc +++ b/samples/image_diff.cc @@ -9,11 +9,11 @@ // what the run-webkit-tests script expects. #include <assert.h> +#include <stdint.h> #include <stdio.h> #include <string.h> #include <algorithm> -#include <cstdint> #include <iostream> #include <map> #include <string> diff --git a/samples/image_diff_png.cc b/samples/image_diff_png.cc index 2ccc3e5c91..8dd597f861 100644 --- a/samples/image_diff_png.cc +++ b/samples/image_diff_png.cc @@ -219,9 +219,6 @@ 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) { @@ -237,9 +234,6 @@ void DecodeInfoCallback(png_struct* png_ptr, png_info* info_ptr) { state->row_converter = &ConvertBetweenBGRAandRGBA; state->output_channels = 4; break; - default: - NOTREACHED(); - break; } } else { NOTREACHED(); @@ -568,10 +562,6 @@ 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. |