Merge pull request #3154 from doprea:4.x

alalek · alalek · commit 2c051d524310 · 2022-01-21T10:29:33.000Z
diff --git a/modules/xphoto/src/inpainting_fsr.impl.hpp b/modules/xphoto/src/inpainting_fsr.impl.hpp
@@ -318,7 +318,7 @@ icvGetTodoBlocks(Mat& sampled_img, Mat& sampling_mask, std::vector< std::tuple<
         Mat error_mask_2d = sampling_mask(Range(yblock_counter*block_size - top_border, std::min(img_height, (yblock_counter*block_size + block_size + bottom_border))), Range(xblock_counter*block_size - left_border, std::min(img_width, (xblock_counter*block_size + block_size + right_border))));
 
         // determine normalized and weighted standard deviation
-        if (block_size > block_size_min)
+        if (block_size > block_size_min && xblock_counter < sigma_n_array.cols && yblock_counter < sigma_n_array.rows)
         {
             double sigma_n = icvStandardDeviation(distorted_block_2d, error_mask_2d);
             sigma_n_array.at<double>( yblock_counter, xblock_counter) = sigma_n;

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ icvGetTodoBlocks(Mat& sampled_img, Mat& sampling_mask, std::vector< std::tuple<`
`318`	`318`	`Mat error_mask_2d = sampling_mask(Range(yblock_counterblock_size - top_border, std::min(img_height, (yblock_counterblock_size + block_size + bottom_border))), Range(xblock_counterblock_size - left_border, std::min(img_width, (xblock_counterblock_size + block_size + right_border))));`
`319`	`319`
`320`	`320`	`// determine normalized and weighted standard deviation`
`321`		`- if (block_size > block_size_min)`
	`321`	`+ if (block_size > block_size_min && xblock_counter < sigma_n_array.cols && yblock_counter < sigma_n_array.rows)`
`322`	`322`	`{`
`323`	`323`	`double sigma_n = icvStandardDeviation(distorted_block_2d, error_mask_2d);`
`324`	`324`	`sigma_n_array.at<double>( yblock_counter, xblock_counter) = sigma_n;`