| ... |
... |
@@ -290,22 +290,19 @@ |
|
290
|
290
|
FT_Glyph *aglyph,
|
|
291
|
291
|
FTC_Node *anode )
|
|
292
|
292
|
{
|
|
293
|
|
- FTC_BasicQueryRec query;
|
|
294
|
|
- FTC_Node node = 0; /* make compiler happy */
|
|
295
|
293
|
FT_Error error;
|
|
|
294
|
+ FTC_BasicQueryRec query;
|
|
|
295
|
+ FTC_Node node = NULL; /* make compiler happy */
|
|
296
|
296
|
FT_Offset hash;
|
|
297
|
297
|
|
|
298
|
298
|
|
|
299
|
|
- /* some argument checks are delayed to `FTC_Cache_Lookup' */
|
|
|
299
|
+ /* other argument checks delayed to `FTC_Cache_Lookup' */
|
|
300
|
300
|
if ( !aglyph )
|
|
301
|
|
- {
|
|
302
|
|
- error = FT_THROW( Invalid_Argument );
|
|
303
|
|
- goto Exit;
|
|
304
|
|
- }
|
|
|
301
|
+ return FT_THROW( Invalid_Argument );
|
|
305
|
302
|
|
|
306
|
303
|
*aglyph = NULL;
|
|
307
|
304
|
if ( anode )
|
|
308
|
|
- *anode = NULL;
|
|
|
305
|
+ *anode = NULL;
|
|
309
|
306
|
|
|
310
|
307
|
query.attrs.scaler.face_id = type->face_id;
|
|
311
|
308
|
query.attrs.scaler.width = type->width;
|
| ... |
... |
@@ -343,7 +340,6 @@ |
|
343
|
340
|
}
|
|
344
|
341
|
}
|
|
345
|
342
|
|
|
346
|
|
- Exit:
|
|
347
|
343
|
return error;
|
|
348
|
344
|
}
|
|
349
|
345
|
|
| ... |
... |
@@ -358,22 +354,19 @@ |
|
358
|
354
|
FT_Glyph *aglyph,
|
|
359
|
355
|
FTC_Node *anode )
|
|
360
|
356
|
{
|
|
361
|
|
- FTC_BasicQueryRec query;
|
|
362
|
|
- FTC_Node node = 0; /* make compiler happy */
|
|
363
|
357
|
FT_Error error;
|
|
|
358
|
+ FTC_BasicQueryRec query;
|
|
|
359
|
+ FTC_Node node = NULL; /* make compiler happy */
|
|
364
|
360
|
FT_Offset hash;
|
|
365
|
361
|
|
|
366
|
362
|
|
|
367
|
|
- /* some argument checks are delayed to `FTC_Cache_Lookup' */
|
|
|
363
|
+ /* other argument checks delayed to `FTC_Cache_Lookup' */
|
|
368
|
364
|
if ( !aglyph || !scaler )
|
|
369
|
|
- {
|
|
370
|
|
- error = FT_THROW( Invalid_Argument );
|
|
371
|
|
- goto Exit;
|
|
372
|
|
- }
|
|
|
365
|
+ return FT_THROW( Invalid_Argument );
|
|
373
|
366
|
|
|
374
|
367
|
*aglyph = NULL;
|
|
375
|
368
|
if ( anode )
|
|
376
|
|
- *anode = NULL;
|
|
|
369
|
+ *anode = NULL;
|
|
377
|
370
|
|
|
378
|
371
|
/*
|
|
379
|
372
|
* Internal `FTC_BasicAttr->load_flags' is of type `FT_Int32',
|
| ... |
... |
@@ -411,7 +404,6 @@ |
|
411
|
404
|
}
|
|
412
|
405
|
}
|
|
413
|
406
|
|
|
414
|
|
- Exit:
|
|
415
|
407
|
return error;
|
|
416
|
408
|
}
|
|
417
|
409
|
|
| ... |
... |
@@ -479,18 +471,17 @@ |
|
479
|
471
|
{
|
|
480
|
472
|
FT_Error error;
|
|
481
|
473
|
FTC_BasicQueryRec query;
|
|
482
|
|
- FTC_Node node = 0; /* make compiler happy */
|
|
|
474
|
+ FTC_Node node = NULL; /* make compiler happy */
|
|
483
|
475
|
FT_Offset hash;
|
|
484
|
476
|
|
|
485
|
477
|
|
|
486
|
|
- if ( anode )
|
|
487
|
|
- *anode = NULL;
|
|
488
|
|
-
|
|
489
|
478
|
/* other argument checks delayed to `FTC_Cache_Lookup' */
|
|
490
|
479
|
if ( !ansbit )
|
|
491
|
480
|
return FT_THROW( Invalid_Argument );
|
|
492
|
481
|
|
|
493
|
482
|
*ansbit = NULL;
|
|
|
483
|
+ if ( anode )
|
|
|
484
|
+ *anode = NULL;
|
|
494
|
485
|
|
|
495
|
486
|
query.attrs.scaler.face_id = type->face_id;
|
|
496
|
487
|
query.attrs.scaler.width = type->width;
|
| ... |
... |
@@ -549,18 +540,17 @@ |
|
549
|
540
|
{
|
|
550
|
541
|
FT_Error error;
|
|
551
|
542
|
FTC_BasicQueryRec query;
|
|
552
|
|
- FTC_Node node = 0; /* make compiler happy */
|
|
|
543
|
+ FTC_Node node = NULL; /* make compiler happy */
|
|
553
|
544
|
FT_Offset hash;
|
|
554
|
545
|
|
|
555
|
546
|
|
|
556
|
|
- if ( anode )
|
|
557
|
|
- *anode = NULL;
|
|
558
|
|
-
|
|
559
|
547
|
/* other argument checks delayed to `FTC_Cache_Lookup' */
|
|
560
|
548
|
if ( !ansbit || !scaler )
|
|
561
|
|
- return FT_THROW( Invalid_Argument );
|
|
|
549
|
+ return FT_THROW( Invalid_Argument );
|
|
562
|
550
|
|
|
563
|
551
|
*ansbit = NULL;
|
|
|
552
|
+ if ( anode )
|
|
|
553
|
+ *anode = NULL;
|
|
564
|
554
|
|
|
565
|
555
|
/*
|
|
566
|
556
|
* Internal `FTC_BasicAttr->load_flags' is of type `FT_Int32',
|