[asterisk-commits] rizzo: branch rizzo/video_v2 r84151 - /team/rizzo/video_v2/channels/

[SVN commits to the Asterisk project]

Author: rizzo
Date: Mon Oct  1 06:49:16 2007
New Revision: 84151

URL: http://svn.digium.com/view/asterisk?view=rev&rev=84151
Log:
fix some bugs reported by Matteo Brancaleoni

Modified:
    team/rizzo/video_v2/channels/console_video.c

Modified: team/rizzo/video_v2/channels/console_video.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/video_v2/channels/console_video.c?view=diff&rev=84151&r1=84150&r2=84151
==============================================================================
--- team/rizzo/video_v2/channels/console_video.c (original)
+++ team/rizzo/video_v2/channels/console_video.c Mon Oct  1 06:49:16 2007
@@ -342,7 +342,7 @@
 		break;
 	}
 	/* set the pointer but not the size as this is not malloc'ed */
-	b->data = im->data;
+	b->data = (uint8_t *)im->data;
 	v->fd = -2;
     }
 #if HAVE_V4L > 0
@@ -456,7 +456,7 @@
 		    RootWindow(v->dpy, DefaultScreen(v->dpy)),
 		    0, 0, b->w, b->h, AllPlanes, ZPixmap, v->image, 0, 0);
 
-		b->data = v->image->data;
+		b->data = (uint8_t *)v->image->data;
 		fill_pict(b, &p);
 		return p.linesize[0] * b->h;
 	}
@@ -1376,7 +1376,7 @@
 #define M_F(tag, f)		if (!strcasecmp((__s), tag)) { f; } else
 #define M_BOOL(tag, dst)        M_F(tag, (dst) = ast_true(__val) )
 #define M_UINT(tag, dst)        M_F(tag, (dst) = strtoul(__val, NULL, 0) )
-#define M_STR(tag, dst)         M_F(tag, ast_copy_string(dst, __val, sizeof(dst)
+#define M_STR(tag, dst)         M_F(tag, ast_copy_string(dst, __val, sizeof(dst)))
 #endif
 
 static int video_geom(struct fbuf_t *b, const char *s)