Chiebot-Mirror
/
freetype
mirror of https://github.com/freetype/freetype.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

* src/autofit/afblue.hin (GET_UTF8_CHAR): Use `do...while(0)'.

Browse Source 
* src/autofit/afblue.h: Regenerated.
2.6.5
Werner Lemberg 9 years ago
parent 53696f03ce
commit f7e6d51a75
3 changed files with 64 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      ChangeLog
  2. 55
      src/autofit/afblue.h
  3. 55
      src/autofit/afblue.hin

6
ChangeLog
Unescape View File

@ -1,3 +1,9 @@
2015-12-05 Werner Lemberg <wl@gnu.org>
* src/autofit/afblue.hin (GET_UTF8_CHAR): Use `do...while(0)'.
* src/autofit/afblue.h: Regenerated.
2015-12-05 Werner Lemberg <wl@gnu.org>
* src/autofit/afwarp.c: s/INT_MIN/FT_INT_MIN/.

55
src/autofit/afblue.h
Unescape View File

@ -28,32 +28,35 @@ FT_BEGIN_HEADER
/* an auxiliary macro to decode a UTF-8 character -- since we only use */
/* hard-coded, self-converted data, no error checking is performed */
#define GET_UTF8_CHAR( ch, p ) \
ch = (unsigned char)*p++; \
if ( ch >= 0x80 ) \
{ \
FT_UInt len; \
\
\
if ( ch < 0xE0 ) \
{ \
len = 1; \
ch &= 0x1F; \
} \
else if ( ch < 0xF0 ) \
{ \
len = 2; \
ch &= 0x0F; \
} \
else \
{ \
len = 3; \
ch &= 0x07; \
} \
\
for ( ; len > 0; len-- ) \
ch = ( ch << 6 ) | ( *p++ & 0x3F ); \
}
#define GET_UTF8_CHAR( ch, p ) \
do \
{ \
ch = (unsigned char)*p++; \
if ( ch >= 0x80 ) \
{ \
FT_UInt len_; \
\
\
if ( ch < 0xE0 ) \
{ \
len_ = 1; \
ch &= 0x1F; \
} \
else if ( ch < 0xF0 ) \
{ \
len_ = 2; \
ch &= 0x0F; \
} \
else \
{ \
len_ = 3; \
ch &= 0x07; \
} \
\
for ( ; len_ > 0; len_-- ) \
ch = ( ch << 6 ) | ( *p++ & 0x3F ); \
} \
} while ( 0 )
/*************************************************************************/

55
src/autofit/afblue.hin
Unescape View File

@ -25,32 +25,35 @@ FT_BEGIN_HEADER
/* an auxiliary macro to decode a UTF-8 character -- since we only use */
/* hard-coded, self-converted data, no error checking is performed */
#define GET_UTF8_CHAR( ch, p ) \
ch = (unsigned char)*p++; \
if ( ch >= 0x80 ) \
{ \
FT_UInt len; \
\
\
if ( ch < 0xE0 ) \
{ \
len = 1; \
ch &= 0x1F; \
} \
else if ( ch < 0xF0 ) \
{ \
len = 2; \
ch &= 0x0F; \
} \
else \
{ \
len = 3; \
ch &= 0x07; \
} \
\
for ( ; len > 0; len-- ) \
ch = ( ch << 6 ) | ( *p++ & 0x3F ); \
}
#define GET_UTF8_CHAR( ch, p ) \
do \
{ \
ch = (unsigned char)*p++; \
if ( ch >= 0x80 ) \
{ \
FT_UInt len_; \
\
\
if ( ch < 0xE0 ) \
{ \
len_ = 1; \
ch &= 0x1F; \
} \
else if ( ch < 0xF0 ) \
{ \
len_ = 2; \
ch &= 0x0F; \
} \
else \
{ \
len_ = 3; \
ch &= 0x07; \
} \
\
for ( ; len_ > 0; len_-- ) \
ch = ( ch << 6 ) | ( *p++ & 0x3F ); \
} \
} while ( 0 )
/*************************************************************************/

Write Preview
Loading…
Cancel
Save