cvs: gd /gd-pango gd_pango.c
[email protected] ("Takeshi Abe") Thu, 11 Sep 2008 14:48:54 -0000
| Newsgroups | php.gd.cvs |
|---|---|
| Message-ID | <cvstabe1221144534@cvsserver> |
tabe Thu Sep 11 14:48:54 2008 UTC
Modified files:
/gd/gd-pango gd_pango.c
Log:
avoid the confusion on pt and dpi
http://cvs.php.net/viewvc.cgi/gd/gd-pango/gd_pango.c?r1=1.13&r2=1.14&diff_format=u
Index: gd/gd-pango/gd_pango.c
diff -u gd/gd-pango/gd_pango.c:1.13 gd/gd-pango/gd_pango.c:1.14
--- gd/gd-pango/gd_pango.c:1.13 Wed Sep 10 17:21:20 2008
+++ gd/gd-pango/gd_pango.c Thu Sep 11 14:48:54 2008
@@ -15,7 +15,7 @@
| Authors: Pierre-A. Joye <[email protected]> |
+----------------------------------------------------------------------+
*/
-/* $Id: gd_pango.c,v 1.13 2008/09/10 17:21:20 tabe Exp $ */
+/* $Id: gd_pango.c,v 1.14 2008/09/11 14:48:54 tabe Exp $ */
/**
* @file
* @brief Pango support for GD
@@ -24,7 +24,7 @@
*
* @author Pierre-Alain Joye
* @date 2006/12/19
- * $Id: gd_pango.c,v 1.13 2008/09/10 17:21:20 tabe Exp $
+ * $Id: gd_pango.c,v 1.14 2008/09/11 14:48:54 tabe Exp $
*/
/**
* \mainpage
@@ -806,6 +806,7 @@
*
* @param *context Context
* @param *fontlist path to ttf file
+ * @param ptsize font size in points
* @param *error output of error code on failure; simply ignored if error = NULL
* @return GD_SUCCESS on success, otherwise GD_FAILURE.
*/
@@ -838,7 +839,6 @@
font_desc = g_strconcat(fcFamilyName.u.s, " ", buf, NULL);
context->font_desc = pango_font_description_from_string(font_desc);
g_free(font_desc);
- gdPangoSetDpi(context, ptsize, ptsize);
r = GD_SUCCESS;
fail1:
FcPatternDestroy(fcPattern);
@@ -890,7 +890,7 @@
* @param *bbox gdBBox layout the resulting bounds
* @param fg foreground color
* @param *fontlist path to font file
- * @param ptsize font size
+ * @param ptsize font size in points
* @param angle angle in radians
* @param x top left corner
* @param y top left corner