@@ -52,16 +52,16 @@ void AddAdaptedClass(ADAPT_TEMPLATES Templates,
52
52
CLASS_ID ClassId) {
53
53
INT_CLASS IntClass;
54
54
55
- assert (Templates != NULL );
56
- assert (Class != NULL );
55
+ assert (Templates != nullptr );
56
+ assert (Class != nullptr );
57
57
assert (LegalClassId (ClassId));
58
58
assert (UnusedClassIdIn (Templates->Templates , ClassId));
59
59
assert (Class->NumPermConfigs == 0 );
60
60
61
61
IntClass = NewIntClass (1 , 1 );
62
62
AddIntClass (Templates->Templates , ClassId, IntClass);
63
63
64
- assert (Templates->Class [ClassId] == NULL );
64
+ assert (Templates->Class [ClassId] == nullptr );
65
65
Templates->Class [ClassId] = Class;
66
66
67
67
} /* AddAdaptedClass */
@@ -79,7 +79,7 @@ void AddAdaptedClass(ADAPT_TEMPLATES Templates,
79
79
* @note History: Thu Mar 14 13:34:23 1991, DSJ, Created.
80
80
*/
81
81
void FreeTempConfig (TEMP_CONFIG Config) {
82
- assert (Config != NULL );
82
+ assert (Config != nullptr );
83
83
FreeBitVector (Config->Protos );
84
84
free (Config);
85
85
} /* FreeTempConfig */
@@ -92,7 +92,7 @@ void FreeTempProto(void *arg) {
92
92
}
93
93
94
94
void FreePermConfig (PERM_CONFIG Config) {
95
- assert (Config != NULL );
95
+ assert (Config != nullptr );
96
96
delete [] Config->Ambigs ;
97
97
free (Config);
98
98
}
@@ -123,7 +123,7 @@ ADAPT_CLASS NewAdaptedClass() {
123
123
zero_all_bits (Class->PermConfigs , WordsInVectorOfSize (MAX_NUM_CONFIGS));
124
124
125
125
for (i = 0 ; i < MAX_NUM_CONFIGS; i++)
126
- TempConfigFor (Class, i) = NULL ;
126
+ TempConfigFor (Class, i) = nullptr ;
127
127
128
128
return (Class);
129
129
@@ -136,10 +136,10 @@ void free_adapted_class(ADAPT_CLASS adapt_class) {
136
136
137
137
for (i = 0 ; i < MAX_NUM_CONFIGS; i++) {
138
138
if (ConfigIsPermanent (adapt_class, i)
139
- && PermConfigFor (adapt_class, i) != NULL )
139
+ && PermConfigFor (adapt_class, i) != nullptr )
140
140
FreePermConfig (PermConfigFor (adapt_class, i));
141
141
else if (!ConfigIsPermanent (adapt_class, i)
142
- && TempConfigFor (adapt_class, i) != NULL )
142
+ && TempConfigFor (adapt_class, i) != nullptr )
143
143
FreeTempConfig (TempConfigFor (adapt_class, i));
144
144
}
145
145
FreeBitVector (adapt_class->PermProtos );
@@ -174,7 +174,7 @@ ADAPT_TEMPLATES Classify::NewAdaptedTemplates(bool InitFromUnicharset) {
174
174
175
175
/* Insert an empty class for each unichar id in unicharset */
176
176
for (i = 0 ; i < MAX_NUM_CLASSES; i++) {
177
- Templates->Class [i] = NULL ;
177
+ Templates->Class [i] = nullptr ;
178
178
if (InitFromUnicharset && i < unicharset.size ()) {
179
179
AddAdaptedClass (Templates, NewAdaptedClass (), i);
180
180
}
@@ -196,7 +196,7 @@ int Classify::GetFontinfoId(ADAPT_CLASS Class, uint8_t ConfigId) {
196
196
/* ----------------------------------------------------------------------------*/
197
197
void free_adapted_templates (ADAPT_TEMPLATES templates) {
198
198
199
- if (templates != NULL ) {
199
+ if (templates != nullptr ) {
200
200
int i;
201
201
for (i = 0 ; i < (templates->Templates )->NumClasses ; i++)
202
202
free_adapted_class (templates->Class [i]);
@@ -519,7 +519,7 @@ void Classify::WriteAdaptedTemplates(FILE *File, ADAPT_TEMPLATES Templates) {
519
519
void WritePermConfig (FILE *File, PERM_CONFIG Config) {
520
520
uint8_t NumAmbigs = 0 ;
521
521
522
- assert (Config != NULL );
522
+ assert (Config != nullptr );
523
523
while (Config->Ambigs [NumAmbigs] > 0 ) ++NumAmbigs;
524
524
525
525
fwrite ((char *) &NumAmbigs, sizeof (uint8_t ), 1 , File);
@@ -541,7 +541,7 @@ void WritePermConfig(FILE *File, PERM_CONFIG Config) {
541
541
* @note History: Tue Mar 19 14:00:28 1991, DSJ, Created.
542
542
*/
543
543
void WriteTempConfig (FILE *File, TEMP_CONFIG Config) {
544
- assert (Config != NULL );
544
+ assert (Config != nullptr );
545
545
546
546
fwrite ((char *) Config, sizeof (TEMP_CONFIG_STRUCT), 1 , File);
547
547
fwrite ((char *) Config->Protos , sizeof (uint32_t ),
0 commit comments