From da32d7054dc34d2f92f9f8e465d55589fe58e354 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Wed, 6 Aug 2008 09:09:41 +0000 Subject: [PATCH] Add one more example to the documentation of FT_Glyph_To_Bitmap. --- ChangeLog.20 | 2 +- include/freetype/ftglyph.h | 39 +++++++++++++++++++++++++++++++++++++- src/cff/cffgload.c | 2 -- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/ChangeLog.20 b/ChangeLog.20 index 78fad1097..8fcc5e70a 100644 --- a/ChangeLog.20 +++ b/ChangeLog.20 @@ -2597,7 +2597,7 @@ ---------------------------------------------------------------------------- -Copyright 2000, 2001, 2002, 2007, 2008 by +Copyright 2000, 2001, 2002, 2007 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, modified, diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h index 668a73fe8..fdf410e92 100644 --- a/include/freetype/ftglyph.h +++ b/include/freetype/ftglyph.h @@ -444,6 +444,8 @@ FT_BEGIN_HEADER /* FreeType error code. 0~means success. */ /* */ /* */ + /* This function does nothing if the glyph format isn't scalable. */ + /* */ /* The glyph image is translated with the `origin' vector before */ /* rendering. */ /* */ @@ -483,7 +485,42 @@ FT_BEGIN_HEADER /* } */ /* */ /* */ - /* This function does nothing if the glyph format isn't scalable. */ + /* Here another example, again without error handling: */ + /* */ + /* */ + /* { */ + /* FT_Glyph glyphs[MAX_GLYPHS] */ + /* */ + /* */ + /* ... */ + /* */ + /* for ( idx = 0; i < MAX_GLYPHS; i++ ) */ + /* error = FT_Load_Glyph( face, idx, FT_LOAD_DEFAULT ) || */ + /* FT_Get_Glyph ( face->glyph, &glyph[idx] ); */ + /* */ + /* ... */ + /* */ + /* for ( idx = 0; i < MAX_GLYPHS; i++ ) */ + /* { */ + /* FT_Glyph bitmap = glyphs[idx]; */ + /* */ + /* */ + /* ... */ + /* */ + /* // after this call, `bitmap' no longer points into */ + /* // the `glyphs' array (and the old value isn't destroyed) */ + /* FT_Glyph_To_Bitmap( &bitmap, FT_RENDER_MODE_MONO, 0, 0 ); */ + /* */ + /* ... */ + /* */ + /* FT_Done_Glyph( bitmap ); */ + /* } */ + /* */ + /* ... */ + /* */ + /* for ( idx = 0; i < MAX_GLYPHS; i++ ) */ + /* FT_Done_Glyph( glyphs[idx] ); */ + /* } */ /* */ FT_EXPORT( FT_Error ) FT_Glyph_To_Bitmap( FT_Glyph* the_glyph, diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index 2d30b9d9f..935239d32 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -426,9 +426,7 @@ } #ifdef FT_DEBUG_LEVEL_TRACE else - { FT_TRACE4(( "glyph index %d:\n", glyph_index )); - } #endif decoder->num_locals = sub->num_local_subrs;