diff options
author | Tom Sepez <tsepez@chromium.org> | 2018-02-26 21:02:52 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-02-26 21:02:52 +0000 |
commit | 0bc02c152bd0c178a5946196e2054a5cdc7650f4 (patch) | |
tree | 4a651b86f0d240c4996ea77f041274d241e59c93 /core | |
parent | 611431decd9a5b7dd456355fe763b2dee9c2a1a1 (diff) | |
download | pdfium-0bc02c152bd0c178a5946196e2054a5cdc7650f4.tar.xz |
Add some more missing consts.chromium/3356
Get things out of the .data section.
Change-Id: I375cf00186a3d5d8d10f5d147bd4b692f5db3683
Reviewed-on: https://pdfium-review.googlesource.com/27130
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core')
-rw-r--r-- | core/fpdfdoc/cpdf_annot.cpp | 2 | ||||
-rw-r--r-- | core/fxcodec/gif/cfx_gif.cpp | 4 | ||||
-rw-r--r-- | core/fxcodec/gif/cfx_gif.h | 4 | ||||
-rw-r--r-- | core/fxcrt/fx_string.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp index 02df3cff60..c74965c3e7 100644 --- a/core/fpdfdoc/cpdf_annot.cpp +++ b/core/fpdfdoc/cpdf_annot.cpp @@ -24,7 +24,7 @@ namespace { -char kPDFiumKey_HasGeneratedAP[] = "PDFIUM_HasGeneratedAP"; +const char kPDFiumKey_HasGeneratedAP[] = "PDFIUM_HasGeneratedAP"; bool IsTextMarkupAnnotation(CPDF_Annot::Subtype type) { return type == CPDF_Annot::Subtype::HIGHLIGHT || diff --git a/core/fxcodec/gif/cfx_gif.cpp b/core/fxcodec/gif/cfx_gif.cpp index 985a687906..e87b9df975 100644 --- a/core/fxcodec/gif/cfx_gif.cpp +++ b/core/fxcodec/gif/cfx_gif.cpp @@ -6,8 +6,8 @@ #include "core/fxcodec/gif/cfx_gif.h" -const char* kGifSignature87 = "GIF87a"; -const char* kGifSignature89 = "GIF89a"; +const char kGifSignature87[] = "GIF87a"; +const char kGifSignature89[] = "GIF89a"; static_assert(sizeof(CFX_CFX_GifImageInfo) == 9, "CFX_CFX_GifImageInfo should have a size of 9"); diff --git a/core/fxcodec/gif/cfx_gif.h b/core/fxcodec/gif/cfx_gif.h index ab8278ecd2..5abe1ad33f 100644 --- a/core/fxcodec/gif/cfx_gif.h +++ b/core/fxcodec/gif/cfx_gif.h @@ -12,8 +12,8 @@ class CFX_GifContext; -extern const char* kGifSignature87; -extern const char* kGifSignature89; +extern const char kGifSignature87[]; +extern const char kGifSignature89[]; #define GIF_SIG_EXTENSION 0x21 #define GIF_SIG_IMAGE 0x2C diff --git a/core/fxcrt/fx_string.cpp b/core/fxcrt/fx_string.cpp index 13eb3a5bdd..83d0e6d906 100644 --- a/core/fxcrt/fx_string.cpp +++ b/core/fxcrt/fx_string.cpp @@ -37,7 +37,7 @@ class CFX_UTF8Encoder { else nbytes = 6; - static uint8_t prefix[] = {0xc0, 0xe0, 0xf0, 0xf8, 0xfc}; + static const uint8_t prefix[] = {0xc0, 0xe0, 0xf0, 0xf8, 0xfc}; int order = 1 << ((nbytes - 1) * 6); int code = unicodeAsWchar; m_Buffer.push_back(prefix[nbytes - 2] | (code / order)); |