summaryrefslogtreecommitdiffstats
path: root/include/freetype/ftpfr.h
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2009-07-25 17:48:01 -0700
committerJean-Baptiste Queru <jbq@google.com>2009-07-25 17:48:01 -0700
commitdc280eeb0aa3d55aaf6584c86623bf999ebd1736 (patch)
tree14b8437e23a816c57512fe472fdef4c7875c2eba /include/freetype/ftpfr.h
parent885cd2c19cbf73725d51f6b184d087b28343de1e (diff)
parent77f63d23f7d380b0ff02c18fd6a154ab9063128a (diff)
downloadandroid_external_freetype-dc280eeb0aa3d55aaf6584c86623bf999ebd1736.tar.gz
android_external_freetype-dc280eeb0aa3d55aaf6584c86623bf999ebd1736.tar.bz2
android_external_freetype-dc280eeb0aa3d55aaf6584c86623bf999ebd1736.zip
Merge korg/donut into korg/master
Diffstat (limited to 'include/freetype/ftpfr.h')
-rw-r--r--include/freetype/ftpfr.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/freetype/ftpfr.h b/include/freetype/ftpfr.h
index e2801fd..0b7b7d4 100644
--- a/include/freetype/ftpfr.h
+++ b/include/freetype/ftpfr.h
@@ -4,7 +4,7 @@
/* */
/* FreeType API for accessing PFR-specific data (specification only). */
/* */
-/* Copyright 2002, 2003, 2004, 2006 by */
+/* Copyright 2002, 2003, 2004, 2006, 2008, 2009 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -62,8 +62,8 @@ FT_BEGIN_HEADER
*
* @output:
* aoutline_resolution ::
- * Outline resolution. This is equivalent to `face->units_per_EM'.
- * Optional (parameter can be NULL).
+ * Outline resolution. This is equivalent to `face->units_per_EM'
+ * for non-PFR fonts. Optional (parameter can be NULL).
*
* ametrics_resolution ::
* Metrics resolution. This is equivalent to `outline_resolution'
@@ -73,14 +73,14 @@ FT_BEGIN_HEADER
* A 16.16 fixed-point number used to scale distance expressed
* in metrics units to device sub-pixels. This is equivalent to
* `face->size->x_scale', but for metrics only. Optional (parameter
- * can be NULL)
+ * can be NULL).
*
* ametrics_y_scale ::
* Same as `ametrics_x_scale' but for the vertical direction.
- * optional (parameter can be NULL)
+ * optional (parameter can be NULL).
*
* @return:
- * FreeType error code. 0 means success.
+ * FreeType error code. 0~means success.
*
* @note:
* If the input face is not a PFR, this function will return an error.
@@ -115,7 +115,7 @@ FT_BEGIN_HEADER
* avector :: A kerning vector.
*
* @return:
- * FreeType error code. 0 means success.
+ * FreeType error code. 0~means success.
*
* @note:
* This function always return distances in original PFR metrics
@@ -150,7 +150,7 @@ FT_BEGIN_HEADER
* aadvance :: The glyph advance in metrics units.
*
* @return:
- * FreeType error code. 0 means success.
+ * FreeType error code. 0~means success.
*
* @note:
* You can use the `x_scale' or `y_scale' results of @FT_Get_PFR_Metrics