Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType
Commits:
-
612925ff
by Alexei Podtelezhnikov at 2021-09-01T21:37:21-04:00
-
7482c98f
by Alexei Podtelezhnikov at 2021-09-01T22:18:29-04:00
11 changed files:
- builds/amiga/src/base/ftsystem.c
- builds/mac/ftmac.c
- builds/unix/ftsystem.c
- builds/vms/ftsystem.c
- builds/wince/ftdebug.c
- builds/windows/ftsystem.c
- include/freetype/internal/ftstream.h
- src/base/ftstream.c
- src/bzip2/ftbzip2.c
- src/cff/cffload.c
- src/lzw/ftlzw.c
Changes:
... | ... | @@ -264,7 +264,7 @@ Free_VecPooled( APTR poolHeader, |
264 | 264 |
|
265 | 265 |
stream->descriptor.pointer = NULL;
|
266 | 266 |
stream->size = 0;
|
267 |
- stream->base = 0;
|
|
267 |
+ stream->base = NULL;
|
|
268 | 268 |
}
|
269 | 269 |
|
270 | 270 |
|
... | ... | @@ -447,7 +447,7 @@ typedef short ResourceIndex; |
447 | 447 |
|
448 | 448 |
stream->descriptor.pointer = NULL;
|
449 | 449 |
stream->size = 0;
|
450 |
- stream->base = 0;
|
|
450 |
+ stream->base = NULL;
|
|
451 | 451 |
}
|
452 | 452 |
|
453 | 453 |
|
... | ... | @@ -215,7 +215,7 @@ |
215 | 215 |
|
216 | 216 |
stream->descriptor.pointer = NULL;
|
217 | 217 |
stream->size = 0;
|
218 |
- stream->base = 0;
|
|
218 |
+ stream->base = NULL;
|
|
219 | 219 |
}
|
220 | 220 |
|
221 | 221 |
|
... | ... | @@ -237,7 +237,7 @@ |
237 | 237 |
|
238 | 238 |
stream->descriptor.pointer = NULL;
|
239 | 239 |
stream->size = 0;
|
240 |
- stream->base = 0;
|
|
240 |
+ stream->base = NULL;
|
|
241 | 241 |
}
|
242 | 242 |
|
243 | 243 |
|
... | ... | @@ -365,7 +365,7 @@ |
365 | 365 |
stream->descriptor.pointer = stream->base;
|
366 | 366 |
stream->pathname.pointer = (char*)filepathname;
|
367 | 367 |
|
368 |
- stream->read = 0;
|
|
368 |
+ stream->read = NULL;
|
|
369 | 369 |
|
370 | 370 |
FT_TRACE1(( "FT_Stream_Open:" ));
|
371 | 371 |
FT_TRACE1(( " opened `%s' (%ld bytes) successfully\n",
|
... | ... | @@ -409,7 +409,7 @@ |
409 | 409 |
memory = (FT_Memory)malloc( sizeof ( *memory ) );
|
410 | 410 |
if ( memory )
|
411 | 411 |
{
|
412 |
- memory->user = 0;
|
|
412 |
+ memory->user = NULL;
|
|
413 | 413 |
memory->alloc = ft_alloc;
|
414 | 414 |
memory->realloc = ft_realloc;
|
415 | 415 |
memory->free = ft_free;
|
... | ... | @@ -197,7 +197,7 @@ |
197 | 197 |
|
198 | 198 |
stream->descriptor.pointer = NULL;
|
199 | 199 |
stream->size = 0;
|
200 |
- stream->base = 0;
|
|
200 |
+ stream->base = NULL;
|
|
201 | 201 |
}
|
202 | 202 |
|
203 | 203 |
|
... | ... | @@ -259,7 +259,7 @@ |
259 | 259 |
stream->pathname.pointer = (char*)filepathname;
|
260 | 260 |
|
261 | 261 |
stream->close = ft_close_stream;
|
262 |
- stream->read = 0;
|
|
262 |
+ stream->read = NULL;
|
|
263 | 263 |
|
264 | 264 |
FT_TRACE1(( "FT_Stream_Open:" ));
|
265 | 265 |
FT_TRACE1(( " opened `%s' (%d bytes) successfully\n",
|
... | ... | @@ -300,7 +300,7 @@ |
300 | 300 |
memory = (FT_Memory)malloc( sizeof ( *memory ) );
|
301 | 301 |
if ( memory )
|
302 | 302 |
{
|
303 |
- memory->user = 0;
|
|
303 |
+ memory->user = NULL;
|
|
304 | 304 |
memory->alloc = ft_alloc;
|
305 | 305 |
memory->realloc = ft_realloc;
|
306 | 306 |
memory->free = ft_free;
|
... | ... | @@ -230,7 +230,7 @@ |
230 | 230 |
|
231 | 231 |
/* const char* ft2_debug = getenv( "FT2_DEBUG" ); */
|
232 | 232 |
|
233 |
- const char* ft2_debug = 0;
|
|
233 |
+ const char* ft2_debug = NULL;
|
|
234 | 234 |
|
235 | 235 |
|
236 | 236 |
if ( ft2_debug )
|
... | ... | @@ -176,7 +176,7 @@ |
176 | 176 |
|
177 | 177 |
stream->descriptor.pointer = NULL;
|
178 | 178 |
stream->size = 0;
|
179 |
- stream->base = 0;
|
|
179 |
+ stream->base = NULL;
|
|
180 | 180 |
}
|
181 | 181 |
|
182 | 182 |
|
... | ... | @@ -198,7 +198,7 @@ |
198 | 198 |
|
199 | 199 |
stream->descriptor.pointer = NULL;
|
200 | 200 |
stream->size = 0;
|
201 |
- stream->base = 0;
|
|
201 |
+ stream->base = NULL;
|
|
202 | 202 |
}
|
203 | 203 |
|
204 | 204 |
|
... | ... | @@ -319,7 +319,7 @@ |
319 | 319 |
stream->descriptor.pointer = stream->base;
|
320 | 320 |
stream->pathname.pointer = (char*)filepathname;
|
321 | 321 |
|
322 |
- stream->read = 0;
|
|
322 |
+ stream->read = NULL;
|
|
323 | 323 |
|
324 | 324 |
FT_TRACE1(( "FT_Stream_Open:" ));
|
325 | 325 |
FT_TRACE1(( " opened `%s' (%ld bytes) successfully\n",
|
... | ... | @@ -363,7 +363,7 @@ |
363 | 363 |
memory = (FT_Memory)malloc( sizeof ( *memory ) );
|
364 | 364 |
if ( memory )
|
365 | 365 |
{
|
366 |
- memory->user = 0;
|
|
366 |
+ memory->user = NULL;
|
|
367 | 367 |
memory->alloc = ft_alloc;
|
368 | 368 |
memory->realloc = ft_realloc;
|
369 | 369 |
memory->free = ft_free;
|
... | ... | @@ -305,8 +305,8 @@ FT_BEGIN_HEADER |
305 | 305 |
#else
|
306 | 306 |
#define FT_GET_MACRO( func, type ) ( (type)func( stream ) )
|
307 | 307 |
|
308 |
-#define FT_GET_CHAR() FT_GET_MACRO( FT_Stream_GetChar, FT_Char )
|
|
309 |
-#define FT_GET_BYTE() FT_GET_MACRO( FT_Stream_GetChar, FT_Byte )
|
|
308 |
+#define FT_GET_CHAR() FT_GET_MACRO( FT_Stream_GetByte, FT_Char )
|
|
309 |
+#define FT_GET_BYTE() FT_GET_MACRO( FT_Stream_GetByte, FT_Byte )
|
|
310 | 310 |
#define FT_GET_SHORT() FT_GET_MACRO( FT_Stream_GetUShort, FT_Short )
|
311 | 311 |
#define FT_GET_USHORT() FT_GET_MACRO( FT_Stream_GetUShort, FT_UShort )
|
312 | 312 |
#define FT_GET_OFF3() FT_GET_MACRO( FT_Stream_GetUOffset, FT_Long )
|
... | ... | @@ -333,8 +333,8 @@ FT_BEGIN_HEADER |
333 | 333 |
* `FT_STREAM_POS'. They use the full machinery to check whether a read is
|
334 | 334 |
* valid.
|
335 | 335 |
*/
|
336 |
-#define FT_READ_BYTE( var ) FT_READ_MACRO( FT_Stream_ReadChar, FT_Byte, var )
|
|
337 |
-#define FT_READ_CHAR( var ) FT_READ_MACRO( FT_Stream_ReadChar, FT_Char, var )
|
|
336 |
+#define FT_READ_BYTE( var ) FT_READ_MACRO( FT_Stream_ReadByte, FT_Byte, var )
|
|
337 |
+#define FT_READ_CHAR( var ) FT_READ_MACRO( FT_Stream_ReadByte, FT_Char, var )
|
|
338 | 338 |
#define FT_READ_SHORT( var ) FT_READ_MACRO( FT_Stream_ReadUShort, FT_Short, var )
|
339 | 339 |
#define FT_READ_USHORT( var ) FT_READ_MACRO( FT_Stream_ReadUShort, FT_UShort, var )
|
340 | 340 |
#define FT_READ_OFF3( var ) FT_READ_MACRO( FT_Stream_ReadUOffset, FT_Long, var )
|
... | ... | @@ -457,8 +457,8 @@ FT_BEGIN_HEADER |
457 | 457 |
|
458 | 458 |
|
459 | 459 |
/* read a byte from an entered frame */
|
460 |
- FT_BASE( FT_Char )
|
|
461 |
- FT_Stream_GetChar( FT_Stream stream );
|
|
460 |
+ FT_BASE( FT_Byte )
|
|
461 |
+ FT_Stream_GetByte( FT_Stream stream );
|
|
462 | 462 |
|
463 | 463 |
/* read a 16-bit big-endian unsigned integer from an entered frame */
|
464 | 464 |
FT_BASE( FT_UShort )
|
... | ... | @@ -482,8 +482,8 @@ FT_BEGIN_HEADER |
482 | 482 |
|
483 | 483 |
|
484 | 484 |
/* read a byte from a stream */
|
485 |
- FT_BASE( FT_Char )
|
|
486 |
- FT_Stream_ReadChar( FT_Stream stream,
|
|
485 |
+ FT_BASE( FT_Byte )
|
|
486 |
+ FT_Stream_ReadByte( FT_Stream stream,
|
|
487 | 487 |
FT_Error* error );
|
488 | 488 |
|
489 | 489 |
/* read a 16-bit big-endian unsigned integer from a stream */
|
... | ... | @@ -347,17 +347,17 @@ |
347 | 347 |
}
|
348 | 348 |
|
349 | 349 |
|
350 |
- FT_BASE_DEF( FT_Char )
|
|
351 |
- FT_Stream_GetChar( FT_Stream stream )
|
|
350 |
+ FT_BASE_DEF( FT_Byte )
|
|
351 |
+ FT_Stream_GetByte( FT_Stream stream )
|
|
352 | 352 |
{
|
353 |
- FT_Char result;
|
|
353 |
+ FT_Byte result;
|
|
354 | 354 |
|
355 | 355 |
|
356 | 356 |
FT_ASSERT( stream && stream->cursor );
|
357 | 357 |
|
358 | 358 |
result = 0;
|
359 | 359 |
if ( stream->cursor < stream->limit )
|
360 |
- result = (FT_Char)*stream->cursor++;
|
|
360 |
+ result = *stream->cursor++;
|
|
361 | 361 |
|
362 | 362 |
return result;
|
363 | 363 |
}
|
... | ... | @@ -455,8 +455,8 @@ |
455 | 455 |
}
|
456 | 456 |
|
457 | 457 |
|
458 |
- FT_BASE_DEF( FT_Char )
|
|
459 |
- FT_Stream_ReadChar( FT_Stream stream,
|
|
458 |
+ FT_BASE_DEF( FT_Byte )
|
|
459 |
+ FT_Stream_ReadByte( FT_Stream stream,
|
|
460 | 460 |
FT_Error* error )
|
461 | 461 |
{
|
462 | 462 |
FT_Byte result = 0;
|
... | ... | @@ -464,31 +464,32 @@ |
464 | 464 |
|
465 | 465 |
FT_ASSERT( stream );
|
466 | 466 |
|
467 |
- *error = FT_Err_Ok;
|
|
468 |
- |
|
469 |
- if ( stream->read )
|
|
467 |
+ if ( stream->pos < stream->size )
|
|
470 | 468 |
{
|
471 |
- if ( stream->read( stream, stream->pos, &result, 1L ) != 1L )
|
|
472 |
- goto Fail;
|
|
473 |
- }
|
|
474 |
- else
|
|
475 |
- {
|
|
476 |
- if ( stream->pos < stream->size )
|
|
477 |
- result = stream->base[stream->pos];
|
|
469 |
+ if ( stream->read )
|
|
470 |
+ {
|
|
471 |
+ if ( stream->read( stream, stream->pos, &result, 1L ) != 1L )
|
|
472 |
+ goto Fail;
|
|
473 |
+ }
|
|
478 | 474 |
else
|
479 |
- goto Fail;
|
|
475 |
+ result = stream->base[stream->pos];
|
|
480 | 476 |
}
|
477 |
+ else
|
|
478 |
+ goto Fail;
|
|
479 |
+ |
|
481 | 480 |
stream->pos++;
|
482 | 481 |
|
483 |
- return (FT_Char)result;
|
|
482 |
+ *error = FT_Err_Ok;
|
|
483 |
+ |
|
484 |
+ return result;
|
|
484 | 485 |
|
485 | 486 |
Fail:
|
486 | 487 |
*error = FT_THROW( Invalid_Stream_Operation );
|
487 |
- FT_ERROR(( "FT_Stream_ReadChar:"
|
|
488 |
+ FT_ERROR(( "FT_Stream_ReadByte:"
|
|
488 | 489 |
" invalid i/o; pos = 0x%lx, size = 0x%lx\n",
|
489 | 490 |
stream->pos, stream->size ));
|
490 | 491 |
|
491 |
- return 0;
|
|
492 |
+ return result;
|
|
492 | 493 |
}
|
493 | 494 |
|
494 | 495 |
|
... | ... | @@ -497,14 +498,12 @@ |
497 | 498 |
FT_Error* error )
|
498 | 499 |
{
|
499 | 500 |
FT_Byte reads[2];
|
500 |
- FT_Byte* p = 0;
|
|
501 |
+ FT_Byte* p;
|
|
501 | 502 |
FT_UShort result = 0;
|
502 | 503 |
|
503 | 504 |
|
504 | 505 |
FT_ASSERT( stream );
|
505 | 506 |
|
506 |
- *error = FT_Err_Ok;
|
|
507 |
- |
|
508 | 507 |
if ( stream->pos + 1 < stream->size )
|
509 | 508 |
{
|
510 | 509 |
if ( stream->read )
|
... | ... | @@ -525,6 +524,8 @@ |
525 | 524 |
|
526 | 525 |
stream->pos += 2;
|
527 | 526 |
|
527 |
+ *error = FT_Err_Ok;
|
|
528 |
+ |
|
528 | 529 |
return result;
|
529 | 530 |
|
530 | 531 |
Fail:
|
... | ... | @@ -533,7 +534,7 @@ |
533 | 534 |
" invalid i/o; pos = 0x%lx, size = 0x%lx\n",
|
534 | 535 |
stream->pos, stream->size ));
|
535 | 536 |
|
536 |
- return 0;
|
|
537 |
+ return result;
|
|
537 | 538 |
}
|
538 | 539 |
|
539 | 540 |
|
... | ... | @@ -542,14 +543,12 @@ |
542 | 543 |
FT_Error* error )
|
543 | 544 |
{
|
544 | 545 |
FT_Byte reads[2];
|
545 |
- FT_Byte* p = 0;
|
|
546 |
+ FT_Byte* p;
|
|
546 | 547 |
FT_UShort result = 0;
|
547 | 548 |
|
548 | 549 |
|
549 | 550 |
FT_ASSERT( stream );
|
550 | 551 |
|
551 |
- *error = FT_Err_Ok;
|
|
552 |
- |
|
553 | 552 |
if ( stream->pos + 1 < stream->size )
|
554 | 553 |
{
|
555 | 554 |
if ( stream->read )
|
... | ... | @@ -570,6 +569,8 @@ |
570 | 569 |
|
571 | 570 |
stream->pos += 2;
|
572 | 571 |
|
572 |
+ *error = FT_Err_Ok;
|
|
573 |
+ |
|
573 | 574 |
return result;
|
574 | 575 |
|
575 | 576 |
Fail:
|
... | ... | @@ -578,7 +579,7 @@ |
578 | 579 |
" invalid i/o; pos = 0x%lx, size = 0x%lx\n",
|
579 | 580 |
stream->pos, stream->size ));
|
580 | 581 |
|
581 |
- return 0;
|
|
582 |
+ return result;
|
|
582 | 583 |
}
|
583 | 584 |
|
584 | 585 |
|
... | ... | @@ -587,14 +588,12 @@ |
587 | 588 |
FT_Error* error )
|
588 | 589 |
{
|
589 | 590 |
FT_Byte reads[3];
|
590 |
- FT_Byte* p = 0;
|
|
591 |
+ FT_Byte* p;
|
|
591 | 592 |
FT_ULong result = 0;
|
592 | 593 |
|
593 | 594 |
|
594 | 595 |
FT_ASSERT( stream );
|
595 | 596 |
|
596 |
- *error = FT_Err_Ok;
|
|
597 |
- |
|
598 | 597 |
if ( stream->pos + 2 < stream->size )
|
599 | 598 |
{
|
600 | 599 |
if ( stream->read )
|
... | ... | @@ -615,6 +614,8 @@ |
615 | 614 |
|
616 | 615 |
stream->pos += 3;
|
617 | 616 |
|
617 |
+ *error = FT_Err_Ok;
|
|
618 |
+ |
|
618 | 619 |
return result;
|
619 | 620 |
|
620 | 621 |
Fail:
|
... | ... | @@ -623,7 +624,7 @@ |
623 | 624 |
" invalid i/o; pos = 0x%lx, size = 0x%lx\n",
|
624 | 625 |
stream->pos, stream->size ));
|
625 | 626 |
|
626 |
- return 0;
|
|
627 |
+ return result;
|
|
627 | 628 |
}
|
628 | 629 |
|
629 | 630 |
|
... | ... | @@ -632,14 +633,12 @@ |
632 | 633 |
FT_Error* error )
|
633 | 634 |
{
|
634 | 635 |
FT_Byte reads[4];
|
635 |
- FT_Byte* p = 0;
|
|
636 |
+ FT_Byte* p;
|
|
636 | 637 |
FT_ULong result = 0;
|
637 | 638 |
|
638 | 639 |
|
639 | 640 |
FT_ASSERT( stream );
|
640 | 641 |
|
641 |
- *error = FT_Err_Ok;
|
|
642 |
- |
|
643 | 642 |
if ( stream->pos + 3 < stream->size )
|
644 | 643 |
{
|
645 | 644 |
if ( stream->read )
|
... | ... | @@ -660,6 +659,8 @@ |
660 | 659 |
|
661 | 660 |
stream->pos += 4;
|
662 | 661 |
|
662 |
+ *error = FT_Err_Ok;
|
|
663 |
+ |
|
663 | 664 |
return result;
|
664 | 665 |
|
665 | 666 |
Fail:
|
... | ... | @@ -668,7 +669,7 @@ |
668 | 669 |
" invalid i/o; pos = 0x%lx, size = 0x%lx\n",
|
669 | 670 |
stream->pos, stream->size ));
|
670 | 671 |
|
671 |
- return 0;
|
|
672 |
+ return result;
|
|
672 | 673 |
}
|
673 | 674 |
|
674 | 675 |
|
... | ... | @@ -677,14 +678,12 @@ |
677 | 678 |
FT_Error* error )
|
678 | 679 |
{
|
679 | 680 |
FT_Byte reads[4];
|
680 |
- FT_Byte* p = 0;
|
|
681 |
+ FT_Byte* p;
|
|
681 | 682 |
FT_ULong result = 0;
|
682 | 683 |
|
683 | 684 |
|
684 | 685 |
FT_ASSERT( stream );
|
685 | 686 |
|
686 |
- *error = FT_Err_Ok;
|
|
687 |
- |
|
688 | 687 |
if ( stream->pos + 3 < stream->size )
|
689 | 688 |
{
|
690 | 689 |
if ( stream->read )
|
... | ... | @@ -705,6 +704,8 @@ |
705 | 704 |
|
706 | 705 |
stream->pos += 4;
|
707 | 706 |
|
707 |
+ *error = FT_Err_Ok;
|
|
708 |
+ |
|
708 | 709 |
return result;
|
709 | 710 |
|
710 | 711 |
Fail:
|
... | ... | @@ -713,7 +714,7 @@ |
713 | 714 |
" invalid i/o; pos = 0x%lx, size = 0x%lx\n",
|
714 | 715 |
stream->pos, stream->size ));
|
715 | 716 |
|
716 |
- return 0;
|
|
717 |
+ return result;
|
|
717 | 718 |
}
|
718 | 719 |
|
719 | 720 |
|
... | ... | @@ -495,7 +495,7 @@ |
495 | 495 |
|
496 | 496 |
stream->size = 0x7FFFFFFFL; /* don't know the real size! */
|
497 | 497 |
stream->pos = 0;
|
498 |
- stream->base = 0;
|
|
498 |
+ stream->base = NULL;
|
|
499 | 499 |
stream->read = ft_bzip2_stream_io;
|
500 | 500 |
stream->close = ft_bzip2_stream_close;
|
501 | 501 |
|
... | ... | @@ -622,7 +622,7 @@ |
622 | 622 |
FT_Byte* bytes;
|
623 | 623 |
FT_ULong byte_len;
|
624 | 624 |
FT_Error error;
|
625 |
- FT_String* name = 0;
|
|
625 |
+ FT_String* name = NULL;
|
|
626 | 626 |
|
627 | 627 |
|
628 | 628 |
if ( !idx->stream ) /* CFF2 does not include a name index */
|
... | ... | @@ -383,7 +383,7 @@ |
383 | 383 |
|
384 | 384 |
stream->size = 0x7FFFFFFFL; /* don't know the real size! */
|
385 | 385 |
stream->pos = 0;
|
386 |
- stream->base = 0;
|
|
386 |
+ stream->base = NULL;
|
|
387 | 387 |
stream->read = ft_lzw_stream_io;
|
388 | 388 |
stream->close = ft_lzw_stream_close;
|
389 | 389 |
|