kotovalexarian-likes-github/ruby-opencv
1
0
Fork 0
mirror of https://github.com/ruby-opencv/ruby-opencv synced 2023-03-27 23:22:12 -04:00
Code Releases Activity

fixed CvMat#integral

Browse source
This commit is contained in:
ser1zw 2011-07-06 23:21:38 +09:00
parent 79e9e17844
commit 366e9e2bc0
2 changed files with 71 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

31
ext/opencv/cvmat.cpp
View file

@ -3960,21 +3960,26 @@ rb_copy_make_border_replicate(int argc, VALUE *argv, VALUE self)
VALUE
rb_integral(int argc, VALUE *argv, VALUE self)
{
VALUE sum, sqsum, tilted_sum, dest;
rb_scan_args(argc, argv, "02", &sqsum, &tilted_sum);
VALUE need_sqsum = Qfalse, need_tiled_sum = Qfalse;
rb_scan_args(argc, argv, "02", &need_sqsum, &need_tiled_sum);
CvSize size = cvSize(cvGetSize(CVARR(self)).width + 1, cvGetSize(CVARR(self)).height + 1);
int cn = CV_MAT_CN(cvGetElemType(CVARR(self)));
sum = cCvMat::new_object(size, CV_MAKETYPE(CV_64F, cn));
sqsum = (sqsum == Qtrue ? cCvMat::new_object(size, CV_MAKETYPE(CV_64F, cn)) : Qnil);
tilted_sum = (tilted_sum == Qtrue ? cCvMat::new_object(size, CV_MAKETYPE(CV_64F, cn)) : Qnil);
cvIntegral(CVARR(self), CVARR(sum), NIL_P(sqsum) ? NULL : CVARR(sqsum),
NIL_P(tilted_sum) ? NULL : CVARR(tilted_sum));
dest = rb_ary_new3(1, sum);
if(sqsum)
rb_ary_push(dest, sqsum);
if(tilted_sum)
rb_ary_push(dest, tilted_sum);
return dest;
VALUE sum = cCvMat::new_object(size, CV_MAKETYPE(CV_64F, cn));
VALUE sqsum = (need_sqsum == Qtrue ? cCvMat::new_object(size, CV_MAKETYPE(CV_64F, cn)) : Qnil);
VALUE tiled_sum = (need_tiled_sum == Qtrue ? cCvMat::new_object(size, CV_MAKETYPE(CV_64F, cn)) : Qnil);
cvIntegral(CVARR(self), CVARR(sum), (need_sqsum == Qtrue) ? CVARR(sqsum) : NULL,
(need_tiled_sum == Qtrue) ? CVARR(tiled_sum) : NULL);
if ((need_sqsum != Qtrue) && (need_tiled_sum != Qtrue))
return sum;
else {
VALUE dest = rb_ary_new3(1, sum);
if (need_sqsum == Qtrue)
rb_ary_push(dest, sqsum);
if (need_tiled_sum == Qtrue)
rb_ary_push(dest, tiled_sum);
return dest;
}
}
VALUE