summaryrefslogtreecommitdiff
path: root/Build/source/libs/freetype2/freetype-src/src/gxvalid/gxvcommn.c
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2021-08-29 06:19:44 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2021-08-29 06:19:44 +0000
commit0de5be92a3a0fe27e8521fc4de67e19b1057842e (patch)
treee93a390fe965486cca19498840cb8d7904252fec /Build/source/libs/freetype2/freetype-src/src/gxvalid/gxvcommn.c
parent27ce96eea3f1190bd744448cfa149e8d767af95a (diff)
revert freetype to 2.10.4
git-svn-id: svn://tug.org/texlive/trunk@60360 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/src/gxvalid/gxvcommn.c')
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/gxvalid/gxvcommn.c41
1 files changed, 20 insertions, 21 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/src/gxvalid/gxvcommn.c b/Build/source/libs/freetype2/freetype-src/src/gxvalid/gxvcommn.c
index f96d57bdb48..ead0f24cd3a 100644
--- a/Build/source/libs/freetype2/freetype-src/src/gxvalid/gxvcommn.c
+++ b/Build/source/libs/freetype2/freetype-src/src/gxvalid/gxvcommn.c
@@ -4,7 +4,7 @@
*
* TrueTypeGX/AAT common tables validation (body).
*
- * Copyright (C) 2004-2021 by
+ * Copyright (C) 2004-2020 by
* suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
* David Turner, Robert Wilhelm, and Werner Lemberg.
*
@@ -46,11 +46,16 @@
/*************************************************************************/
/*************************************************************************/
- FT_COMPARE_DEF( int )
- gxv_compare_ushort_offset( const void* a,
- const void* b )
+ static int
+ gxv_compare_ushort_offset( FT_UShort* a,
+ FT_UShort* b )
{
- return *(FT_UShort*)a - *(FT_UShort*)b;
+ if ( *a < *b )
+ return -1;
+ else if ( *a > *b )
+ return 1;
+ else
+ return 0;
}
@@ -73,7 +78,7 @@
buff[nmemb] = limit;
ft_qsort( buff, ( nmemb + 1 ), sizeof ( FT_UShort ),
- gxv_compare_ushort_offset );
+ ( int(*)(const void*, const void*) )gxv_compare_ushort_offset );
if ( buff[nmemb] > limit )
FT_INVALID_OFFSET;
@@ -106,17 +111,13 @@
/*************************************************************************/
/*************************************************************************/
- FT_COMPARE_DEF( int )
- gxv_compare_ulong_offset( const void* a,
- const void* b )
+ static int
+ gxv_compare_ulong_offset( FT_ULong* a,
+ FT_ULong* b )
{
- FT_ULong a_ = *(FT_ULong*)a;
- FT_ULong b_ = *(FT_ULong*)b;
-
-
- if ( a_ < b_ )
+ if ( *a < *b )
return -1;
- else if ( a_ > b_ )
+ else if ( *a > *b )
return 1;
else
return 0;
@@ -142,7 +143,7 @@
buff[nmemb] = limit;
ft_qsort( buff, ( nmemb + 1 ), sizeof ( FT_ULong ),
- gxv_compare_ulong_offset );
+ ( int(*)(const void*, const void*) )gxv_compare_ulong_offset );
if ( buff[nmemb] > limit )
FT_INVALID_OFFSET;
@@ -1492,11 +1493,9 @@
state = (FT_UShort)( newState_idx / ( 1 + maxClassID ) );
if ( 0 != ( newState_idx % ( 1 + maxClassID ) ) )
{
- FT_TRACE4(( "-> new state = %d (supposed)\n",
- state ));
- FT_TRACE4(( "but newState index 0x%04x"
- " is not aligned to %d-classes\n",
- newState_idx, 1 + maxClassID ));
+ FT_TRACE4(( "-> new state = %d (supposed)\n"
+ "but newState index 0x%04x is not aligned to %d-classes\n",
+ state, newState_idx, 1 + maxClassID ));
GXV_SET_ERR_IF_PARANOID( FT_INVALID_OFFSET );
}