diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-05-17 02:01:42 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-17 02:01:42 +0000 |
| commit | db3c6cefceddf25c25f1205d7b633f09e873bf98 (patch) | |
| tree | f79bf24591d3668da7c44190bbfae46c2c690f95 /core/fxcodec/codec | |
| parent | 1c0da4bf0f4235b50dade1c1d37fbd1f4421722d (diff) | |
| download | pdfium-db3c6cefceddf25c25f1205d7b633f09e873bf98.tar.xz | |
Update third_party/base/compiler_specific.h.
Import Chromium's base/compiler_specific.h from r537069.
Now that FALLTHROUGH is available via compiler_specific.h, remove
FX_FALLTHROUGH.
Change-Id: I8b9631a4f007673e10e0c26951dfd61e9dcada30
Reviewed-on: https://pdfium-review.googlesource.com/32639
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxcodec/codec')
| -rw-r--r-- | core/fxcodec/codec/ccodec_pngmodule.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/fxcodec/codec/ccodec_pngmodule.cpp b/core/fxcodec/codec/ccodec_pngmodule.cpp index 7aedf2ee7f..98db4e272e 100644 --- a/core/fxcodec/codec/ccodec_pngmodule.cpp +++ b/core/fxcodec/codec/ccodec_pngmodule.cpp @@ -10,9 +10,9 @@ #include "core/fxcodec/codec/codec_int.h" #include "core/fxcodec/fx_codec.h" -#include "core/fxcrt/fx_fallthrough.h" #include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h" +#include "third_party/base/compiler_specific.h" #include "third_party/base/ptr_util.h" #ifdef USE_SYSTEM_LIBPNG @@ -139,7 +139,7 @@ static void _png_get_header_func(png_structp png_ptr, png_infop info_ptr) { if (color_type1 != PNG_COLOR_TYPE_PALETTE) { png_error(pContext->m_pPng, "Not Support Output Palette Now"); } - FX_FALLTHROUGH; + FALLTHROUGH; case PNG_COLOR_TYPE_RGB: case PNG_COLOR_TYPE_RGB_ALPHA: if (!(color_type1 & PNG_COLOR_MASK_COLOR)) { |