Commit e95365b291d13000e84b8e81671bea7e762ea557
2004-04-24T14:43:37
* include/freetype/ftcache.h (FT_Get_CharMap_Index): Rename declaration and move to... * include/freetype/freetype.h (FT_Get_Charmap_Index): Here. (FREETYPE_PATCH): Set to 9. * src/base/ftobjs.c (FT_Get_Charmap_Index): New function. * builds/unix/configure.ac (version_info): Set to 9:7:3. * builds/unix/configure: Updated. * builds/win32/visualc/index.html, builds/win32/visualc/freetype.dsp, builds/win32/visualc/freetype.vcproj: s/218/219/. * builds/freetype.mk (refdoc), README, Jamfile (RefDoc): s/2.1.8/2.1.9/. * docs/CHANGES, docs/VERSION.DLL: Updated.
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 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520
diff --git a/ChangeLog b/ChangeLog
index 3907b9c..2d7dd5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,36 @@
-2004-02-21 Werner Lemberg <wl@gnu.org>
+2004-04-23 Werner Lemberg <wl@gnu.org>
+
+ * include/freetype/ftcache.h (FT_Get_CharMap_Index): Rename
+ declaration and move to...
+ * include/freetype/freetype.h (FT_Get_Charmap_Index): Here.
+ (FREETYPE_PATCH): Set to 9.
+
+ * src/base/ftobjs.c (FT_Get_Charmap_Index): New function.
+
+ * builds/unix/configure.ac (version_info): Set to 9:7:3.
+ * builds/unix/configure: Updated.
+
+ * builds/win32/visualc/index.html,
+ builds/win32/visualc/freetype.dsp,
+ builds/win32/visualc/freetype.vcproj: s/218/219/.
+
+ * builds/freetype.mk (refdoc), README, Jamfile (RefDoc):
+ s/2.1.8/2.1.9/.
+
+ * docs/CHANGES, docs/VERSION.DLL: Updated.
+
+2004-04-21 Werner Lemberg <wl@gnu.org>
* src/cff/cffparse.c (cff_parser_run), src/psaux/psobjs.c
(ps_parser_load_field): Use FT_CHAR_BIT.
2004-04-21 David Turner <david@freetype.org>
+
+ * Version 2.1.8 released.
+ =========================
+
+
* src/cff/cffobjs.c (cff_face_init): Fix a small memory leak.
* src/autofit/afloader.c (af_loader_load_g), src/autofit/afmodule.c
diff --git a/Jamfile b/Jamfile
index c4e98a9..54fe154 100644
--- a/Jamfile
+++ b/Jamfile
@@ -148,7 +148,7 @@ if $(DEBUG_HINTER)
actions RefDoc
{
- python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.1.8 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h $(FT2_INCLUDE)/freetype/cache/*.h
+ python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.1.9 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h $(FT2_INCLUDE)/freetype/cache/*.h
}
RefDoc refdoc ;
diff --git a/README b/README
index 72baf3d..064a3c7 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@
is called `libttf'. They are *not* compatible!
- FreeType 2.1.8
+ FreeType 2.1.9
==============
Please read the docs/CHANGES file, it contains IMPORTANT INFORMATION.
@@ -19,9 +19,9 @@
Note that the FreeType 2 documentation is now available as a
separate package from our sites. See:
- ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.8.tar.bz2
- ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.8.tar.gz
- ftp://ftp.freetype.org/pub/freetype2/ftdoc218.zip
+ ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.9.tar.bz2
+ ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.9.tar.gz
+ ftp://ftp.freetype.org/pub/freetype2/ftdoc219.zip
Bugs
diff --git a/builds/freetype.mk b/builds/freetype.mk
index 29fa344..00325d6 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -254,7 +254,7 @@ library: $(PROJECT_LIBRARY)
refdoc:
python $(SRC_DIR)/tools/docmaker/docmaker.py \
--prefix=ft2 \
- --title=FreeType-2.1.8 \
+ --title=FreeType-2.1.9 \
--output=$(DOC_DIR) \
$(PUBLIC_DIR)/*.h \
$(PUBLIC_DIR)/config/*.h \
diff --git a/builds/unix/configure b/builds/unix/configure
index 35bd6d2..d08ac9d 100644
--- a/builds/unix/configure
+++ b/builds/unix/configure
@@ -1720,7 +1720,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Don't forget to update docs/VERSION.DLL!
-version_info='9:6:3'
+version_info='9:7:3'
ft_version=`echo $version_info | tr : .`
diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
index 1cddcac..71a04ce 100644
--- a/builds/unix/configure.ac
+++ b/builds/unix/configure.ac
@@ -8,7 +8,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])
# Don't forget to update docs/VERSION.DLL!
-version_info='9:6:3'
+version_info='9:7:3'
AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version])
diff --git a/builds/win32/visualc/freetype.dsp b/builds/win32/visualc/freetype.dsp
index bb353de..5e88deb 100644
--- a/builds/win32/visualc/freetype.dsp
+++ b/builds/win32/visualc/freetype.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype218.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype219.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug"
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype218_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype219_D.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded"
@@ -103,7 +103,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"lib\freetype200b8_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype218MT_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype219MT_D.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded"
@@ -127,7 +127,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"lib\freetype200b8.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype218MT.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype219MT.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded"
@@ -152,7 +152,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype206.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype218ST.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype219ST.lib"
# SUBTRACT LIB32 /nologo
!ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@@ -178,7 +178,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype206_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype218ST_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype219ST_D.lib"
!ENDIF
diff --git a/builds/win32/visualc/freetype.vcproj b/builds/win32/visualc/freetype.vcproj
index fefe7c7..4967e58 100644
--- a/builds/win32/visualc/freetype.vcproj
+++ b/builds/win32/visualc/freetype.vcproj
@@ -41,7 +41,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype218.lib"
+ OutputFile="..\..\..\objs\freetype219.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"/>
@@ -94,7 +94,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype218MT.lib"
+ OutputFile="..\..\..\objs\freetype219MT.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"/>
@@ -147,7 +147,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype218ST.lib"/>
+ OutputFile="..\..\..\objs\freetype219ST.lib"/>
<Tool
Name="VCMIDLTool"/>
<Tool
@@ -197,7 +197,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype218_D.lib"
+ OutputFile="..\..\..\objs\freetype219_D.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"/>
@@ -248,7 +248,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype218ST_D.lib"
+ OutputFile="..\..\..\objs\freetype219ST_D.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"/>
@@ -299,7 +299,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype218MT_D.lib"
+ OutputFile="..\..\..\objs\freetype219MT_D.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"/>
diff --git a/builds/win32/visualc/index.html b/builds/win32/visualc/index.html
index 657460a..10e4cfc 100644
--- a/builds/win32/visualc/index.html
+++ b/builds/win32/visualc/index.html
@@ -16,10 +16,10 @@ will compile the following libraries from the FreeType 2.1.8 sources:</p>
<ul>
<pre>
- freetype218.lib - release build; single threaded
- freetype218_D.lib - debug build; single threaded
- freetype218MT.lib - release build; multi-threaded
- freetype218MT_D.lib - debug build; multi-threaded</pre>
+ freetype219.lib - release build; single threaded
+ freetype219_D.lib - debug build; single threaded
+ freetype219MT.lib - release build; multi-threaded
+ freetype219MT_D.lib - debug build; multi-threaded</pre>
</ul>
<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/docs/CHANGES b/docs/CHANGES
index 2bb57b5..6daf328 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -1,4 +1,16 @@
+LATEST CHANGES BETWEEN 2.1.9 and 2.1.8
+
+ I. IMPORTANT BUG FIXES
+
+ - The function `FT_Get_CharMap_Index' was only declared, without
+ any real code. For consistency, it has been renamed to
+ `FT_Get_Charmap_Index'. (This function is needed to implement
+ cmap caches.)
+
+
+======================================================================
+
LATEST CHANGES BETWEEN 2.1.8 and 2.1.7
I. IMPORTANT BUG FIXES
diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL
index 5b178bd..9e27a57 100644
--- a/docs/VERSION.DLL
+++ b/docs/VERSION.DLL
@@ -52,6 +52,7 @@ systems, but not all of them:
release libtool so
-------------------------------
+ 2.1.9 9.7.3 6.3.7
2.1.8 9.6.3 6.3.6
2.1.7 9.5.3 6.3.5
2.1.6 9.5.3 6.3.5
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 6acf166..7287005 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -44,7 +44,7 @@
/* */
#define FREETYPE_MAJOR 2
#define FREETYPE_MINOR 1
-#define FREETYPE_PATCH 8
+#define FREETYPE_PATCH 9
#include <ft2build.h>
@@ -172,6 +172,7 @@ FT_BEGIN_HEADER
/* FT_CharMapRec */
/* FT_Select_Charmap */
/* FT_Set_Charmap */
+ /* FT_Get_Charmap_Index */
/* */
/*************************************************************************/
@@ -2674,6 +2675,25 @@ FT_BEGIN_HEADER
/*************************************************************************/
/* */
+ /* @function: */
+ /* FT_Get_Charmap_Index */
+ /* */
+ /* @description: */
+ /* Retrieve index of a given charmap. */
+ /* */
+ /* @input: */
+ /* charmap :: A handle to a charmap. */
+ /* */
+ /* @return: */
+ /* The index into the array of character maps within the face to */
+ /* which `charmap' belongs. */
+ /* */
+ FT_EXPORT( FT_Int )
+ FT_Get_Charmap_Index( FT_CharMap charmap );
+
+
+ /*************************************************************************/
+ /* */
/* <Function> */
/* FT_Get_Char_Index */
/* */
diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h
index c6dc14a..c26ce6b 100644
--- a/include/freetype/ftcache.h
+++ b/include/freetype/ftcache.h
@@ -55,7 +55,7 @@ FT_BEGIN_HEADER
/* */
/* <Description> */
/* This section describes the FreeType 2 cache sub-system which is */
- /* stile in beta. */
+ /* still in beta. */
/* */
/* <Order> */
/* FTC_Manager */
@@ -63,11 +63,13 @@ FT_BEGIN_HEADER
/* FTC_Face_Requester */
/* */
/* FTC_Manager_New */
+ /* FTC_Manager_Reset */
+ /* FTC_Manager_Done */
/* FTC_Manager_LookupFace */
/* FTC_Manager_LookupSize */
+ /* FTC_Manager_RemoveFaceID */
/* */
/* FTC_Node */
- /* FTC_Node_Ref */
/* FTC_Node_Unref */
/* */
/* FTC_Font */
@@ -80,6 +82,10 @@ FT_BEGIN_HEADER
/* FTC_SBitCache_New */
/* FTC_SBitCache_Lookup */
/* */
+ /* FTC_CMapCache */
+ /* FTC_CMapCache_New */
+ /* FTC_CMapCache_Lookup */
+ /* */
/* */
/* FTC_Image_Desc */
/* FTC_Image_Cache */
@@ -502,11 +508,6 @@ FT_BEGIN_HEADER
FTC_CMapCache *acache );
- /* retrieve the index of a given charmap */
- FT_EXPORT( FT_Int )
- FT_Get_CharMap_Index( FT_CharMap charmap );
-
-
/*************************************************************************/
/* */
/* @function: */
@@ -519,9 +520,9 @@ FT_BEGIN_HEADER
/* @input: */
/* cache :: A charmap cache handle. */
/* */
- /* face_id :: source face id */
+ /* face_id :: The source face ID. */
/* */
- /* cmap_index :: index of charmap in source face */
+ /* cmap_index :: The index of the charmap in the source face. */
/* */
/* char_code :: The character code (in the corresponding charmap). */
/* */
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 517e83e..8b0256e 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -2215,6 +2215,24 @@
}
+ /* documentation is in freetype.h */
+
+ FT_EXPORT_DEF( FT_Int )
+ FT_Get_Charmap_Index( FT_CharMap charmap )
+ {
+ FT_Int i;
+
+
+ for ( i = 0; i < charmap->face->num_charmaps; i++ )
+ if ( charmap->face->charmaps[i] == charmap )
+ break;
+
+ FT_ASSERT( i < charmap->face->num_charmaps );
+
+ return i;
+ }
+
+
FT_BASE_DEF( void )
FT_CMap_Done( FT_CMap cmap )
{
diff --git a/src/cache/ftcbasic.c b/src/cache/ftcbasic.c
index 5d5061c..e144971 100644
--- a/src/cache/ftcbasic.c
+++ b/src/cache/ftcbasic.c
@@ -231,6 +231,8 @@
};
+ /* documentation is in ftcache.h */
+
FT_EXPORT_DEF( FT_Error )
FTC_ImageCache_New( FTC_Manager manager,
FTC_ImageCache *acache )
@@ -240,7 +242,7 @@
}
- /* documentation is in ftcimage.h */
+ /* documentation is in ftcache.h */
FT_EXPORT_DEF( FT_Error )
FTC_ImageCache_Lookup( FTC_ImageCache cache,
@@ -347,6 +349,8 @@
};
+ /* documentation is in ftcache.h */
+
FT_EXPORT_DEF( FT_Error )
FTC_SBitCache_New( FTC_Manager manager,
FTC_SBitCache *acache )
@@ -356,6 +360,8 @@
}
+ /* documentation is in ftcache.h */
+
FT_EXPORT_DEF( FT_Error )
FTC_SBitCache_Lookup( FTC_SBitCache cache,
FTC_ImageType type,
diff --git a/src/cache/ftccmap.c b/src/cache/ftccmap.c
index dfdbb48..60f9953 100644
--- a/src/cache/ftccmap.c
+++ b/src/cache/ftccmap.c
@@ -196,7 +196,7 @@
};
- /* documentation is in ftccmap.h */
+ /* documentation is in ftcache.h */
FT_EXPORT_DEF( FT_Error )
FTC_CMapCache_New( FTC_Manager manager,
@@ -208,7 +208,7 @@
}
- /* documentation is in ftccmap.h */
+ /* documentation is in ftcache.h */
FT_EXPORT_DEF( FT_UInt )
FTC_CMapCache_Lookup( FTC_CMapCache cmap_cache,
diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c
index 9cc6489..04d064b 100644
--- a/src/cache/ftcmanag.c
+++ b/src/cache/ftcmanag.c
@@ -149,6 +149,8 @@
}
+ /* documentation is in ftcache.h */
+
FT_EXPORT_DEF( FT_Error )
FTC_Manager_LookupSize( FTC_Manager manager,
FTC_Scaler scaler,
@@ -617,6 +619,8 @@
}
+ /* documentation is in ftcache.h */
+
FT_EXPORT_DEF( void )
FTC_Manager_RemoveFaceID( FTC_Manager manager,
FTC_FaceID face_id )
@@ -633,7 +637,7 @@
}
- /* documentation is in ftcmanag.h */
+ /* documentation is in ftcache.h */
FT_EXPORT_DEF( void )
FTC_Node_Unref( FTC_Node node,