[Bf-blender-cvs] [f70a2a3] libmv_prediction: Libmv: Fix read/write pass the array end

Sergey Sharybin noreply at git.blender.org
Wed Oct 29 12:32:09 CET 2014


Commit: f70a2a3fb12d9f690ee6088f0cf0665c9e148ec4
Author: Sergey Sharybin
Date:   Fri Oct 24 15:47:51 2014 +0600
Branches: libmv_prediction
https://developer.blender.org/rBf70a2a3fb12d9f690ee6088f0cf0665c9e148ec4

Libmv: Fix read/write pass the array end

===================================================================

M	source/blender/blenkernel/intern/tracking_util.c

===================================================================

diff --git a/source/blender/blenkernel/intern/tracking_util.c b/source/blender/blenkernel/intern/tracking_util.c
index f64840f..ddb36b6 100644
--- a/source/blender/blenkernel/intern/tracking_util.c
+++ b/source/blender/blenkernel/intern/tracking_util.c
@@ -699,6 +699,8 @@ static ImBuf *accessor_get_ibuf(TrackingImageAccessor *accessor,
 		    dst_offset_y = clamped_origin_y - (int)region->min[1];
 		int clamped_width = width - dst_offset_x,
 		    clamped_height = height - dst_offset_y;
+		clamped_width = min_ii(clamped_width, orig_ibuf->x - clamped_origin_x);
+		clamped_height = min_ii(clamped_height, orig_ibuf->y - clamped_origin_y);
 
 		final_ibuf = IMB_allocImBuf(width, height, 32, IB_rectfloat);




More information about the Bf-blender-cvs mailing list