Make font encoding constants follow kName convention.
More consistent with style guides.
Change-Id: I2fa37810ef9c36567eeb2f080b66323694f464d1
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/83650
Auto-Submit: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/font/cpdf_fontencoding.cpp b/core/fpdfapi/font/cpdf_fontencoding.cpp
index c456b60..41b6cf8 100644
--- a/core/fpdfapi/font/cpdf_fontencoding.cpp
+++ b/core/fpdfapi/font/cpdf_fontencoding.cpp
@@ -17,7 +17,7 @@
namespace {
-const uint16_t MSSymbolEncoding[CPDF_FontEncoding::kEncodingTableSize] = {
+const uint16_t kMSSymbolEncoding[CPDF_FontEncoding::kEncodingTableSize] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -48,7 +48,7 @@
0x2320, 0x0000, 0x2321, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000};
-const uint16_t StandardEncoding[CPDF_FontEncoding::kEncodingTableSize] = {
+const uint16_t kStandardEncoding[CPDF_FontEncoding::kEncodingTableSize] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -79,7 +79,7 @@
0x0000, 0x0000, 0x0131, 0x0000, 0x0000, 0x0142, 0x00f8, 0x0153, 0x00df,
0x0000, 0x0000, 0x0000, 0x0000};
-const uint16_t MacRomanEncoding[CPDF_FontEncoding::kEncodingTableSize] = {
+const uint16_t kMacRomanEncoding[CPDF_FontEncoding::kEncodingTableSize] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -110,7 +110,7 @@
0x00db, 0x00d9, 0x0131, 0x02c6, 0x02dc, 0x00af, 0x02d8, 0x02d9, 0x02da,
0x00b8, 0x02dd, 0x02db, 0x02c7};
-const uint16_t AdobeWinAnsiEncoding[CPDF_FontEncoding::kEncodingTableSize] = {
+const uint16_t kAdobeWinAnsiEncoding[CPDF_FontEncoding::kEncodingTableSize] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -141,7 +141,7 @@
0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, 0x00f8, 0x00f9, 0x00fa, 0x00fb,
0x00fc, 0x00fd, 0x00fe, 0x00ff};
-const uint16_t MacExpertEncoding[CPDF_FontEncoding::kEncodingTableSize] = {
+const uint16_t kMacExpertEncoding[CPDF_FontEncoding::kEncodingTableSize] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -172,7 +172,7 @@
0xf6f4, 0xf7af, 0xf6ea, 0x207f, 0xf6ef, 0xf6e2, 0xf6e8, 0xf6f7, 0xf6fc,
0x0000, 0x0000, 0x0000, 0x0000};
-const uint16_t AdobeSymbolEncoding[CPDF_FontEncoding::kEncodingTableSize] = {
+const uint16_t kAdobeSymbolEncoding[CPDF_FontEncoding::kEncodingTableSize] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -204,7 +204,7 @@
0xF8FC, 0xF8FD, 0xF8FE, 0x0000,
};
-const uint16_t ZapfEncoding[CPDF_FontEncoding::kEncodingTableSize] = {
+const uint16_t kZapfEncoding[CPDF_FontEncoding::kEncodingTableSize] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -243,7 +243,7 @@
constexpr size_t kPDFDocEncodingNamesTableSize =
CPDF_FontEncoding::kEncodingTableSize - kPDFDocEncodingTableFirstChar;
-const char* const StandardEncodingNames[kEncodingNamesTableSize] = {
+const char* const kStandardEncodingNames[kEncodingNamesTableSize] = {
"space",
"exclam",
"quotedbl",
@@ -470,7 +470,7 @@
nullptr,
};
-const char* const AdobeWinAnsiEncodingNames[kEncodingNamesTableSize] = {
+const char* const kAdobeWinAnsiEncodingNames[kEncodingNamesTableSize] = {
"space",
"exclam",
"quotedbl",
@@ -697,7 +697,7 @@
"ydieresis",
};
-const char* const MacRomanEncodingNames[kEncodingNamesTableSize] = {
+const char* const kMacRomanEncodingNames[kEncodingNamesTableSize] = {
"space",
"exclam",
"quotedbl",
@@ -924,7 +924,7 @@
"caron",
};
-const char* const MacExpertEncodingNames[kEncodingNamesTableSize] = {
+const char* const kMacExpertEncodingNames[kEncodingNamesTableSize] = {
"space",
"exclamsmall",
"Hungarumlautsmall",
@@ -1151,7 +1151,7 @@
nullptr,
};
-const char* const PDFDocEncodingNames[kPDFDocEncodingNamesTableSize] = {
+const char* const kPDFDocEncodingNames[kPDFDocEncodingNamesTableSize] = {
"breve",
"caron",
"circumflex",
@@ -1386,7 +1386,7 @@
"ydieresis",
};
-const char* const AdobeSymbolEncodingNames[kEncodingNamesTableSize] = {
+const char* const kAdobeSymbolEncodingNames[kEncodingNamesTableSize] = {
"space",
"exclam",
"universal",
@@ -1613,7 +1613,7 @@
nullptr,
};
-const char* const ZapfEncodingNames[kEncodingNamesTableSize] = {
+const char* const kZapfEncodingNames[kEncodingNamesTableSize] = {
"space", "a1", "a2", "a202", "a3", "a4", "a5", "a119",
"a118", "a117", "a11", "a12", "a13", "a14", "a15", "a16",
"a105", "a17", "a18", "a19", "a20", "a21", "a22", "a23",
@@ -1728,38 +1728,38 @@
case FT_ENCODING_UNICODE:
return unicode;
case FT_ENCODING_ADOBE_STANDARD:
- return PDF_FindCode(StandardEncoding, unicode);
+ return PDF_FindCode(kStandardEncoding, unicode);
case FT_ENCODING_ADOBE_EXPERT:
- return PDF_FindCode(MacExpertEncoding, unicode);
+ return PDF_FindCode(kMacExpertEncoding, unicode);
case FT_ENCODING_ADOBE_LATIN_1:
- return PDF_FindCode(AdobeWinAnsiEncoding, unicode);
+ return PDF_FindCode(kAdobeWinAnsiEncoding, unicode);
case FT_ENCODING_APPLE_ROMAN:
- return PDF_FindCode(MacRomanEncoding, unicode);
+ return PDF_FindCode(kMacRomanEncoding, unicode);
case FT_ENCODING_ADOBE_CUSTOM:
- return PDF_FindCode(PDFDocEncoding, unicode);
+ return PDF_FindCode(kPDFDocEncoding, unicode);
case FT_ENCODING_MS_SYMBOL:
- return PDF_FindCode(MSSymbolEncoding, unicode);
+ return PDF_FindCode(kMSSymbolEncoding, unicode);
}
return 0;
}
const uint16_t* PDF_UnicodesForPredefinedCharSet(int encoding) {
switch (encoding) {
case PDFFONT_ENCODING_WINANSI:
- return AdobeWinAnsiEncoding;
+ return kAdobeWinAnsiEncoding;
case PDFFONT_ENCODING_MACROMAN:
- return MacRomanEncoding;
+ return kMacRomanEncoding;
case PDFFONT_ENCODING_MACEXPERT:
- return MacExpertEncoding;
+ return kMacExpertEncoding;
case PDFFONT_ENCODING_STANDARD:
- return StandardEncoding;
+ return kStandardEncoding;
case PDFFONT_ENCODING_ADOBE_SYMBOL:
- return AdobeSymbolEncoding;
+ return kAdobeSymbolEncoding;
case PDFFONT_ENCODING_ZAPFDINGBATS:
- return ZapfEncoding;
+ return kZapfEncoding;
case PDFFONT_ENCODING_PDFDOC:
- return PDFDocEncoding;
+ return kPDFDocEncoding;
case PDFFONT_ENCODING_MS_SYMBOL:
- return MSSymbolEncoding;
+ return kMSSymbolEncoding;
}
return nullptr;
}
@@ -1778,19 +1778,19 @@
}
switch (encoding) {
case PDFFONT_ENCODING_WINANSI:
- return AdobeWinAnsiEncodingNames[charcode];
+ return kAdobeWinAnsiEncodingNames[charcode];
case PDFFONT_ENCODING_MACROMAN:
- return MacRomanEncodingNames[charcode];
+ return kMacRomanEncodingNames[charcode];
case PDFFONT_ENCODING_MACEXPERT:
- return MacExpertEncodingNames[charcode];
+ return kMacExpertEncodingNames[charcode];
case PDFFONT_ENCODING_STANDARD:
- return StandardEncodingNames[charcode];
+ return kStandardEncodingNames[charcode];
case PDFFONT_ENCODING_ADOBE_SYMBOL:
- return AdobeSymbolEncodingNames[charcode];
+ return kAdobeSymbolEncodingNames[charcode];
case PDFFONT_ENCODING_ZAPFDINGBATS:
- return ZapfEncodingNames[charcode];
+ return kZapfEncodingNames[charcode];
case PDFFONT_ENCODING_PDFDOC:
- return PDFDocEncodingNames[charcode];
+ return kPDFDocEncodingNames[charcode];
}
return nullptr;
}
@@ -1800,15 +1800,15 @@
case FT_ENCODING_UNICODE:
return (uint16_t)charcode;
case FT_ENCODING_ADOBE_STANDARD:
- return StandardEncoding[(uint8_t)charcode];
+ return kStandardEncoding[(uint8_t)charcode];
case FT_ENCODING_ADOBE_EXPERT:
- return MacExpertEncoding[(uint8_t)charcode];
+ return kMacExpertEncoding[(uint8_t)charcode];
case FT_ENCODING_ADOBE_LATIN_1:
- return AdobeWinAnsiEncoding[(uint8_t)charcode];
+ return kAdobeWinAnsiEncoding[(uint8_t)charcode];
case FT_ENCODING_APPLE_ROMAN:
- return MacRomanEncoding[(uint8_t)charcode];
+ return kMacRomanEncoding[(uint8_t)charcode];
case PDFFONT_ENCODING_PDFDOC:
- return PDFDocEncoding[(uint8_t)charcode];
+ return kPDFDocEncoding[(uint8_t)charcode];
}
return 0;
}
diff --git a/core/fpdfapi/parser/fpdf_parser_decode.cpp b/core/fpdfapi/parser/fpdf_parser_decode.cpp
index 4f63dd1..e0362d4 100644
--- a/core/fpdfapi/parser/fpdf_parser_decode.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_decode.cpp
@@ -58,7 +58,7 @@
} // namespace
-const uint16_t PDFDocEncoding[256] = {
+const uint16_t kPDFDocEncoding[256] = {
0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008,
0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 0x0010, 0x0011,
0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x02d8, 0x02c7, 0x02c6,
@@ -509,7 +509,7 @@
} else {
pdfium::span<wchar_t> dest_buf = result.GetBuffer(span.size());
for (size_t i = 0; i < span.size(); ++i)
- dest_buf[i] = PDFDocEncoding[span[i]];
+ dest_buf[i] = kPDFDocEncoding[span[i]];
dest_pos = span.size();
}
result.ReleaseBuffer(dest_pos);
@@ -525,7 +525,7 @@
for (i = 0; i < len; ++i) {
int code;
for (code = 0; code < 256; ++code) {
- if (PDFDocEncoding[code] == str[i])
+ if (kPDFDocEncoding[code] == str[i])
break;
}
if (code == 256)
diff --git a/core/fpdfapi/parser/fpdf_parser_decode.h b/core/fpdfapi/parser/fpdf_parser_decode.h
index 4d1b7bc..8204ad8 100644
--- a/core/fpdfapi/parser/fpdf_parser_decode.h
+++ b/core/fpdfapi/parser/fpdf_parser_decode.h
@@ -26,7 +26,7 @@
}
// Indexed by 8-bit char code, contains unicode code points.
-extern const uint16_t PDFDocEncoding[256];
+extern const uint16_t kPDFDocEncoding[256];
bool ValidateDecoderPipeline(const CPDF_Array* pDecoders);
