diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-03-13 15:59:09 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-03-13 15:59:09 +0000 |
| commit | a6128c9efba496a2193894ec9ebe7a14404df72e (patch) | |
| tree | ae1e9c9be775c9b2fe75e51c33b2a9ebd69a272a /pango/glyphstring.c | |
| parent | df19b2f5a156b717186f8cbc6b1ad39d2401ab90 (diff) | |
| download | pango-a6128c9efba496a2193894ec9ebe7a14404df72e.tar.gz | |
Memory management functions for PangoItem.
Mon Mar 13 10:54:48 2000 Owen Taylor <otaylor@redhat.com>
* pango/pango-item.[ch]: Memory management functions for PangoItem.
* pango/*.[ch]: Random constification.
* pango/pangox.c pango/pango-layout.c pango/pango-context.c:
Add an extra_attrs field to PangoItem. Use this to handle underlining
for PangoLayout.
* examples/viewer.c (reload_font): Make paragraphs global
to save the complexity of passing it around all over the place.
* pango/pango-layout.[ch] (pango_layout_context_changed): Add
a function to reset the layout on changes to the layout's
context.
* pango/pangox.c (pango_x_make_matching_xlfd): Prefer bitmap
to scaleable if the discrepancy is < 1 pixel. (Probably not
the ideal criterion.)
* pango/pangox.c (pango_x_font_map_for_display): Fix resolution
computation error.
* pango/pango-layout.c (pango_layout_check_lines): Handle
text with embedded newlines.
* pango/pangox.c (pango_x_render_layout): Fix y to refer
to the top of the layout, not the baseline of the first
line.
* pango/pango-layout.c (process_item): Don't wrap if width is
set to -1.
* Makefile.am configure.in **/*.[ch]: move libpango/ directory
and fix all headers to install under include/pango/
Diffstat (limited to 'pango/glyphstring.c')
| -rw-r--r-- | pango/glyphstring.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pango/glyphstring.c b/pango/glyphstring.c index d3030e39..476604ce 100644 --- a/pango/glyphstring.c +++ b/pango/glyphstring.c @@ -20,8 +20,8 @@ */ #include <glib.h> -#include <pango-glyph.h> -#include <pango-font.h> +#include <pango/pango-glyph.h> +#include <pango/pango-font.h> #include <unicode.h> /** @@ -195,7 +195,7 @@ pango_glyph_string_extents (PangoGlyphString *glyphs, **/ void pango_glyph_string_get_logical_widths (PangoGlyphString *glyphs, - char *text, + const char *text, int length, int embedding_level, int *logical_widths) @@ -204,7 +204,7 @@ pango_glyph_string_get_logical_widths (PangoGlyphString *glyphs, int last_cluster = 0; int width = 0; int last_cluster_width = 0; - char *p = text; + const char *p = text; for (i=0; i<=glyphs->num_glyphs; i++) { |