Commit 6fbe4db6b7208d94557a9a52574b4b65d2920c95
2000-10-05T04:53:31
minor formatting issues
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388
diff --git a/builds/cygwin/cygwin-cc.in b/builds/cygwin/cygwin-cc.in
index 3f6f27f..b81cdfd 100644
--- a/builds/cygwin/cygwin-cc.in
+++ b/builds/cygwin/cygwin-cc.in
@@ -74,5 +74,6 @@ LDFLAGS := @LDFLAGS@
# Library linking
#
LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
- -rpath $(libdir) -version-info $(version_info)
+ -rpath $(libdir) -version-info $(version_info)
+# EOF
diff --git a/builds/cygwin/cygwin-dev.mk b/builds/cygwin/cygwin-dev.mk
index 3a47336..b9d7a5b 100644
--- a/builds/cygwin/cygwin-dev.mk
+++ b/builds/cygwin/cygwin-dev.mk
@@ -2,7 +2,7 @@
# FreeType 2 Configuration rules for CygWin + GCC
#
# Development version without optimizations & libtool
-# and no installation..
+# and no installation
#
include $(TOP)/builds/cygwin/cygwinddef.mk
diff --git a/builds/cygwin/cygwin.mk b/builds/cygwin/cygwin.mk
index 8be57a8..659a25f 100644
--- a/builds/cygwin/cygwin.mk
+++ b/builds/cygwin/cygwin.mk
@@ -19,12 +19,13 @@ ifdef BUILD_PROJECT
# this is compiler-specific
#
$(PROJECT_LIBRARY): $(OBJECTS_LIST)
-ifdef CLEAN_LIBRARY
+ ifdef CLEAN_LIBRARY
-$(CLEAN_LIBRARY) $(NO_OUTPUT)
-endif
+ endif
$(LINK_LIBRARY)
endif
include $(TOP)/builds/cygwin/install.mk
+# EOF
diff --git a/builds/cygwin/cygwinddef.mk b/builds/cygwin/cygwinddef.mk
index a2a45c5..1b2dba1 100644
--- a/builds/cygwin/cygwinddef.mk
+++ b/builds/cygwin/cygwinddef.mk
@@ -1,6 +1,6 @@
#
# 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
@@ -20,8 +20,10 @@ TOP := $(shell cd $(TOP); pwd)
DELETE := rm -f
SEP := /
HOSTSEP := $(SEP)
-BUILD := $(TOP)/builds/cygwin/devel # we use a special devel ftoption.h
-PLATFORM := cygwindev # do not set it to 'cygwin', or libtool will trick you
+# we use a special devel ftoption.h
+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.
#
diff --git a/builds/cygwin/detect.mk b/builds/cygwin/detect.mk
index 3242971..34a82a5 100644
--- a/builds/cygwin/detect.mk
+++ b/builds/cygwin/detect.mk
@@ -27,11 +27,11 @@ ifeq ($(PLATFORM),ansi)
is_cygwin := 1
endif
- # We test for the COMSPEC environment variable, then run the `ver'
- # 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).
- #
+ # We test for the COMSPEC environment variable, then run the `ver'
+ # 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).
+ #
else
ifeq ($(OSTYPE),cygwin)
ifdef COMSPEC
@@ -46,9 +46,8 @@ ifeq ($(PLATFORM),ansi)
COPY := cp
DELETE := rm -f
-
# 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)),)
CONFIG_FILE := cygwin-dev.mk
@@ -71,7 +70,8 @@ ifeq ($(PLATFORM),ansi)
setup: std_setup
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 PLATFORM
diff --git a/builds/cygwin/install.mk b/builds/cygwin/install.mk
index 379f373..93ef183 100644
--- a/builds/cygwin/install.mk
+++ b/builds/cygwin/install.mk
@@ -3,51 +3,50 @@
# this file is FreeType-specific
#
- # 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:
- -$(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.
- #
- clean_project_cygwin:
- -$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)
- -$(DELETE) $(patsubst %.$O,%.$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)) \
- $(CLEAN)
-
- distclean_project_cygwin: clean_project_cygwin
- -$(DELETE) $(PROJECT_LIBRARY)
- -$(DELETE) $(OBJ_DIR)/.libs/*
- -$(DELDIR) $(OBJ_DIR)/.libs
- -$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
-
-
+# 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:
+ -$(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.
+#
+clean_project_cygwin:
+ -$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)
+ -$(DELETE) $(patsubst %.$O,%.$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)) \
+ $(CLEAN)
+
+distclean_project_cygwin: clean_project_cygwin
+ -$(DELETE) $(PROJECT_LIBRARY)
+ -$(DELETE) $(OBJ_DIR)/.libs/*
+ -$(DELDIR) $(OBJ_DIR)/.libs
+ -$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
# EOF
diff --git a/builds/dos/detect.mk b/builds/dos/detect.mk
index 8c70aeb..377b709 100644
--- a/builds/dos/detect.mk
+++ b/builds/dos/detect.mk
@@ -22,8 +22,8 @@ ifeq ($(PLATFORM),ansi)
ifdef COMSPEC
#
- # we try to recognize a Cygwin session, in which case we're
- # certainly not running on DOS !!
+ # We try to recognize a Cygwin session, in which case we're
+ # certainly not running on DOS!
#
ifneq ($(OSTYPE),cygwin)
is_dos := $(findstring Dos,$(shell ver))
diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in
index 3aa0cd5..0e53a65 100644
--- a/builds/unix/unix-cc.in
+++ b/builds/unix/unix-cc.in
@@ -76,6 +76,6 @@ LDFLAGS := @LDFLAGS@
# Library linking
#
LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
- -rpath $(libdir) -version-info $(version_info)
+ -rpath $(libdir) -version-info $(version_info)
# EOF
diff --git a/docs/BUILD b/docs/BUILD
index f337874..e12b8db 100644
--- a/docs/BUILD
+++ b/docs/BUILD
@@ -1,22 +1,25 @@
-FreeType 2 compilation how-to
+
+
+ FreeType 2 compilation how-to
+ =============================
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
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:
make // this will setup the build
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 // build the library
@@ -27,19 +30,19 @@ I. QUICK COMMAND-LINE GUIDE:
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:
make CFG="--prefix=/usr/local"
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
shell, please skip to section III below (DETAILED COMPILATION)
diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h
index 3826b50..ca60560 100644
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -211,7 +211,7 @@
BASE_DEF( FT_Error ) FT_New_GlyphSlot( FT_Face face,
FT_GlyphSlot* aslot );
- BASE_DEF( void ) FT_Done_GlyphSlot( FT_GlyphSlot slot );
+ BASE_DEF( void ) FT_Done_GlyphSlot( FT_GlyphSlot slot );
/*************************************************************************/
diff --git a/src/autohint/ahglyph.c b/src/autohint/ahglyph.c
index 5536a7b..348a813 100644
--- a/src/autohint/ahglyph.c
+++ b/src/autohint/ahglyph.c
@@ -332,9 +332,12 @@
FT_Int max = outline->max_points;
- if ( REALLOC_ARRAY( outline->points, max, news, AH_Point ) ||
- REALLOC_ARRAY( outline->horz_edges, max*2, news*2, AH_Edge ) ||
- REALLOC_ARRAY( outline->horz_segments, max*2, news*2, AH_Segment ) )
+ if ( REALLOC_ARRAY( outline->points,
+ max, news, AH_Point ) ||
+ REALLOC_ARRAY( outline->horz_edges,
+ max * 2, news * 2, AH_Edge ) ||
+ REALLOC_ARRAY( outline->horz_segments,
+ max * 2, news * 2, AH_Segment ) )
goto Exit;
/* readjust some pointers */
diff --git a/src/cid/cidload.c b/src/cid/cidload.c
index 52a6967..09735a0 100644
--- a/src/cid/cidload.c
+++ b/src/cid/cidload.c
@@ -220,8 +220,7 @@
matrix->xy = temp[2];
matrix->yy = temp[3];
- /* note that the font offset are expressed in */
- /* integer font units.. */
+ /* note that the font offsets are expressed in integer font units */
offset->x = temp[4] >> 16;
offset->y = temp[5] >> 16;
}
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index 1205c67..5a793ef 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -1854,19 +1854,19 @@
return ErrRaster_Invalid_Outline;
/* if direct mode is not set, we must have a target bitmap */
- if ( (params->flags & ft_raster_flag_direct) == 0 &&
- ( !target_map || !target_map->buffer ) )
+ if ( ( params->flags & ft_raster_flag_direct ) == 0 &&
+ ( !target_map || !target_map->buffer ) )
return -1;
/* 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;
ras.outline = *outline;
ras.num_cells = 0;
ras.invalid = 1;
- if (target_map)
+ if ( target_map )
ras.target = *target_map;
ras.render_span = (FT_Raster_Span_Func)grays_render_span;
diff --git a/src/type1z/z1load.c b/src/type1z/z1load.c
index 8d15893..a5fc91c 100644
--- a/src/type1z/z1load.c
+++ b/src/type1z/z1load.c
@@ -913,8 +913,7 @@
matrix->xy = temp[2];
matrix->yy = temp[3];
- /* note that the offset must be expressed in */
- /* integer font units.. */
+ /* note that the offsets must be expressed in integer font units */
offset->x = temp[4] >> 16;
offset->y = temp[5] >> 16;
}