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

minor formatting issues

This commit is contained in:
Werner Lemberg 2000-10-05 04:53:31 +00:00
parent f00a4de92b
commit 6fbe4db6b7
14 changed files with 88 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builds/cygwin/cygwin-cc.in
View File

@ -74,5 +74,6 @@ LDFLAGS := @LDFLAGS@
# Library linking # Library linking
# #
LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \ LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
-rpath $(libdir) -version-info $(version_info) -rpath $(libdir) -version-info $(version_info)
# EOF

2
builds/cygwin/cygwin-dev.mk
View File

@ -2,7 +2,7 @@
# FreeType 2 Configuration rules for CygWin + GCC # FreeType 2 Configuration rules for CygWin + GCC
# #
# Development version without optimizations & libtool # Development version without optimizations & libtool
# and no installation.. # and no installation
# #
include $(TOP)/builds/cygwin/cygwinddef.mk include $(TOP)/builds/cygwin/cygwinddef.mk

5
builds/cygwin/cygwin.mk
View File

@ -19,12 +19,13 @@ ifdef BUILD_PROJECT
# this is compiler-specific # this is compiler-specific
# #
$(PROJECT_LIBRARY): $(OBJECTS_LIST) $(PROJECT_LIBRARY): $(OBJECTS_LIST)
ifdef CLEAN_LIBRARY ifdef CLEAN_LIBRARY
-$(CLEAN_LIBRARY) $(NO_OUTPUT) -$(CLEAN_LIBRARY) $(NO_OUTPUT)
endif endif
$(LINK_LIBRARY) $(LINK_LIBRARY)
endif endif
include $(TOP)/builds/cygwin/install.mk include $(TOP)/builds/cygwin/install.mk
# EOF

8
builds/cygwin/cygwinddef.mk
View File

@ -1,6 +1,6 @@
# #
# FreeType 2 configuration rules templates for # FreeType 2 configuration rules templates for
# developement under Unix with no configure (gcc only) # development under Unix with no configure (gcc only)
# #
# Copyright 1996-2000 by # Copyright 1996-2000 by
@ -20,8 +20,10 @@ TOP := $(shell cd $(TOP); pwd)
DELETE := rm -f DELETE := rm -f
SEP := / SEP := /
HOSTSEP := $(SEP) HOSTSEP := $(SEP)
BUILD := $(TOP)/builds/cygwin/devel # we use a special devel ftoption.h # we use a special devel ftoption.h
PLATFORM := cygwindev # do not set it to 'cygwin', or libtool will trick you BUILD := $(TOP)/builds/cygwin/devel
# do not set it to 'cygwin', or libtool will trick you
PLATFORM := cygwindev
# The directory where all object files are placed. # The directory where all object files are placed.
# #

16
builds/cygwin/detect.mk
View File

@ -27,11 +27,11 @@ ifeq ($(PLATFORM),ansi)
is_cygwin := 1 is_cygwin := 1
endif endif
# We test for the COMSPEC environment variable, then run the `ver' # We test for the COMSPEC environment variable, then run the `ver'
# command-line program to see if its output contains the word `Windows'. # command-line program to see if its output contains the word `Windows'.
# #
# If this is true, we are running a win32 platform (or an emulation). # If this is true, we are running a win32 platform (or an emulation).
# #
else else
ifeq ($(OSTYPE),cygwin) ifeq ($(OSTYPE),cygwin)
ifdef COMSPEC ifdef COMSPEC
@ -46,9 +46,8 @@ ifeq ($(PLATFORM),ansi)
COPY := cp COPY := cp
DELETE := rm -f DELETE := rm -f
# If `devel' is the requested target, we use a special configuration # If `devel' is the requested target, we use a special configuration
# file named "cygwin-dev.mk". It disables optimization and libtool.. # file named `cygwin-dev.mk'. It disables optimization and libtool.
# #
ifneq ($(findstring devel,$(MAKECMDGOALS)),) ifneq ($(findstring devel,$(MAKECMDGOALS)),)
CONFIG_FILE := cygwin-dev.mk CONFIG_FILE := cygwin-dev.mk
@ -71,7 +70,8 @@ ifeq ($(PLATFORM),ansi)
setup: std_setup setup: std_setup
cygwin-def.mk: builds/cygwin/cygwin-def.in cygwin-def.mk: builds/cygwin/cygwin-def.in
cd builds/cygwin; $(USE_CFLAGS) CONFIG_SHELL=/bin/bash ./configure $(CFG) cd builds/cygwin; \
$(USE_CFLAGS) CONFIG_SHELL=/bin/bash ./configure $(CFG)
endif # test CygWin endif # test CygWin
endif # test PLATFORM endif # test PLATFORM

83
builds/cygwin/install.mk
View File

@ -3,51 +3,50 @@
# this file is FreeType-specific # this file is FreeType-specific
# #
# Unix installation and deinstallation targets. # Unix installation and deinstallation targets.
install: $(PROJECT_LIBRARY)
$(MKINSTALLDIRS) $(libdir) \
$(includedir)/freetype/config \
$(includedir)/freetype/internal \
$(includedir)/freetype/cache
$(LIBTOOL) --mode=install $(INSTALL) $(PROJECT_LIBRARY) $(libdir)
-for P in $(PUBLIC_H) ; do \
$(INSTALL_DATA) $$P $(includedir)/freetype ; \
done
-for P in $(BASE_H) ; do \
$(INSTALL_DATA) $$P $(includedir)/freetype/internal ; \
done
-for P in $(CONFIG_H) ; do \
$(INSTALL_DATA) $$P $(includedir)/freetype/config ; \
done
-for P in $(BASE_H) ; do \
$(INSTALL_DATA) $$P $(includedir)/freetype/cache ; \
done
uninstall: install: $(PROJECT_LIBRARY)
-$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/$(PROJECT_LIBRARY).$A $(MKINSTALLDIRS) $(libdir) \
-$(DELETE) $(includedir)/freetype/cache/* $(includedir)/freetype/config \
-$(DELDIR) $(includedir)/freetype/cache $(includedir)/freetype/internal \
-$(DELETE) $(includedir)/freetype/config/* $(includedir)/freetype/cache
-$(DELDIR) $(includedir)/freetype/config $(LIBTOOL) --mode=install $(INSTALL) $(PROJECT_LIBRARY) $(libdir)
-$(DELETE) $(includedir)/freetype/internal/* -for P in $(PUBLIC_H) ; do \
-$(DELDIR) $(includedir)/freetype/internal $(INSTALL_DATA) $$P $(includedir)/freetype ; \
-$(DELETE) $(includedir)/freetype/* done
-$(DELDIR) $(includedir)/freetype -for P in $(BASE_H) ; do \
$(INSTALL_DATA) $$P $(includedir)/freetype/internal ; \
done
-for P in $(CONFIG_H) ; do \
$(INSTALL_DATA) $$P $(includedir)/freetype/config ; \
done
-for P in $(BASE_H) ; do \
$(INSTALL_DATA) $$P $(includedir)/freetype/cache ; \
done
uninstall:
-$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/$(PROJECT_LIBRARY).$A
-$(DELETE) $(includedir)/freetype/cache/*
-$(DELDIR) $(includedir)/freetype/cache
-$(DELETE) $(includedir)/freetype/config/*
-$(DELDIR) $(includedir)/freetype/config
-$(DELETE) $(includedir)/freetype/internal/*
-$(DELDIR) $(includedir)/freetype/internal
-$(DELETE) $(includedir)/freetype/*
-$(DELDIR) $(includedir)/freetype
# Unix cleaning and distclean rules. # Unix cleaning and distclean rules.
# #
clean_project_cygwin: clean_project_cygwin:
-$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S) -$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)
-$(DELETE) $(patsubst %.$O,%.$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)) \ -$(DELETE) $(patsubst %.$O,%.$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)) \
$(CLEAN) $(CLEAN)
distclean_project_cygwin: clean_project_cygwin
-$(DELETE) $(PROJECT_LIBRARY)
-$(DELETE) $(OBJ_DIR)/.libs/*
-$(DELDIR) $(OBJ_DIR)/.libs
-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
distclean_project_cygwin: clean_project_cygwin
-$(DELETE) $(PROJECT_LIBRARY)
-$(DELETE) $(OBJ_DIR)/.libs/*
-$(DELDIR) $(OBJ_DIR)/.libs
-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
# EOF # EOF

4
builds/dos/detect.mk
View File

@ -22,8 +22,8 @@ ifeq ($(PLATFORM),ansi)
ifdef COMSPEC ifdef COMSPEC
# #
# we try to recognize a Cygwin session, in which case we're # We try to recognize a Cygwin session, in which case we're
# certainly not running on DOS !! # certainly not running on DOS!
# #
ifneq ($(OSTYPE),cygwin) ifneq ($(OSTYPE),cygwin)
is_dos := $(findstring Dos,$(shell ver)) is_dos := $(findstring Dos,$(shell ver))

2
builds/unix/unix-cc.in
View File

@ -76,6 +76,6 @@ LDFLAGS := @LDFLAGS@
# Library linking # Library linking
# #
LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \ LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
-rpath $(libdir) -version-info $(version_info) -rpath $(libdir) -version-info $(version_info)
# EOF # EOF

21
docs/BUILD
View File

@ -1,22 +1,25 @@
FreeType 2 compilation how-to
FreeType 2 compilation how-to
=============================
Introduction: Introduction:
Welcome to this version of the FreeType 2 library. You'll find in this Welcome to this version of the FreeType 2 library. You'll find in this
document instructions on how to compile the library on your favorite document instructions on how to compile the library on your favorite
platform. platform.
I. QUICK COMMAND-LINE GUIDE: I. QUICK COMMAND-LINE GUIDE
---------------------------- ---------------------------
Install GNU Make, then try the following on Unix or any system with gcc: Install GNU Make, then try the following on Unix or any system with gcc:
make // this will setup the build make // this will setup the build
make // this will build the library make // this will build the library
On Win32+Visual C++: On Win32 + Visual C++:
make setup visualc // setup the build for VisualC++ on Win32 make setup visualc // setup the build for VisualC++ on Win32
make // build the library make // build the library
@ -27,19 +30,19 @@ I. QUICK COMMAND-LINE GUIDE:
Note that on Unix, the first "make" invocation will run a configure Note that on Unix, the first "make" invocation will run a configure
script (which is located in "freetype2/builds/unix/". You can also script (which is located in "freetype2/builds/unix/". You can also
pass parameters to this script with the CFG variable, as in: pass parameters to this script with the CFG variable, as in:
make CFG="--prefix=/usr/local" make CFG="--prefix=/usr/local"
make make
If this doesn't work, read the following.. If this doesn't work, read the following.
II. COMMAND-LINE COMPILATION: II. COMMAND-LINE COMPILATION
----------------------------- ----------------------------
Note that if you do not want to compile FreeType 2 from a command line Note that if you do not want to compile FreeType 2 from a command line
shell, please skip to section III below (DETAILED COMPILATION) shell, please skip to section III below (DETAILED COMPILATION)

2
include/freetype/internal/ftobjs.h
View File

@ -211,7 +211,7 @@
BASE_DEF( FT_Error ) FT_New_GlyphSlot( FT_Face face, BASE_DEF( FT_Error ) FT_New_GlyphSlot( FT_Face face,
FT_GlyphSlot* aslot ); FT_GlyphSlot* aslot );
BASE_DEF( void ) FT_Done_GlyphSlot( FT_GlyphSlot slot ); BASE_DEF( void ) FT_Done_GlyphSlot( FT_GlyphSlot slot );
/*************************************************************************/ /*************************************************************************/

9
src/autohint/ahglyph.c
View File

@ -332,9 +332,12 @@
FT_Int max = outline->max_points; FT_Int max = outline->max_points;
if ( REALLOC_ARRAY( outline->points, max, news, AH_Point ) || if ( REALLOC_ARRAY( outline->points,
REALLOC_ARRAY( outline->horz_edges, max*2, news*2, AH_Edge ) || max, news, AH_Point ) ||
REALLOC_ARRAY( outline->horz_segments, max*2, news*2, AH_Segment ) ) REALLOC_ARRAY( outline->horz_edges,
max * 2, news * 2, AH_Edge ) ||
REALLOC_ARRAY( outline->horz_segments,
max * 2, news * 2, AH_Segment ) )
goto Exit; goto Exit;
/* readjust some pointers */ /* readjust some pointers */

3
src/cid/cidload.c
View File

@ -220,8 +220,7 @@
matrix->xy = temp[2]; matrix->xy = temp[2];
matrix->yy = temp[3]; matrix->yy = temp[3];
/* note that the font offset are expressed in */ /* note that the font offsets are expressed in integer font units */
/* integer font units.. */
offset->x = temp[4] >> 16; offset->x = temp[4] >> 16;
offset->y = temp[5] >> 16; offset->y = temp[5] >> 16;
} }

8
src/smooth/ftgrays.c
View File

@ -1854,19 +1854,19 @@
return ErrRaster_Invalid_Outline; return ErrRaster_Invalid_Outline;
/* if direct mode is not set, we must have a target bitmap */ /* if direct mode is not set, we must have a target bitmap */
if ( (params->flags & ft_raster_flag_direct) == 0 && if ( ( params->flags & ft_raster_flag_direct ) == 0 &&
( !target_map || !target_map->buffer ) ) ( !target_map || !target_map->buffer ) )
return -1; return -1;
/* this version does not support monochrome rendering */ /* this version does not support monochrome rendering */
if ( !(params->flags & ft_raster_flag_aa) ) if ( !( params->flags & ft_raster_flag_aa ) )
return ErrRaster_Invalid_Mode; return ErrRaster_Invalid_Mode;
ras.outline = *outline; ras.outline = *outline;
ras.num_cells = 0; ras.num_cells = 0;
ras.invalid = 1; ras.invalid = 1;
if (target_map) if ( target_map )
ras.target = *target_map; ras.target = *target_map;
ras.render_span = (FT_Raster_Span_Func)grays_render_span; ras.render_span = (FT_Raster_Span_Func)grays_render_span;

3
src/type1z/z1load.c
View File

@ -913,8 +913,7 @@
matrix->xy = temp[2]; matrix->xy = temp[2];
matrix->yy = temp[3]; matrix->yy = temp[3];
/* note that the offset must be expressed in */ /* note that the offsets must be expressed in integer font units */
/* integer font units.. */
offset->x = temp[4] >> 16; offset->x = temp[4] >> 16;
offset->y = temp[5] >> 16; offset->y = temp[5] >> 16;
} }