diff options
| author | Henrique Nakashima <hnakashima@chromium.org> | 2018-02-16 19:32:10 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-02-16 19:32:10 +0000 |
| commit | 081da6b880f2a47bd7f3cf578315aaf598b34978 (patch) | |
| tree | c1feb95c2e41f50538b92c5b2b7ddf98ed06c6e5 | |
| parent | 1087ebcd9a2b59c540b80f8a1f3275ae1ff6bcc9 (diff) | |
| download | pdfium-081da6b880f2a47bd7f3cf578315aaf598b34978.tar.xz | |
Fix more fallthroughs before reenabling -Wimplicit-fallthrough.
Change-Id: Ic1d5a250fc00d6767cee7eee1b2d74d5e1caa2bb
Reviewed-on: https://pdfium-review.googlesource.com/27050
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
| -rw-r--r-- | core/fpdfapi/render/cpdf_renderstatus.cpp | 2 | ||||
| -rw-r--r-- | testing/image_diff/image_diff_png.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp index 6525164547..0a01ae0ccf 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.cpp +++ b/core/fpdfapi/render/cpdf_renderstatus.cpp @@ -1766,7 +1766,7 @@ bool CPDF_RenderStatus::ProcessText(CPDF_TextObject* textobj, // Already handled above, but the compiler is not smart enough to // realize it. Fall through. NOTREACHED(); - FX_FALLTHROUGH; + return true; case TextRenderingMode::MODE_CLIP: return true; } diff --git a/testing/image_diff/image_diff_png.cpp b/testing/image_diff/image_diff_png.cpp index 48b5ae17b4..47c1fe4c24 100644 --- a/testing/image_diff/image_diff_png.cpp +++ b/testing/image_diff/image_diff_png.cpp @@ -16,6 +16,7 @@ #include <string> +#include "core/fxcrt/fx_fallthrough.h" #include "third_party/base/logging.h" #include "third_party/zlib/zlib.h" @@ -581,6 +582,7 @@ bool EncodeWithCompressionLevel(const unsigned char* input, switch (format) { case FORMAT_BGR: converter = ConvertBGRtoRGB; + FX_FALLTHROUGH; case FORMAT_RGB: input_color_components = 3; |