minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

[lzw] Optimize last commit. 

* src/lzw/ftzopen.c (ft_lzwstate_get_code): Move check into
conditional clause.
This commit is contained in:
Werner Lemberg 2016-08-16 13:44:38 +02:00
parent 6df68335f1
commit 8521ad99b0
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2016-08-16 Werner Lemberg <wl@gnu.org>
[lzw] Optimize last commit.
* src/lzw/ftzopen.c (ft_lzwstate_get_code): Move check into
conditional clause.
2016-08-16 Werner Lemberg <wl@gnu.org>
[lzw] Avoid invalid left shift.

8
src/lzw/ftzopen.c
View File

@ -65,16 +65,16 @@
FT_Int result;
if ( num_bits > LZW_MAX_BITS )
return -1;
if ( state->buf_clear ||
offset >= state->buf_size ||
state->free_ent >= state->free_bits )
{
if ( state->free_ent >= state->free_bits )
{
state->num_bits = ++num_bits;
state->num_bits = ++num_bits;
if ( num_bits > LZW_MAX_BITS )
return -1;
state->free_bits = state->num_bits < state->max_bits
? (FT_UInt)( ( 1UL << num_bits ) - 256 )
: state->max_free + 1;