diff options
Diffstat (limited to 'freetype/src/lzw')
| -rw-r--r-- | freetype/src/lzw/Jamfile | 2 | ||||
| -rw-r--r-- | freetype/src/lzw/ftlzw.c | 5 | ||||
| -rw-r--r-- | freetype/src/lzw/ftzopen.c | 5 | ||||
| -rw-r--r-- | freetype/src/lzw/ftzopen.h | 7 | ||||
| -rw-r--r-- | freetype/src/lzw/rules.mk | 10 |
5 files changed, 16 insertions, 13 deletions
diff --git a/freetype/src/lzw/Jamfile b/freetype/src/lzw/Jamfile index 6f1f516e7..91effe20c 100644 --- a/freetype/src/lzw/Jamfile +++ b/freetype/src/lzw/Jamfile @@ -1,6 +1,6 @@ # FreeType 2 src/lzw Jamfile # -# Copyright 2004, 2006 by +# Copyright 2004-2015 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/freetype/src/lzw/ftlzw.c b/freetype/src/lzw/ftlzw.c index 459fc81d7..f60d9baa3 100644 --- a/freetype/src/lzw/ftlzw.c +++ b/freetype/src/lzw/ftlzw.c @@ -8,11 +8,10 @@ /* be used to parse compressed PCF fonts, as found with many X11 server */ /* distributions. */ /* */ -/* Copyright 2004-2006, 2009, 2010, 2012-2014 by */ +/* Copyright 2004-2015 by */ /* Albert Chin-A-Young. */ /* */ -/* Based on code in src/gzip/ftgzip.c, Copyright 2004 by */ -/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* based on code in `src/gzip/ftgzip.c' */ /* */ /* This file is part of the FreeType project, and may only be used, */ /* modified, and distributed under the terms of the FreeType project */ diff --git a/freetype/src/lzw/ftzopen.c b/freetype/src/lzw/ftzopen.c index fa1073dfb..1acf3851e 100644 --- a/freetype/src/lzw/ftzopen.c +++ b/freetype/src/lzw/ftzopen.c @@ -8,7 +8,8 @@ /* be used to parse compressed PCF fonts, as found with many X11 server */ /* distributions. */ /* */ -/* Copyright 2005-2007, 2009, 2011 by David Turner. */ +/* Copyright 2005-2015 by */ +/* David Turner. */ /* */ /* This file is part of the FreeType project, and may only be used, */ /* modified, and distributed under the terms of the FreeType project */ @@ -54,7 +55,7 @@ ft_lzwstate_get_code( FT_LzwState state ) { FT_UInt num_bits = state->num_bits; - FT_Int offset = state->buf_offset; + FT_UInt offset = state->buf_offset; FT_Byte* p; FT_Int result; diff --git a/freetype/src/lzw/ftzopen.h b/freetype/src/lzw/ftzopen.h index 6c917b561..70b5a7730 100644 --- a/freetype/src/lzw/ftzopen.h +++ b/freetype/src/lzw/ftzopen.h @@ -8,7 +8,8 @@ /* be used to parse compressed PCF fonts, as found with many X11 server */ /* distributions. */ /* */ -/* Copyright 2005, 2006, 2007, 2008 by David Turner. */ +/* Copyright 2005-2015 by */ +/* David Turner. */ /* */ /* This file is part of the FreeType project, and may only be used, */ /* modified, and distributed under the terms of the FreeType project */ @@ -115,8 +116,8 @@ FT_Int in_eof; FT_Byte buf_tab[16]; - FT_Int buf_offset; - FT_Int buf_size; + FT_UInt buf_offset; + FT_UInt buf_size; FT_Bool buf_clear; FT_Offset buf_total; diff --git a/freetype/src/lzw/rules.mk b/freetype/src/lzw/rules.mk index 5550a48d6..ab1c02fb5 100644 --- a/freetype/src/lzw/rules.mk +++ b/freetype/src/lzw/rules.mk @@ -3,11 +3,10 @@ # -# Copyright 2004, 2005, 2006 by +# Copyright 2004-2015 by # Albert Chin-A-Young. # -# Based on src/lzw/rules.mk, Copyright 2002 by -# David Turner, Robert Wilhelm, and Werner Lemberg. +# based on `src/lzw/rules.mk' # # This file is part of the FreeType project, and may only be used, modified, # and distributed under the terms of the FreeType project license, @@ -23,7 +22,10 @@ LZW_DIR := $(SRC_DIR)/lzw # compilation flags for the driver # -LZW_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(LZW_DIR)) +LZW_COMPILE := $(CC) $(ANSIFLAGS) \ + $I$(subst /,$(COMPILER_SEP),$(LZW_DIR)) \ + $(INCLUDE_FLAGS) \ + $(FT_CFLAGS) # LZW support sources (i.e., C files) |