summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-03-16 14:51:35 -0700
committerTom Sepez <tsepez@chromium.org>2015-03-16 14:51:35 -0700
commita7865e9c188242c2fc66d993ee4868decf214840 (patch)
treeac02475ab72490f3ffaea8811519a5b753867ec1
parent5a0e504d53195892458d819e52c62bea0c710bd5 (diff)
downloadpdfium-a7865e9c188242c2fc66d993ee4868decf214840.tar.xz
Speculative fix for breakage in pdfum DEPS roll
Speculative because we still don't have pdfium buildbots for mac/win on the pdfium waterfall. Nonetheless, the two build errors reported in https://codereview.chromium.org/989213003/ seem to be a default statement in a switch fully covering all of an enum constant, and the use of <cstdint> instead of <stdint.h> on mac. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1011803003
-rw-r--r--samples/image_diff.cc2
-rw-r--r--samples/image_diff_png.cc10
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 04c2591b60..a54dc816cf 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.