Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp

Issue 2032613003: Get rid of NULLs in core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Fix a bad merge Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/fpdfapi/fpdf_font/cpdf_font.cpp ('k') | core/fpdfapi/fpdf_font/cpdf_simplefont.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp
diff --git a/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp b/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp
index 8a280e6ba0477608f329be1d8d1a90ba1187126b..6b726f0a32dce91565ae665c863872adfb6c3c83 100644
--- a/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp
@@ -330,40 +330,40 @@ const FX_CHAR* const StandardEncodingNames[224] = {
"bar",
"braceright",
"asciitilde",
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
"exclamdown",
"cent",
"sterling",
@@ -379,12 +379,12 @@ const FX_CHAR* const StandardEncodingNames[224] = {
"guilsinglright",
"fi",
"fl",
- NULL,
+ nullptr,
"endash",
"dagger",
"daggerdbl",
"periodcentered",
- NULL,
+ nullptr,
"paragraph",
"bullet",
"quotesinglbase",
@@ -393,9 +393,9 @@ const FX_CHAR* const StandardEncodingNames[224] = {
"guillemotright",
"ellipsis",
"perthousand",
- NULL,
+ nullptr,
"questiondown",
- NULL,
+ nullptr,
"grave",
"acute",
"circumflex",
@@ -404,61 +404,61 @@ const FX_CHAR* const StandardEncodingNames[224] = {
"breve",
"dotaccent",
"dieresis",
- NULL,
+ nullptr,
"ring",
"cedilla",
- NULL,
+ nullptr,
"hungarumlaut",
"ogonek",
"caron",
"emdash",
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
"AE",
- NULL,
+ nullptr,
"ordfeminine",
- NULL,
- NULL,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
"Lslash",
"Oslash",
"OE",
"ordmasculine",
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
"ae",
- NULL,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
+ nullptr,
"dotlessi",
- NULL,
- NULL,
+ nullptr,
+ nullptr,
"lslash",
"oslash",
"oe",
"germandbls",
- NULL,
- NULL,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
};
const FX_CHAR* const AdobeWinAnsiEncodingNames[224] = {
@@ -784,7 +784,7 @@ const FX_CHAR* const MacRomanEncodingNames[224] = {
"bar",
"braceright",
"asciitilde",
- NULL,
+ nullptr,
"Adieresis",
"Aring",
"Ccedilla",
@@ -944,17 +944,17 @@ const FX_CHAR* const MacExpertEncodingNames[224] = {
"nineoldstyle",
"colon",
"semicolon",
- NULL,
+ nullptr,
"threequartersemdash",
- NULL,
+ nullptr,
"questionsmall",
- NULL,
- NULL,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
"Ethsmall",
- NULL,
- NULL,
+ nullptr,
+ nullptr,
"onequarter",
"onehalf",
"threequarters",
@@ -964,19 +964,19 @@ const FX_CHAR* const MacExpertEncodingNames[224] = {
"seveneighths",
"onethird",
"twothirds",
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
"ff",
"fi",
"fl",
"ffi",
"ffl",
"parenleftinferior",
- NULL,
+ nullptr,
"parenrightinferior",
"Circumflexsmall",
"hypheninferior",
@@ -1011,14 +1011,14 @@ const FX_CHAR* const MacExpertEncodingNames[224] = {
"onefitted",
"rupiah",
"Tildesmall",
- NULL,
- NULL,
+ nullptr,
+ nullptr,
"asuperior",
"centsuperior",
- NULL,
- NULL,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
"Aacutesmall",
"Agravesmall",
"Acircumflexsmall",
@@ -1044,7 +1044,7 @@ const FX_CHAR* const MacExpertEncodingNames[224] = {
"Ugravesmall",
"Ucircumflexsmall",
"Udieresissmall",
- NULL,
+ nullptr,
"eightsuperior",
"fourinferior",
"threeinferior",
@@ -1052,25 +1052,25 @@ const FX_CHAR* const MacExpertEncodingNames[224] = {
"eightinferior",
"seveninferior",
"Scaronsmall",
- NULL,
+ nullptr,
"centinferior",
"twoinferior",
- NULL,
+ nullptr,
"Dieresissmall",
- NULL,
+ nullptr,
"Caronsmall",
"Scaronsmall",
"fiveinferior",
- NULL,
+ nullptr,
"commainferior",
"periodinferior",
"Yacutesmall",
- NULL,
+ nullptr,
"dollarinferior",
- NULL,
- NULL,
+ nullptr,
+ nullptr,
"Thornsmall",
- NULL,
+ nullptr,
"nineinferior",
"zeroinferior",
"Zcaronsmall",
@@ -1079,29 +1079,29 @@ const FX_CHAR* const MacExpertEncodingNames[224] = {
"questiondownsmall",
"oneinferior",
"asuperior",
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
"Cedillasmall",
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
"OEsmall",
"figuredash",
"hyphensuperior",
- NULL,
- NULL,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
"exclamdownsmall",
- NULL,
+ nullptr,
"Ydieresissmall",
- NULL,
+ nullptr,
"onesuperior",
"twosuperior",
"threesuperior",
@@ -1111,20 +1111,20 @@ const FX_CHAR* const MacExpertEncodingNames[224] = {
"sevensuperior",
"ninesuperior",
"zerosuperior",
- NULL,
+ nullptr,
"esuperior",
"rsuperior",
- NULL,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
+ nullptr,
"isuperior",
"ssuperior",
"dsuperior",
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
"lsuperior",
"Ogoneksmall",
"Brevesmall",
@@ -1136,10 +1136,10 @@ const FX_CHAR* const MacExpertEncodingNames[224] = {
"periodsuperior",
"Dotaccentsmall",
"Ringsmall",
- NULL,
- NULL,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
};
const FX_CHAR* const PDFDocEncodingNames[232] = {
@@ -1246,7 +1246,7 @@ const FX_CHAR* const PDFDocEncodingNames[232] = {
"bar",
"braceright",
"asciitilde",
- NULL,
+ nullptr,
"bullet3",
"dagger",
"daggerdbl",
@@ -1278,7 +1278,7 @@ const FX_CHAR* const PDFDocEncodingNames[232] = {
"oe",
"scaron",
"zcaron2",
- NULL,
+ nullptr,
"Euro",
"exclamdown",
"cent",
@@ -1292,7 +1292,7 @@ const FX_CHAR* const PDFDocEncodingNames[232] = {
"ordfeminine",
"guillemotleft4",
"logicalnot",
- NULL,
+ nullptr,
"registered",
"macron",
"degree",
@@ -1473,39 +1473,39 @@ const FX_CHAR* const AdobeSymbolEncodingNames[224] = {
"bar",
"braceright",
"similar",
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
"Euro",
"Upsilon1",
"minute",
@@ -1586,7 +1586,7 @@ const FX_CHAR* const AdobeSymbolEncodingNames[224] = {
"braceleftmid",
"braceleftbt",
"braceex",
- NULL,
+ nullptr,
"angleright",
"integral",
"integraltp",
@@ -1601,35 +1601,38 @@ const FX_CHAR* const AdobeSymbolEncodingNames[224] = {
"bracerighttp",
"bracerightmid",
"bracerightbt",
- NULL,
+ nullptr,
};
const FX_CHAR* const ZapfEncodingNames[224] = {
- "space", "a1", "a2", "a202", "a3", "a4", "a5", "a119", "a118",
- "a117", "a11", "a12", "a13", "a14", "a15", "a16", "a105", "a17",
- "a18", "a19", "a20", "a21", "a22", "a23", "a24", "a25", "a26",
- "a27", "a28", "a6", "a7", "a8", "a9", "a10", "a29", "a30",
- "a31", "a32", "a33", "a34", "a35", "a36", "a37", "a38", "a39",
- "a40", "a41", "a42", "a43", "a44", "a45", "a46", "a47", "a48",
- "a49", "a50", "a51", "a52", "a53", "a54", "a55", "a56", "a57",
- "a58", "a59", "a60", "a61", "a62", "a63", "a64", "a65", "a66",
- "a67", "a68", "a69", "a70", "a71", "a72", "a73", "a74", "a203",
- "a75", "a204", "a76", "a77", "a78", "a79", "a81", "a82", "a83",
- "a84", "a97", "a98", "a99", "a100", NULL, "a89", "a90", "a93",
- "a94", "a91", "a92", "a205", "a85", "a206", "a86", "a87", "a88",
- "a95", "a96", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, "a101", "a102", "a103", "a104", "a106", "a107",
- "a108", "a112", "a111", "a110", "a109", "a120", "a121", "a122", "a123",
- "a124", "a125", "a126", "a127", "a128", "a129", "a130", "a131", "a132",
- "a133", "a134", "a135", "a136", "a137", "a138", "a139", "a140", "a141",
- "a142", "a143", "a144", "a145", "a146", "a147", "a148", "a149", "a150",
- "a151", "a152", "a153", "a154", "a155", "a156", "a157", "a158", "a159",
- "a160", "a161", "a163", "a164", "a196", "a165", "a192", "a166", "a167",
- "a168", "a169", "a170", "a171", "a172", "a173", "a162", "a174", "a175",
- "a176", "a177", "a178", "a179", "a193", "a180", "a199", "a181", "a200",
- "a182", NULL, "a201", "a183", "a184", "a197", "a185", "a194", "a198",
- "a186", "a195", "a187", "a188", "a189", "a190", "a191", NULL};
+ "space", "a1", "a2", "a202", "a3", "a4", "a5", "a119",
+ "a118", "a117", "a11", "a12", "a13", "a14", "a15", "a16",
+ "a105", "a17", "a18", "a19", "a20", "a21", "a22", "a23",
+ "a24", "a25", "a26", "a27", "a28", "a6", "a7", "a8",
+ "a9", "a10", "a29", "a30", "a31", "a32", "a33", "a34",
+ "a35", "a36", "a37", "a38", "a39", "a40", "a41", "a42",
+ "a43", "a44", "a45", "a46", "a47", "a48", "a49", "a50",
+ "a51", "a52", "a53", "a54", "a55", "a56", "a57", "a58",
+ "a59", "a60", "a61", "a62", "a63", "a64", "a65", "a66",
+ "a67", "a68", "a69", "a70", "a71", "a72", "a73", "a74",
+ "a203", "a75", "a204", "a76", "a77", "a78", "a79", "a81",
+ "a82", "a83", "a84", "a97", "a98", "a99", "a100", nullptr,
+ "a89", "a90", "a93", "a94", "a91", "a92", "a205", "a85",
+ "a206", "a86", "a87", "a88", "a95", "a96", nullptr, nullptr,
+ nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+ nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+ nullptr, "a101", "a102", "a103", "a104", "a106", "a107", "a108",
+ "a112", "a111", "a110", "a109", "a120", "a121", "a122", "a123",
+ "a124", "a125", "a126", "a127", "a128", "a129", "a130", "a131",
+ "a132", "a133", "a134", "a135", "a136", "a137", "a138", "a139",
+ "a140", "a141", "a142", "a143", "a144", "a145", "a146", "a147",
+ "a148", "a149", "a150", "a151", "a152", "a153", "a154", "a155",
+ "a156", "a157", "a158", "a159", "a160", "a161", "a163", "a164",
+ "a196", "a165", "a192", "a166", "a167", "a168", "a169", "a170",
+ "a171", "a172", "a173", "a162", "a174", "a175", "a176", "a177",
+ "a178", "a179", "a193", "a180", "a199", "a181", "a200", "a182",
+ nullptr, "a201", "a183", "a184", "a197", "a185", "a194", "a198",
+ "a186", "a195", "a187", "a188", "a189", "a190", "a191", nullptr};
uint32_t PDF_FindCode(const uint16_t* pCodes, uint16_t unicode) {
for (uint32_t i = 0; i < 256; i++)
@@ -1694,7 +1697,7 @@ CPDF_Object* CPDF_FontEncoding::Realize() {
if (predefined == PDFFONT_ENCODING_MACEXPERT) {
return new CPDF_Name("MacExpertEncoding");
}
- return NULL;
+ return nullptr;
}
const uint16_t* pStandard =
PDF_UnicodesForPredefinedCharSet(PDFFONT_ENCODING_WINANSI);
@@ -1751,7 +1754,7 @@ const uint16_t* PDF_UnicodesForPredefinedCharSet(int encoding) {
case PDFFONT_ENCODING_MS_SYMBOL:
return MSSymbolEncoding;
}
- return NULL;
+ return nullptr;
}
FX_WCHAR PDF_UnicodeFromAdobeName(const FX_CHAR* name) {
@@ -1768,12 +1771,12 @@ const FX_CHAR* PDF_CharNameFromPredefinedCharSet(int encoding,
uint8_t charcode) {
if (encoding == PDFFONT_ENCODING_PDFDOC) {
if (charcode < 24)
- return NULL;
+ return nullptr;
charcode -= 24;
} else {
if (charcode < 32)
- return NULL;
+ return nullptr;
charcode -= 32;
}
« no previous file with comments | « core/fpdfapi/fpdf_font/cpdf_font.cpp ('k') | core/fpdfapi/fpdf_font/cpdf_simplefont.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698