[MPlayer-cvslog] r29448 - in trunk: libass/ass_render.c libmpcodecs/vf_ass.c

[eugeni]

Author: eugeni
Date: Mon Jul 27 21:39:23 2009
New Revision: 29448

Log:
Fix stupid, off-by-one, mistakes in assert() expressions.

Modified:
   trunk/libass/ass_render.c
   trunk/libmpcodecs/vf_ass.c

Modified: trunk/libass/ass_render.c
==============================================================================
--- trunk/libass/ass_render.c	Mon Jul 27 18:53:48 2009	(r29447)
+++ trunk/libass/ass_render.c	Mon Jul 27 21:39:23 2009	(r29448)
@@ -319,8 +319,8 @@ static ass_image_t* my_draw_bitmap(unsig
 
 	assert(dst_x >= 0);
 	assert(dst_y >= 0);
-	assert(dst_x + bitmap_w < frame_context.width);
-	assert(dst_y + bitmap_h < frame_context.height);
+	assert(dst_x + bitmap_w <= frame_context.width);
+	assert(dst_y + bitmap_h <= frame_context.height);
 
 	img->w = bitmap_w;
 	img->h = bitmap_h;

Modified: trunk/libmpcodecs/vf_ass.c
==============================================================================
--- trunk/libmpcodecs/vf_ass.c	Mon Jul 27 18:53:48 2009	(r29447)
+++ trunk/libmpcodecs/vf_ass.c	Mon Jul 27 21:39:23 2009	(r29448)
@@ -221,7 +221,7 @@ static void copy_from_image(struct vf_in
 
 	assert(first_row >= 0);
 	assert(first_row <= last_row);
-	assert(last_row < vf->priv->outh);
+	assert(last_row <= vf->priv->outh);
 
 	for (pl = 1; pl < 3; ++pl) {
 		int dst_stride = vf->priv->outw;