summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-08-17 19:13:08 +0000
committerMatthias Clasen <mclasen@redhat.com>2021-08-17 19:13:08 +0000
commitd730c313c22fb9743a8397ce9f5599d5b97180b4 (patch)
treeffd12cf9609aafff723c6c45c91e0428b36b41d5
parent9828eb4cb867f9dd8b214941ea4affddd169e21f (diff)
parent2876df499fe9e153571efc3d8a9c36e325c872f6 (diff)
downloadpango-d730c313c22fb9743a8397ce9f5599d5b97180b4.tar.gz
Merge branch 'glyph-string-const-char' into 'main'
Add a few missing const See merge request GNOME/pango!412
-rw-r--r--pango/glyphstring.c24
-rw-r--r--pango/pango-glyph.h24
2 files changed, 24 insertions, 24 deletions
diff --git a/pango/glyphstring.c b/pango/glyphstring.c
index 87c8a069..e937549a 100644
--- a/pango/glyphstring.c
+++ b/pango/glyphstring.c
@@ -373,12 +373,12 @@ pango_glyph_string_get_logical_widths (PangoGlyphString *glyphs,
*/
void
pango_glyph_string_index_to_x (PangoGlyphString *glyphs,
- char *text,
- int length,
- PangoAnalysis *analysis,
- int index,
- gboolean trailing,
- int *x_pos)
+ const char *text,
+ int length,
+ PangoAnalysis *analysis,
+ int index,
+ gboolean trailing,
+ int *x_pos)
{
int i;
int start_xpos = 0;
@@ -504,12 +504,12 @@ pango_glyph_string_index_to_x (PangoGlyphString *glyphs,
*/
void
pango_glyph_string_x_to_index (PangoGlyphString *glyphs,
- char *text,
- int length,
- PangoAnalysis *analysis,
- int x_pos,
- int *index,
- gboolean *trailing)
+ const char *text,
+ int length,
+ PangoAnalysis *analysis,
+ int x_pos,
+ int *index,
+ gboolean *trailing)
{
int i;
int start_xpos = 0;
diff --git a/pango/pango-glyph.h b/pango/pango-glyph.h
index 3674d6b7..67302bfd 100644
--- a/pango/pango-glyph.h
+++ b/pango/pango-glyph.h
@@ -167,20 +167,20 @@ void pango_glyph_string_get_logical_widths (PangoGlyphString *glyphs,
PANGO_AVAILABLE_IN_ALL
void pango_glyph_string_index_to_x (PangoGlyphString *glyphs,
- char *text,
- int length,
- PangoAnalysis *analysis,
- int index_,
- gboolean trailing,
- int *x_pos);
+ const char *text,
+ int length,
+ PangoAnalysis *analysis,
+ int index_,
+ gboolean trailing,
+ int *x_pos);
PANGO_AVAILABLE_IN_ALL
void pango_glyph_string_x_to_index (PangoGlyphString *glyphs,
- char *text,
- int length,
- PangoAnalysis *analysis,
- int x_pos,
- int *index_,
- int *trailing);
+ const char *text,
+ int length,
+ PangoAnalysis *analysis,
+ int x_pos,
+ int *index_,
+ int *trailing);
/* Turn a string of characters into a string of glyphs
*/