Commit 5a73d8d20fde372543a92c4bfc35fbbe815650f5
2006-03-20T16:55:32
* builds/freetype.mk (CACHE_DIR, CACHE_H): Remove. (FREETYPE_H): Updated. * src/cache/rules.mk (CACHE_H_DIR): Remove. (CACHE_DRV_H): Updated. Formatting, copyright years.
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 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445
diff --git a/ChangeLog b/ChangeLog
index 94ce302..1e7f951 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,57 +1,86 @@
-2006-03-20 David Turner <david@freetype.org>
-
- * src/autofit/aflatin.c (af_latin_hints_init):
- disable horizontal hinting for italic/oblique fonts
-
- * builds/win32/visualc/freetype.dsp: updating the project file, adding
- missing base source files (e.g. ftstroke.c, ftxf86.c, etc...)
-
- * src/autofit/afcjk.c, src/autofit/aflatin.c, src/base/ftobjs.c,
- src/cff/cffobjs.c, src/cid/cidobjs.c, src/pfr/pfrobjs.c,
- src/sfnt/sfobjs.c, src/sfnt/ttmtx.c, src/truetype/ttpload.c,
- src/truetype/ttpload.h, src/type1/t1afm.c, src/type1/t1objs.c:
- removing compiler warnings when building with Visual C++ 6 and /W4
-
- * builds/unix/install.mk:
- changing the installation procedure to remove the 'freetype/cache'
- from the target directory.
-
- * include/freetype/cache/ftccache.h,
- include/freetype/cache/ftccmap.h,
- include/freetype/cache/ftcglyph.h
- include/freetype/cache/ftcimage.h
- include/freetype/cache/ftcmanag.h
- include/freetype/cache/ftcmru.h
- include/freetype/cache/ftcsbits.h:
- removing these header files from the public include directory.
-
- * include/freetype/config/ftheader.h:
- changing the definition of FT_CACHE_INTERNAL_XXX_H macros to
- redirect to FT_CACHE_H instead
-
- * src/cache/ftcbasic.c, src/cache/ftccache.c, src/cache/ftccache.h,
- src/cache/ftccback.h, src/cache/ftccmap.c, src/cache/ftcglyph.c,
- src/cache/ftcglyph.h, src/cache/ftcimage.c, src/cache/ftcimage.h,
- src/cache/ftcmanag.c, src/cache/ftcmanag.h, src/cache/ftcmru.c,
- src/cache/ftcmru.h, src/cache/ftcsbits.c, src/cache/ftcsbits.h:
- modifications to prevent using the FT_CACHE_INTERNAL_XXX_H macros,
- and grab the headers in 'src/cache' instead (see below).
-
- * src/cache/ftccache.h, src/cache/ftcglyph.h, src/cache/ftcimage.h,
- src/cache/ftcsbits.h, src/cache/ftcmanag.h, src/cache/ftccmap.h,
- src/cache/ftcmru.h: copying the cache's internal header files which
- were located in 'include/freetype/cache' to the 'src/cache' directory
- instead.
-
- Note that these files are not used by FreeType clients, all cache
- public APIs have been already moved to include/freetype/ftcache.h,
- and the FT_CACHE_INTERNAL_XXXX_H macros all resolve to it.
-
- the move is to allow us to modify the internals without intereference
- from rogue clients. Note that there are no known client that accesses
- the cache internals at the moment.
-
-2006-03-06 David Turner <david@freetype.org>
+2006-03-20 Werner Lemberg <wl@gnu.org>
+
+ * builds/freetype.mk (CACHE_DIR, CACHE_H): Remove.
+ (FREETYPE_H): Updated.
+
+ * src/cache/rules.mk (CACHE_H_DIR): Remove.
+ (CACHE_DRV_H): Updated.
+
+2006-03-20 David Turner <david@freetype.org>
+
+ * include/freetype/cache/ftccache.h,
+ include/freetype/cache/ftccmap.h, include/freetype/cache/ftcglyph.h
+ include/freetype/cache/ftcimage.h include/freetype/cache/ftcmanag.h
+ include/freetype/cache/ftcmru.h include/freetype/cache/ftcsbits.h:
+ Move to...
+
+ * src/cache/ftccache.h, src/cache/ftcglyph.h, src/cache/ftcimage.h,
+ src/cache/ftcsbits.h, src/cache/ftcmanag.h, src/cache/ftccmap.h,
+ src/cache/ftcmru.h: This new location.
+ Update declarations according to the changes in the corresponding
+ source files.
+
+ Note that these files are not used by FreeType clients; all public
+ APIs of the cache module have been already moved to
+ `include/freetype/ftcache.h', and all FT_CACHE_INTERNAL_XXXX_H
+ macros resolve to it.
+
+ Reason for the move is to allow modifications of the internals
+ without interferences with rogue clients. Note that there are no
+ known clients that access the cache internals at the moment.
+
+ * builds/unix/install.mk (install): Don't install headers from
+ $(CACHE_H).
+ Remove `freetype/cache' from the target directory.
+
+ * include/freetype/config/ftheader.h (FT_CACHE_MANAGER_H,
+ FT_CACHE_INTERNAL_MRU_H, FT_CACHE_INTERNAL_MANAGER_H,
+ FT_CACHE_INTERNAL_CACHE_H, FT_CACHE_INTERNAL_GLYPH_H,
+ FT_CACHE_INTERNAL_IMAGE_H, FT_CACHE_INTERNAL_SBITS_H): Point to
+ FT_CACHE_H.
+
+ * src/cache/ftcbasic.c, src/cache/ftccache.h, src/cache/ftccback.h,
+ src/cache/ftccmap.c, src/cache/ftcglyph.c, src/cache/ftcglyph.h,
+ src/cache/ftcimage.c, src/cache/ftcimage.h, src/cache/ftcmanag.c,
+ src/cache/ftcmanag.h, src/cache/ftcmru.h, src/cache/ftcsbits.c,
+ src/cache/ftcsbits.h: Don't use the FT_CACHE_INTERNAL_XXX_H macros
+ but include the headers directly (which are now in `src/cache').
+
+ * src/cache/ftccache.c: Don't use the FT_CACHE_INTERNAL_XXX_H
+ macros but include the headers directly.
+ (FTC_Cache_Init, FTC_Cache_Done, FTC_Cache_NewNode,
+ FTC_Cache_Lookup, FTC_Cache_RemoveFaceID): Declare as FT_LOCAL_DEF.
+
+ * src/cache/ftccache.c: Don't use the FT_CACHE_INTERNAL_XXX_H
+ macros but include the headers directly.
+ (FTC_MruNode_Prepend, FTC_MruNode_Up, FTC_MruNode_Remove,
+ FTC_MruList_Init, FTC_MruList_Reset, FTC_MruList_Done,
+ FTC_MruList_New, FTC_MruList_Remove, FTC_MruList_RemoveSelection):
+ Declare as FT_LOCAL_DEF.
+ (FTC_MruListFind, FTC_MruList_Lookup) [!FTC_INLINE]: Compile
+ conditionally.
+ Declare as FT_LOCAL_DEF.
+
+
+ * builds/win32/visualc/freetype.dsp: Update project file, add
+ missing base source files (ftstroke.c, ftxf86.c, etc.).
+
+
+ * src/autofit/afcjk.c, src/autofit/aflatin.c, src/base/ftobjs.c,
+ src/cff/cffobjs.c, src/cid/cidobjs.c, src/pfr/pfrobjs.c,
+ src/sfnt/sfobjs.c, src/sfnt/ttmtx.c, src/type1/t1afm.c,
+ src/type1/t1objs.c: Remove compiler warnings when building with
+ Visual C++ 6 and /W4.
+
+ * src/autofit/aflatin.c (af_latin_hints_init): Disable horizontal
+ hinting for italic/oblique fonts.
+
+
+
+ * src/truetype/ttpload.c, src/truetype/ttpload.h
+ (tt_face_get_device_metrics): Change second argument to `FT_UInt'.
+
+2006-03-06 David Turner <david@freetype.org>
* src/cache/ftcmanag.c (FTC_Manager_Lookup_Size): Prevent crashes in
Mozilla/FireFox print preview in Ubuntu Hoary.
diff --git a/builds/freetype.mk b/builds/freetype.mk
index c60e9ef..cb59b42 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -101,7 +101,6 @@ PUBLIC_DIR := $(TOP_DIR)/include/freetype
INTERNAL_DIR := $(PUBLIC_DIR)/internal
SERVICES_DIR := $(INTERNAL_DIR)/services
CONFIG_DIR := $(PUBLIC_DIR)/config
-CACHE_DIR := $(PUBLIC_DIR)/cache
# The documentation directory.
#
@@ -169,8 +168,8 @@ OBJECTS_LIST :=
# Define $(PUBLIC_H) as the list of all public header files located in
-# `$(TOP_DIR)/include/freetype'. $(BASE_H), $(CACHE_H), and $(CONFIG_H) are
-# defined similarly.
+# `$(TOP_DIR)/include/freetype'. $(BASE_H), and $(CONFIG_H) are defined
+# similarly.
#
# This is used to simplify the dependency rules -- if one of these files
# changes, the whole library is recompiled.
@@ -182,10 +181,9 @@ CONFIG_H := $(wildcard $(CONFIG_DIR)/*.h) \
$(wildcard $(BUILD_DIR)/freetype/config/*.h) \
$(FTMODULE_H) \
$(FTOPTION_H)
-CACHE_H := $(wildcard $(CACHE_DIR)/*.h)
DEVEL_H := $(wildcard $(TOP_DIR)/devel/*.h)
-FREETYPE_H := $(PUBLIC_H) $(BASE_H) $(CONFIG_H) $(CACHE_H) $(DEVEL_H)
+FREETYPE_H := $(PUBLIC_H) $(BASE_H) $(CONFIG_H) $(DEVEL_H)
# ftsystem component
diff --git a/builds/unix/install.mk b/builds/unix/install.mk
index d835589..680bfa1 100644
--- a/builds/unix/install.mk
+++ b/builds/unix/install.mk
@@ -44,7 +44,7 @@ install: $(PROJECT_LIBRARY)
$(INSTALL_DATA) \
$$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \
done
- -$(DELETE° $(DESTDIR)$(includedir)/freetype2/freetype/cache/*
+ -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/cache/*
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/cache
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/internal/*
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/internal
diff --git a/include/freetype/config/ftheader.h b/include/freetype/config/ftheader.h
index fe27d15..ac65bab 100644
--- a/include/freetype/config/ftheader.h
+++ b/include/freetype/config/ftheader.h
@@ -624,10 +624,10 @@
#define FT_ERROR_DEFINITIONS_H <freetype/fterrdef.h>
-/* the internals of the cache sub-system are no longer exposed, we */
-/* default to FT_CACHE_H at the moment just in case, but we know of */
-/* no rogue client that uses them anyway */
-/* */
+ /* The internals of the cache sub-system are no longer exposed. We */
+ /* default to FT_CACHE_H at the moment just in case, but we know of */
+ /* no rogue client that uses them. */
+ /* */
#define FT_CACHE_MANAGER_H <freetype/ftcache.h>
#define FT_CACHE_INTERNAL_MRU_H <freetype/ftcache.h>
#define FT_CACHE_INTERNAL_MANAGER_H <freetype/ftcache.h>
@@ -636,6 +636,7 @@
#define FT_CACHE_INTERNAL_IMAGE_H <freetype/ftcache.h>
#define FT_CACHE_INTERNAL_SBITS_H <freetype/ftcache.h>
+
#define FT_XFREE86_H <freetype/ftxf86.h>
#define FT_INCREMENTAL_H <freetype/ftincrem.h>
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index 335d23d..5f6949d 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -1364,7 +1364,7 @@
/*
* In `light' hinting mode we disable horizontal hinting completely.
- * we also do it if the face is italic
+ * We also do it if the face is italic.
*/
if ( mode == FT_RENDER_MODE_LIGHT ||
(face->style_flags & FT_STYLE_FLAG_ITALIC) != 0 )
diff --git a/src/cache/ftcglyph.c b/src/cache/ftcglyph.c
index 70474e3..dc0a7b9 100644
--- a/src/cache/ftcglyph.c
+++ b/src/cache/ftcglyph.c
@@ -4,7 +4,7 @@
/* */
/* FreeType Glyph Image (FT_Glyph) cache (body). */
/* */
-/* Copyright 2000-2001, 2003, 2004 by */
+/* Copyright 2000-2001, 2003, 2004, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/cache/ftcglyph.h b/src/cache/ftcglyph.h
index 4441e83..2548761 100644
--- a/src/cache/ftcglyph.h
+++ b/src/cache/ftcglyph.h
@@ -4,7 +4,7 @@
/* */
/* FreeType abstract glyph cache (specification). */
/* */
-/* Copyright 2000-2001, 2003, 2004 by */
+/* Copyright 2000-2001, 2003, 2004, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/cache/ftcimage.c b/src/cache/ftcimage.c
index 54133aa..b1015cb 100644
--- a/src/cache/ftcimage.c
+++ b/src/cache/ftcimage.c
@@ -4,7 +4,7 @@
/* */
/* FreeType Image cache (body). */
/* */
-/* Copyright 2000-2001, 2003, 2004 by */
+/* Copyright 2000-2001, 2003, 2004, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/cache/ftcimage.h b/src/cache/ftcimage.h
index 6acc77b..eafaa38 100644
--- a/src/cache/ftcimage.h
+++ b/src/cache/ftcimage.h
@@ -4,7 +4,7 @@
/* */
/* FreeType Generic Image cache (specification) */
/* */
-/* Copyright 2000-2001, 2002, 2003 by */
+/* Copyright 2000-2001, 2002, 2003, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/cache/ftcmanag.h b/src/cache/ftcmanag.h
index e455a54..d1742fe 100644
--- a/src/cache/ftcmanag.h
+++ b/src/cache/ftcmanag.h
@@ -4,7 +4,7 @@
/* */
/* FreeType Cache Manager (specification). */
/* */
-/* Copyright 2000-2001, 2003, 2004 by */
+/* Copyright 2000-2001, 2003, 2004, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/cache/ftcmru.c b/src/cache/ftcmru.c
index 21d2e0c..3a6c625 100644
--- a/src/cache/ftcmru.c
+++ b/src/cache/ftcmru.c
@@ -4,7 +4,7 @@
/* */
/* FreeType MRU support (body). */
/* */
-/* Copyright 2003, 2004 by */
+/* Copyright 2003, 2004, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/cache/ftcmru.h b/src/cache/ftcmru.h
index 37c60ef..c8f0c6e 100644
--- a/src/cache/ftcmru.h
+++ b/src/cache/ftcmru.h
@@ -4,7 +4,7 @@
/* */
/* Simple MRU list-cache (specification). */
/* */
-/* Copyright 2000-2001, 2003, 2004, 2005 by */
+/* Copyright 2000-2001, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c
index 4e544d8..cef0106 100644
--- a/src/cache/ftcsbits.c
+++ b/src/cache/ftcsbits.c
@@ -4,7 +4,7 @@
/* */
/* FreeType sbits manager (body). */
/* */
-/* Copyright 2000-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/cache/ftcsbits.h b/src/cache/ftcsbits.h
index 5da1bf7..56570e3 100644
--- a/src/cache/ftcsbits.h
+++ b/src/cache/ftcsbits.h
@@ -4,7 +4,7 @@
/* */
/* A small-bitmap cache (specification). */
/* */
-/* Copyright 2000-2001, 2002, 2003 by */
+/* Copyright 2000-2001, 2002, 2003, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/cache/rules.mk b/src/cache/rules.mk
index 381104a..3af1f25 100644
--- a/src/cache/rules.mk
+++ b/src/cache/rules.mk
@@ -3,7 +3,7 @@
#
-# Copyright 2000, 2001, 2003, 2004 by
+# Copyright 2000, 2001, 2003, 2004, 2006 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -16,7 +16,6 @@
# Cache driver directory
#
CACHE_DIR := $(SRC_DIR)/cache
-CACHE_H_DIR := $(PUBLIC_DIR)/cache
# compilation flags for the driver
#
@@ -25,24 +24,24 @@ CACHE_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(CACHE_DIR))
# Cache driver sources (i.e., C files)
#
-CACHE_DRV_SRC := $(CACHE_DIR)/ftcmru.c \
- $(CACHE_DIR)/ftcmanag.c \
- $(CACHE_DIR)/ftcbasic.c \
+CACHE_DRV_SRC := $(CACHE_DIR)/ftcbasic.c \
$(CACHE_DIR)/ftccache.c \
+ $(CACHE_DIR)/ftccmap.c \
$(CACHE_DIR)/ftcglyph.c \
- $(CACHE_DIR)/ftcsbits.c \
$(CACHE_DIR)/ftcimage.c \
- $(CACHE_DIR)/ftccmap.c
+ $(CACHE_DIR)/ftcmanag.c \
+ $(CACHE_DIR)/ftcmru.c \
+ $(CACHE_DIR)/ftcsbits.c
# Cache driver headers
#
-CACHE_DRV_H := $(CACHE_H_DIR)/ftcmru.h \
- $(CACHE_H_DIR)/ftcmanag.h \
- $(CACHE_H_DIR)/ftcglyph.h \
- $(CACHE_H_DIR)/ftcimage.h \
- $(CACHE_H_DIR)/ftccmap.h \
- $(CACHE_DIR)/ftcerror.h \
- $(CACHE_DIR)/ftccback.h
+CACHE_DRV_H := $(CACHE_DIR)/ftccback.h \
+ $(CACHE_DIR)/ftccmap.h \
+ $(CACHE_DIR)/ftcerror.h \
+ $(CACHE_DIR)/ftcglyph.h \
+ $(CACHE_DIR)/ftcimage.h \
+ $(CACHE_DIR)/ftcmanag.h \
+ $(CACHE_DIR)/ftcmru.h
# Cache driver object(s)
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index a29a0b6..869269c 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -567,7 +567,7 @@
if ( !has_outline && sfnt->load_bhed )
{
LOAD_( bhed );
- is_apple_sbit = FT_BOOL(!error);
+ is_apple_sbit = FT_BOOL( !error );
}
/* load the font header (`head' table) if this isn't an Apple */
@@ -947,7 +947,7 @@
if ( error )
goto Exit;
- bsize->height = (FT_Short)(metrics.height >> 6);
+ bsize->height = (FT_Short)( metrics.height >> 6 );
bsize->width = (FT_Short)(
( avgwidth * metrics.x_ppem + em_size / 2 ) / em_size );
diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c
index 25a2221..379b330 100644
--- a/src/type1/t1afm.c
+++ b/src/type1/t1afm.c
@@ -285,8 +285,8 @@
t1_face->bbox.xMax = ( fi->FontBBox.xMax + 0xFFFFU ) >> 16;
t1_face->bbox.yMax = ( fi->FontBBox.yMax + 0xFFFFU ) >> 16;
- t1_face->ascender = (FT_Short)(( fi->Ascender + 0x8000U ) >> 16);
- t1_face->descender = (FT_Short)(( fi->Descender + 0x8000U ) >> 16);
+ t1_face->ascender = (FT_Short)( ( fi->Ascender + 0x8000U ) >> 16 );
+ t1_face->descender = (FT_Short)( ( fi->Descender + 0x8000U ) >> 16 );
if ( fi->NumKernPair )
{