summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2015-05-05 17:17:04 -0700
committerBehdad Esfahbod <behdad@behdad.org>2015-05-05 17:17:04 -0700
commitd0ae2a4b74903331e8b79968faf2af95e012ef65 (patch)
tree848e14de73fd147d19fcb5fc4fa65b08fce3d923 /pango
parent9117a1c6c7717287f2f8d76c5926bd2e5551c52e (diff)
downloadpango-d0ae2a4b74903331e8b79968faf2af95e012ef65.tar.gz
Fix a few warnings
Diffstat (limited to 'pango')
-rw-r--r--pango/pango-gravity.c1
-rw-r--r--pango/pango-layout.c2
-rw-r--r--pango/pango-utils.c2
-rw-r--r--pango/pangofc-shape.c2
4 files changed, 2 insertions, 5 deletions
diff --git a/pango/pango-gravity.c b/pango/pango-gravity.c
index ebaf17e6..8565db16 100644
--- a/pango/pango-gravity.c
+++ b/pango/pango-gravity.c
@@ -186,7 +186,6 @@ typedef struct {
#define S PANGO_GRAVITY_SOUTH
#define E PANGO_GRAVITY_EAST
-#define N PANGO_GRAVITY_NORTH
#define W PANGO_GRAVITY_WEST
const PangoScriptProperties script_properties[] =
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 1c844ab5..c9820413 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -1312,7 +1312,7 @@ pango_layout_get_unknown_glyphs_count (PangoLayout *layout)
static void
check_context_changed (PangoLayout *layout)
{
- int old_serial = layout->context_serial;
+ guint old_serial = layout->context_serial;
layout->context_serial = pango_context_get_serial (layout->context);
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index 61c76ad6..eb01fa61 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -984,7 +984,7 @@ _pango_shape_shape (const char *text,
PangoRectangle *shape_logical,
PangoGlyphString *glyphs)
{
- int i;
+ unsigned int i;
const char *p;
pango_glyph_string_set_size (glyphs, n_chars);
diff --git a/pango/pangofc-shape.c b/pango/pangofc-shape.c
index 3a2cfa44..f0ea784d 100644
--- a/pango/pangofc-shape.c
+++ b/pango/pangofc-shape.c
@@ -31,8 +31,6 @@
#include <hb-ft.h>
#include <hb-glib.h>
-#define PANGO_UNITS_26_6(d) ((d) << 4)
-
/* cache a single hb_buffer_t */
static hb_buffer_t *cached_buffer = NULL; /* MT-safe */
G_LOCK_DEFINE_STATIC (cached_buffer);