diff options
| author | marha <marha@users.sourceforge.net> | 2015-06-15 20:22:43 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-06-15 20:22:43 +0200 |
| commit | 0b3be550b20ad9f991f77bf979b2c306a7d4ef11 (patch) | |
| tree | 523f6db090457118723eca33dabc7758eeb2dcde /freetype/src/bzip2 | |
| parent | 5fe210ff514aa4b3149ea7561862776d7b8849e7 (diff) | |
| download | vcxsrv-0b3be550b20ad9f991f77bf979b2c306a7d4ef11.tar.gz vcxsrv-0b3be550b20ad9f991f77bf979b2c306a7d4ef11.tar.bz2 vcxsrv-0b3be550b20ad9f991f77bf979b2c306a7d4ef11.zip | |
Update to freetype 2.6
Diffstat (limited to 'freetype/src/bzip2')
| -rw-r--r-- | freetype/src/bzip2/Jamfile | 5 | ||||
| -rw-r--r-- | freetype/src/bzip2/ftbzip2.c | 7 | ||||
| -rw-r--r-- | freetype/src/bzip2/rules.mk | 9 |
3 files changed, 10 insertions, 11 deletions
diff --git a/freetype/src/bzip2/Jamfile b/freetype/src/bzip2/Jamfile index 3da986dce..53f850e6f 100644 --- a/freetype/src/bzip2/Jamfile +++ b/freetype/src/bzip2/Jamfile @@ -1,10 +1,9 @@ # FreeType 2 src/bzip2 Jamfile # -# Copyright 2010 by +# Copyright 2010-2015 by # Joel Klinghed # -# Based on src/lzw/Jamfile, Copyright 2004, 2006 by -# David Turner, Robert Wilhelm, and Werner Lemberg. +# based on `src/lzw/Jamfile' # # This file is part of the FreeType project, and may only be used, modified, # and distributed under the terms of the FreeType project license, diff --git a/freetype/src/bzip2/ftbzip2.c b/freetype/src/bzip2/ftbzip2.c index 7e406b161..4dfc9c899 100644 --- a/freetype/src/bzip2/ftbzip2.c +++ b/freetype/src/bzip2/ftbzip2.c @@ -8,11 +8,10 @@ /* parse compressed PCF fonts, as found with many X11 server */ /* distributions. */ /* */ -/* Copyright 2010, 2012-2014 by */ +/* Copyright 2010-2015 by */ /* Joel Klinghed. */ /* */ -/* Based on src/gzip/ftgzip.c, Copyright 2002 - 2010 by */ -/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* based on `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 */ @@ -71,7 +70,7 @@ int items, int size ) { - FT_ULong sz = (FT_ULong)size * items; + FT_ULong sz = (FT_ULong)size * (FT_ULong)items; FT_Error error; FT_Pointer p = NULL; diff --git a/freetype/src/bzip2/rules.mk b/freetype/src/bzip2/rules.mk index 0ff2628b4..7040588c1 100644 --- a/freetype/src/bzip2/rules.mk +++ b/freetype/src/bzip2/rules.mk @@ -2,11 +2,10 @@ # FreeType 2 BZIP2 support configuration rules # -# Copyright 2010 by +# Copyright 2010-2015 by # Joel Klinghed. # -# Based on src/lzw/rules.mk, Copyright 2004-2006 by -# Albert Chin-A-Young. +# 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, @@ -22,7 +21,9 @@ BZIP2_DIR := $(SRC_DIR)/bzip2 # compilation flags for the driver # -BZIP2_COMPILE := $(FT_COMPILE) +BZIP2_COMPILE := $(CC) $(ANSIFLAGS) \ + $(INCLUDE_FLAGS) \ + $(FT_CFLAGS) # BZIP2 support sources (i.e., C files) |