Silence warnings introduced by -Wall

Silence a few warnings that should be harmless and were introduced by
the -Wall option.

diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c
index 3a33cd1cd16e662617a2f5b832fd12904d9e5295..0a2eb3f61156d7ef0e457820cc2e330d73b627ab 100644 (file)
--- a/libass/ass_fontconfig.c
+++ b/libass/ass_fontconfig.c
@@ -85,7 +85,7 @@ static char *_select_font(fc_instance_t *priv, const char *family,
     FcFontSet *fset = NULL;
     int curf;
     char *retval = NULL;
-    int family_cnt;
+    int family_cnt = 0;
 
     *index = 0;
 

diff --git a/libass/ass_render.c b/libass/ass_render.c
index 0ad0d181899b6e78a01047c73361a7aa594c0e99..c5664093cd458ef42d3d83821878867ab5fd1cab 100644 (file)
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -1841,7 +1841,7 @@ static void measure_text(ass_renderer_t *render_priv)
 static void
 wrap_lines_smart(ass_renderer_t *render_priv, int max_text_width)
 {
-    int i, j;
+    int i;
     glyph_info_t *cur, *s1, *e1, *s2, *s3, *w;
     int last_space;
     int break_type;
@@ -2188,7 +2188,6 @@ ass_render_event(ass_renderer_t *render_priv, ass_event_t *event,
     int last_break;
     int alignment, halign, valign;
     int device_x = 0, device_y = 0;
-    ass_settings_t *settings_priv = &render_priv->settings;
     text_info_t *text_info = &render_priv->text_info;
 
     if (event->Style >= render_priv->track->n_styles) {

diff --git a/libass/mputils.c b/libass/mputils.c
index a4a5a9f1a9f1b58de540ce9134fdcd481d375b30..bf71a6f0d27b181fe4e75fbcfbe9b53c8af3d3c6 100644 (file)
--- a/libass/mputils.c
+++ b/libass/mputils.c
@@ -71,7 +71,7 @@ void blur(unsigned char *buffer,
             if (src) {
                 register unsigned short *dstp = t + x - r;
                 int mx;
-                unsigned *m3 = m2 + src * mwidth;
+                unsigned *m3 = (unsigned *) (m2 + src * mwidth);
                 for (mx = r - x; mx < mwidth; mx++) {
                     dstp[mx] += m3[mx];
                 }
@@ -83,7 +83,7 @@ void blur(unsigned char *buffer,
             if (src) {
                 register unsigned short *dstp = t + x - r;
                 int mx;
-                unsigned *m3 = m2 + src * mwidth;
+                unsigned *m3 = (unsigned *) (m2 + src * mwidth);
                 for (mx = 0; mx < mwidth; mx++) {
                     dstp[mx] += m3[mx];
                 }
@@ -96,7 +96,7 @@ void blur(unsigned char *buffer,
                 register unsigned short *dstp = t + x - r;
                 int mx;
                 const int x2 = r + width - x;
-                unsigned *m3 = m2 + src * mwidth;
+                unsigned *m3 = (unsigned *) (m2 + src * mwidth);
                 for (mx = 0; mx < x2; mx++) {
                     dstp[mx] += m3[mx];
                 }
@@ -115,7 +115,7 @@ void blur(unsigned char *buffer,
             if (src) {
                 register unsigned short *dstp = srcp - 1 + width + 1;
                 const int src2 = (src + 128) >> 8;
-                unsigned *m3 = m2 + src2 * mwidth;
+                unsigned *m3 = (unsigned *) (m2 + src2 * mwidth);
 
                 int mx;
                 *srcp = 128;
@@ -131,7 +131,7 @@ void blur(unsigned char *buffer,
             if (src) {
                 register unsigned short *dstp = srcp - 1 - r * (width + 1);
                 const int src2 = (src + 128) >> 8;
-                unsigned *m3 = m2 + src2 * mwidth;
+                unsigned *m3 = (unsigned *) (m2 + src2 * mwidth);
 
                 int mx;
                 *srcp = 128;
@@ -148,7 +148,7 @@ void blur(unsigned char *buffer,
                 const int y2 = r + height - y;
                 register unsigned short *dstp = srcp - 1 - r * (width + 1);
                 const int src2 = (src + 128) >> 8;
-                unsigned *m3 = m2 + src2 * mwidth;
+                unsigned *m3 = (unsigned *) (m2 + src2 * mwidth);
 
                 int mx;
                 *srcp = 128;