From 9cd56d5e40ae30ce886c3ee2838aa05b0110821f Mon Sep 17 00:00:00 2001 From: eugeni Date: Mon, 27 Jul 2009 19:39:23 +0000 Subject: Fix stupid, off-by-one, mistakes in assert() expressions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29448 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libass/ass_render.c | 4 ++-- libmpcodecs/vf_ass.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libass/ass_render.c b/libass/ass_render.c index e4c06f7885..3048a2a233 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -319,8 +319,8 @@ static ass_image_t* my_draw_bitmap(unsigned char* bitmap, int bitmap_w, int bitm 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; diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c index 2068383926..8d88e44f1b 100644 --- a/libmpcodecs/vf_ass.c +++ b/libmpcodecs/vf_ass.c @@ -221,7 +221,7 @@ static void copy_from_image(struct vf_instance_s* vf, int first_row, int last_ro 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; -- cgit v1.2.3