Werner Lemberg pushed to branch master at FreeType / FreeType Demo Programs
Commits:
-
37a1b2c0
by Werner Lemberg at 2021-11-22T19:58:46+01:00
8 changed files:
- builds/windows/msvc/ft2demos.sln
- src/ftcommon.c
- src/ftdump.c
- src/ftmemchk.c
- src/ftpngout.c
- src/ftstring.c
- src/gbench.c
- vms_make.com
Changes:
... | ... | @@ -42,7 +42,7 @@ Global |
42 | 42 |
{3A8DB6B5-EF56-4E42-8918-3E54889C53AB}.Release|x64.ActiveCfg = Release|x64
|
43 | 43 |
{3A8DB6B5-EF56-4E42-8918-3E54889C53AB}.Release|x64.Build.0 = Release|x64
|
44 | 44 |
{3A8DB6B5-EF56-4E42-8918-3E54889C53AB}.Release|x86.ActiveCfg = Release|Win32
|
45 |
- {3A8DB6B5-EF56-4E42-8918-3E54889C53AB}.Release|x86.Build.0 = Release|Win32
|
|
45 |
+ {3A8DB6B5-EF56-4E42-8918-3E54889C53AB}.Release|x86.Build.0 = Release|Win32
|
|
46 | 46 |
{481AD586-CA51-4BEB-BFE8-B2F3354D296D}.Debug|x64.ActiveCfg = Debug|x64
|
47 | 47 |
{481AD586-CA51-4BEB-BFE8-B2F3354D296D}.Debug|x64.Build.0 = Debug|x64
|
48 | 48 |
{481AD586-CA51-4BEB-BFE8-B2F3354D296D}.Debug|x86.ActiveCfg = Debug|Win32
|
... | ... | @@ -483,8 +483,8 @@ |
483 | 483 |
char t[] = { 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1,
|
484 | 484 |
1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1 };
|
485 | 485 |
short c[] = {29};
|
486 |
- FT_Outline FT = { sizeof( c ) / sizeof( c[0] ),
|
|
487 |
- sizeof( p ) / sizeof( p[0] ),
|
|
486 |
+ FT_Outline FT = { sizeof ( c ) / sizeof ( c[0] ),
|
|
487 |
+ sizeof ( p ) / sizeof ( p[0] ),
|
|
488 | 488 |
p, t, c, FT_OUTLINE_NONE };
|
489 | 489 |
grBitmap icon = { 0 };
|
490 | 490 |
grBitmap* picon = NULL;
|
... | ... | @@ -160,9 +160,9 @@ |
160 | 160 |
: modified - 2082844800U;
|
161 | 161 |
|
162 | 162 |
/* ignore pre-epoch time that gmtime cannot handle on some systems */
|
163 |
- if ( created >= 0 )
|
|
163 |
+ if ( created >= 0 )
|
|
164 | 164 |
{
|
165 |
- strftime( buf, sizeof ( buf ), "%Y-%m-%d", gmtime( &created ) );
|
|
165 |
+ strftime( buf, sizeof ( buf ), "%Y-%m-%d", gmtime( &created ) );
|
|
166 | 166 |
printf( "%s%s\n", Name_Field( "created" ), buf );
|
167 | 167 |
}
|
168 | 168 |
if ( modified >= 0 )
|
... | ... | @@ -838,7 +838,7 @@ |
838 | 838 |
|
839 | 839 |
if ( loc + 1 >= end )
|
840 | 840 |
{
|
841 |
- printf( "\nglyf %hd: invalid offset (%d)\n", i, loc );
|
|
841 |
+ printf( "\nglyph %hd: invalid offset (%d)\n", i, loc );
|
|
842 | 842 |
continue;
|
843 | 843 |
}
|
844 | 844 |
|
... | ... | @@ -854,7 +854,7 @@ |
854 | 854 |
{
|
855 | 855 |
if ( loc + 1 >= end )
|
856 | 856 |
{
|
857 |
- printf( "\nglyf %hd: invalid offset (%d)\n", i, loc );
|
|
857 |
+ printf( "\nglyph %hd: invalid offset (%d)\n", i, loc );
|
|
858 | 858 |
goto Continue;
|
859 | 859 |
}
|
860 | 860 |
|
... | ... | @@ -879,7 +879,7 @@ |
879 | 879 |
{
|
880 | 880 |
/* zero-contour glyphs can have no data */
|
881 | 881 |
if ( len )
|
882 |
- printf( "\nglyf %hd: invalid offset (%d)\n", i, loc );
|
|
882 |
+ printf( "\nglyph %hd: invalid offset (%d)\n", i, loc );
|
|
883 | 883 |
continue;
|
884 | 884 |
}
|
885 | 885 |
|
... | ... | @@ -892,12 +892,12 @@ |
892 | 892 |
|
893 | 893 |
if ( loc + len > end )
|
894 | 894 |
{
|
895 |
- printf( "\nglyf %hd: invalid size (%d)\n", i, len );
|
|
895 |
+ printf( "\nglyph %hd: invalid size (%d)\n", i, len );
|
|
896 | 896 |
continue;
|
897 | 897 |
}
|
898 | 898 |
|
899 | 899 |
snprintf( tag, sizeof ( tag ), "%04hx", i );
|
900 |
- printf( "\nglyf %hd (%.4s)", i, tag );
|
|
900 |
+ printf( "\nglyph %hd (%.4s)", i, tag );
|
|
901 | 901 |
Print_Bytecode( buffer + loc, len, tag );
|
902 | 902 |
|
903 | 903 |
Continue:
|
... | ... | @@ -995,7 +995,7 @@ |
995 | 995 |
|
996 | 996 |
if ( loc + 1 >= end )
|
997 | 997 |
{
|
998 |
- printf( "\nglyf %hd: invalid offset (%d)\n", i, loc );
|
|
998 |
+ printf( "\nglyph %hd: invalid offset (%d)\n", i, loc );
|
|
999 | 999 |
continue;
|
1000 | 1000 |
}
|
1001 | 1001 |
|
... | ... | @@ -1008,7 +1008,7 @@ |
1008 | 1008 |
|
1009 | 1009 |
if ( loc + 1 >= end )
|
1010 | 1010 |
{
|
1011 |
- printf( "\nglyf %hd: invalid offset (%d)\n", i, loc );
|
|
1011 |
+ printf( "\nglyph %hd: invalid offset (%d)\n", i, loc );
|
|
1012 | 1012 |
continue;
|
1013 | 1013 |
}
|
1014 | 1014 |
|
... | ... | @@ -1027,7 +1027,7 @@ |
1027 | 1027 |
{
|
1028 | 1028 |
/* zero-contour glyphs can have no data */
|
1029 | 1029 |
if ( len )
|
1030 |
- printf( "\nglyf %hd: invalid offset (%d)\n", i, loc );
|
|
1030 |
+ printf( "\nglyph %hd: invalid offset (%d)\n", i, loc );
|
|
1031 | 1031 |
continue;
|
1032 | 1032 |
}
|
1033 | 1033 |
|
... | ... | @@ -1037,7 +1037,7 @@ |
1037 | 1037 |
|
1038 | 1038 |
if ( len >= end )
|
1039 | 1039 |
{
|
1040 |
- printf( "\nglyf %hd: invalid offset (%d)\n", i, loc );
|
|
1040 |
+ printf( "\nglyph %hd: invalid offset (%d)\n", i, loc );
|
|
1041 | 1041 |
continue;
|
1042 | 1042 |
}
|
1043 | 1043 |
|
... | ... | @@ -163,8 +163,8 @@ static FT_Memory my_memory( void ) |
163 | 163 |
{
|
164 | 164 |
FT_Memory memory;
|
165 | 165 |
|
166 |
- memory = (FT_Memory)my_alloc( 0, sizeof(*memory) );
|
|
167 |
- if (!memory)
|
|
166 |
+ memory = (FT_Memory)my_alloc( 0, sizeof ( *memory ) );
|
|
167 |
+ if ( !memory )
|
|
168 | 168 |
{
|
169 | 169 |
fprintf( stderr, "Unable to allocate debug memory manager !?!\n" );
|
170 | 170 |
exit(2);
|
... | ... | @@ -304,9 +304,9 @@ |
304 | 304 |
{ 0x9a,0x73,0x00,0x00,0xf8,0x1e,0xf3,0x2e } };
|
305 | 305 |
|
306 | 306 |
ULONG gg[2] = { display->gamma * 0x10000, 0x10000 };
|
307 |
- PropertyItem gamma = { PropertyTagGamma, 2 * sizeof(ULONG),
|
|
307 |
+ PropertyItem gamma = { PropertyTagGamma, 2 * sizeof ( ULONG ),
|
|
308 | 308 |
PropertyTagTypeRational, gg };
|
309 |
- PropertyItem software = { PropertyTagSoftwareUsed, strlen(ver_str) + 1,
|
|
309 |
+ PropertyItem software = { PropertyTagSoftwareUsed, strlen( ver_str ) + 1,
|
|
310 | 310 |
PropertyTagTypeASCII, ver_str };
|
311 | 311 |
|
312 | 312 |
|
... | ... | @@ -434,7 +434,7 @@ |
434 | 434 |
static int i = INT_MAX - 1;
|
435 | 435 |
|
436 | 436 |
|
437 |
- if ( ++i >= (int)( sizeof( Sample ) / sizeof( Sample[0] ) ) )
|
|
437 |
+ if ( ++i >= (int)( sizeof ( Sample ) / sizeof ( Sample[0] ) ) )
|
|
438 | 438 |
i = Sample[0] == NULL ? 1 : 0;
|
439 | 439 |
|
440 | 440 |
status.text = Sample[i];
|
... | ... | @@ -727,19 +727,19 @@ main(int argc, |
727 | 727 |
|
728 | 728 |
ggamma_set( gamma );
|
729 | 729 |
|
730 |
- memset( buffer, 0, sizeof(buffer) );
|
|
730 |
+ memset( buffer, 0, sizeof ( buffer ) );
|
|
731 | 731 |
if (TEST('a')) bench( do_glyph, 0, "direct white glyph", 0 );
|
732 | 732 |
|
733 | 733 |
chits = cmiss1 = cmiss2 = 0;
|
734 |
- memset( buffer, 0, sizeof(buffer) );
|
|
734 |
+ memset( buffer, 0, sizeof ( buffer ) );
|
|
735 | 735 |
if (TEST('b')) bench( do_glyph, 1, "cache white glyph", 0 );
|
736 | 736 |
dump_cache_stats();
|
737 | 737 |
|
738 |
- memset( buffer, 0, sizeof(buffer) );
|
|
738 |
+ memset( buffer, 0, sizeof ( buffer ) );
|
|
739 | 739 |
if (TEST('c')) bench( do_glyph_color, 0, "direct color glyph", 0 );
|
740 | 740 |
|
741 | 741 |
chits = cmiss1 = cmiss2 = 0;
|
742 |
- memset( buffer, 0, sizeof(buffer) );
|
|
742 |
+ memset( buffer, 0, sizeof ( buffer ) );
|
|
743 | 743 |
if (TEST('d')) bench( do_glyph_color, 1, "cache color glyph", 0 );
|
744 | 744 |
dump_cache_stats();
|
745 | 745 |
|
... | ... | @@ -2,7 +2,7 @@ $!---------------vms_make.com for Freetype2 demos ------------------------------ |
2 | 2 |
$! make Freetype2 under OpenVMS
|
3 | 3 |
$!
|
4 | 4 |
$! In case of problems with the build you might want to contact me at
|
5 |
-$! zinser@zinser.no-ip.info (preferred) or
|
|
5 |
+$! zinser@zinser.no-ip.info (preferred) or
|
|
6 | 6 |
$! zinser@sysdev.deutsche-boerse.com (Work)
|
7 | 7 |
$!
|
8 | 8 |
$!------------------------------------------------------------------------------
|
... | ... | @@ -356,8 +356,8 @@ $! |
356 | 356 |
$! Version history
|
357 | 357 |
$! 0.01 20040220 First version to receive a number
|
358 | 358 |
$! 0.02 20040229 Echo current procedure name; use general error exit handler
|
359 |
-$! Remove xpm hack -> Replaced by more general dnsrl handling
|
|
360 |
-$! ---> Attention slightly changed version to take into account special
|
|
359 |
+$! Remove xpm hack -> Replaced by more general dnsrl handling
|
|
360 |
+$! ---> Attention slightly changed version to take into account special
|
|
361 | 361 |
$! Situation for Freetype2 demos
|
362 | 362 |
$CHECK_CREATE_VMSLIB:
|
363 | 363 |
$!
|