Skip to content

Commit 72ac460

Browse files
committed
classify: Replace NULL by nullptr
Signed-off-by: Stefan Weil <[email protected]>
1 parent 57755a2 commit 72ac460

40 files changed

+406
-406
lines changed

classify/adaptive.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@ void AddAdaptedClass(ADAPT_TEMPLATES Templates,
5252
CLASS_ID ClassId) {
5353
INT_CLASS IntClass;
5454

55-
assert (Templates != NULL);
56-
assert (Class != NULL);
55+
assert (Templates != nullptr);
56+
assert (Class != nullptr);
5757
assert (LegalClassId (ClassId));
5858
assert (UnusedClassIdIn (Templates->Templates, ClassId));
5959
assert (Class->NumPermConfigs == 0);
6060

6161
IntClass = NewIntClass (1, 1);
6262
AddIntClass (Templates->Templates, ClassId, IntClass);
6363

64-
assert (Templates->Class[ClassId] == NULL);
64+
assert (Templates->Class[ClassId] == nullptr);
6565
Templates->Class[ClassId] = Class;
6666

6767
} /* AddAdaptedClass */
@@ -79,7 +79,7 @@ void AddAdaptedClass(ADAPT_TEMPLATES Templates,
7979
* @note History: Thu Mar 14 13:34:23 1991, DSJ, Created.
8080
*/
8181
void FreeTempConfig(TEMP_CONFIG Config) {
82-
assert (Config != NULL);
82+
assert (Config != nullptr);
8383
FreeBitVector (Config->Protos);
8484
free(Config);
8585
} /* FreeTempConfig */
@@ -92,7 +92,7 @@ void FreeTempProto(void *arg) {
9292
}
9393

9494
void FreePermConfig(PERM_CONFIG Config) {
95-
assert(Config != NULL);
95+
assert(Config != nullptr);
9696
delete [] Config->Ambigs;
9797
free(Config);
9898
}
@@ -123,7 +123,7 @@ ADAPT_CLASS NewAdaptedClass() {
123123
zero_all_bits (Class->PermConfigs, WordsInVectorOfSize (MAX_NUM_CONFIGS));
124124

125125
for (i = 0; i < MAX_NUM_CONFIGS; i++)
126-
TempConfigFor (Class, i) = NULL;
126+
TempConfigFor (Class, i) = nullptr;
127127

128128
return (Class);
129129

@@ -136,10 +136,10 @@ void free_adapted_class(ADAPT_CLASS adapt_class) {
136136

137137
for (i = 0; i < MAX_NUM_CONFIGS; i++) {
138138
if (ConfigIsPermanent (adapt_class, i)
139-
&& PermConfigFor (adapt_class, i) != NULL)
139+
&& PermConfigFor (adapt_class, i) != nullptr)
140140
FreePermConfig (PermConfigFor (adapt_class, i));
141141
else if (!ConfigIsPermanent (adapt_class, i)
142-
&& TempConfigFor (adapt_class, i) != NULL)
142+
&& TempConfigFor (adapt_class, i) != nullptr)
143143
FreeTempConfig (TempConfigFor (adapt_class, i));
144144
}
145145
FreeBitVector (adapt_class->PermProtos);
@@ -174,7 +174,7 @@ ADAPT_TEMPLATES Classify::NewAdaptedTemplates(bool InitFromUnicharset) {
174174

175175
/* Insert an empty class for each unichar id in unicharset */
176176
for (i = 0; i < MAX_NUM_CLASSES; i++) {
177-
Templates->Class[i] = NULL;
177+
Templates->Class[i] = nullptr;
178178
if (InitFromUnicharset && i < unicharset.size()) {
179179
AddAdaptedClass(Templates, NewAdaptedClass(), i);
180180
}
@@ -196,7 +196,7 @@ int Classify::GetFontinfoId(ADAPT_CLASS Class, uint8_t ConfigId) {
196196
/*----------------------------------------------------------------------------*/
197197
void free_adapted_templates(ADAPT_TEMPLATES templates) {
198198

199-
if (templates != NULL) {
199+
if (templates != nullptr) {
200200
int i;
201201
for (i = 0; i < (templates->Templates)->NumClasses; i++)
202202
free_adapted_class (templates->Class[i]);
@@ -519,7 +519,7 @@ void Classify::WriteAdaptedTemplates(FILE *File, ADAPT_TEMPLATES Templates) {
519519
void WritePermConfig(FILE *File, PERM_CONFIG Config) {
520520
uint8_t NumAmbigs = 0;
521521

522-
assert (Config != NULL);
522+
assert (Config != nullptr);
523523
while (Config->Ambigs[NumAmbigs] > 0) ++NumAmbigs;
524524

525525
fwrite((char *) &NumAmbigs, sizeof(uint8_t), 1, File);
@@ -541,7 +541,7 @@ void WritePermConfig(FILE *File, PERM_CONFIG Config) {
541541
* @note History: Tue Mar 19 14:00:28 1991, DSJ, Created.
542542
*/
543543
void WriteTempConfig(FILE *File, TEMP_CONFIG Config) {
544-
assert (Config != NULL);
544+
assert (Config != nullptr);
545545

546546
fwrite ((char *) Config, sizeof (TEMP_CONFIG_STRUCT), 1, File);
547547
fwrite ((char *) Config->Protos, sizeof (uint32_t),

0 commit comments

Comments
 (0)