diff options
author | Behdad Esfahbod <behdad@gnome.org> | 2006-08-21 06:52:37 +0000 |
---|---|---|
committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-08-21 06:52:37 +0000 |
commit | 3cd6668e49e6ab87fce98728f02fc2a010bcc820 (patch) | |
tree | 895d135d6cb8ea11582ca8fdde2cfe76d84cf523 | |
parent | 6b7a1d02c996803264dbbca4dc6bf44c8a823db6 (diff) | |
download | pango-3cd6668e49e6ab87fce98728f02fc2a010bcc820.tar.gz |
Bug 352114 – pango-1.14: generated docs still contain old example code
2006-08-21 Behdad Esfahbod <behdad@gnome.org>
Bug 352114 – pango-1.14: generated docs still contain old example code
* docs/tmpl/pangocairo.sgml: Update cairo example code to that of
examples/cairosimple.c.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | docs/tmpl/pangocairo.sgml | 51 |
2 files changed, 34 insertions, 24 deletions
@@ -1,3 +1,10 @@ +2006-08-21 Behdad Esfahbod <behdad@gnome.org> + + Bug 352114 – pango-1.14: generated docs still contain old example code + + * docs/tmpl/pangocairo.sgml: Update cairo example code to that of + examples/cairosimple.c. + 2006-08-17 Behdad Esfahbod <behdad@gnome.org> Part of Bug 348825 – pango should optimize away calls to FcFontSort as diff --git a/docs/tmpl/pangocairo.sgml b/docs/tmpl/pangocairo.sgml index fcc44ba0..7cda6f2e 100644 --- a/docs/tmpl/pangocairo.sgml +++ b/docs/tmpl/pangocairo.sgml @@ -39,15 +39,15 @@ to the floating point units used in Cairo divide by %PANGO_SCALE. <example id="rotated-example"> <title>Using Pango with Cairo</title> <programlisting> -#include <math.h> -#include <pango/pangocairo.h> +#<!-- -->include <math.h> +#<!-- -->include <pango/pangocairo.h> static void draw_text (cairo_t *cr) { -#define RADIUS 150 -#define N_WORDS 10 -#define FONT "Sans Bold 27" +#<!-- -->define RADIUS 150 +#<!-- -->define N_WORDS 10 +#<!-- -->define FONT "Sans Bold 27" PangoLayout *layout; PangoFontDescription *desc; @@ -74,9 +74,9 @@ draw_text (cairo_t *cr) cairo_save (cr); - /* Gradient from red at angle == 60 to blue at angle == 300 */ + /* Gradient from red at angle == 60 to blue at angle == 240 */ red = (1 + cos ((angle - 60) * G_PI / 180.)) / 2; - cairo_set_rgb_color (cr, red, 0, 1.0 - red); + cairo_set_source_rgb (cr, red, 0, 1.0 - red); cairo_rotate (cr, angle * G_PI / 180.); @@ -97,33 +97,36 @@ draw_text (cairo_t *cr) int main (int argc, char **argv) { cairo_t *cr; - FILE *f; + char *filename; + cairo_status_t status; + cairo_surface_t *surface; if (argc != 2) { - g_printerr ("Usage: cairo-example OUTPUT_FILENAME\n"); + g_printerr ("Usage: cairosimple OUTPUT_FILENAME\n"); return 1; } - f = fopen (argv[1], "w"); - if (!f) - { - g_printerr ("Usage: cannot open '%s'\n", argv[1]); - return 1; - } + filename = argv[1]; - cr = cairo_create(); - cairo_set_target_png (cr, f, - CAIRO_FORMAT_ARGB32, - 2 * RADIUS, 2 * RADIUS); + surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, + 2 * RADIUS, 2 * RADIUS); + cr = cairo_create (surface); + - cairo_set_rgb_color (cr, 1.0, 1.0, 1.0); - cairo_rectangle (cr, 0, 0, 2 * RADIUS, 2 * RADIUS); - cairo_fill (cr); + cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); + cairo_paint (cr); draw_text (cr); - cairo_destroy (cr); - fclose (f); + + status = cairo_surface_write_to_png (surface, filename); + cairo_surface_destroy (surface); + + if (status != CAIRO_STATUS_SUCCESS) + { + g_printerr ("Could not save png to '%s'\n", filename); + return 1; + } return 0; } |