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

added error handling to CvHistgram

Browse source
This commit is contained in:
ser1zw 2011-08-03 22:44:49 +09:00
parent f8685c49c8
commit 37109f225d
2 changed files with 39 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

37
ext/opencv/cvhistogram.cpp
View file

@ -54,8 +54,8 @@ define_ruby_class()
VALUE
rb_allocate(VALUE klass)
{
// not yet
return Qnil;
CvHistogram* ptr;
return Data_Make_Struct(klass, CvHistogram, 0, -1, ptr);
}
/*
@ -97,11 +97,17 @@ rb_has_range(VALUE self)
VALUE
rb_dims(VALUE self)
{
VALUE result = Qnil;
int size[CV_MAX_DIM];
try {
int dims = cvGetDims(CVHISTOGRAM(self)->bins, size);
VALUE result = rb_ary_new2(dims);
for(int i = 0; i < dims; i++){
rb_ary_store(result, i, INT2FIX(size[i]));
result = rb_ary_new2(dims);
for(int i = 0; i < dims; ++i){
rb_ary_store(result, i, INT2NUM(size[i]));
}
}
catch (cv::Exception& e) {
raise_cverror(e);
}
return result;
}
@ -128,7 +134,12 @@ rb_copy(VALUE self)
{
VALUE dest = 0;
CvHistogram *hist = CVHISTOGRAM(dest);
try {
cvCopyHist(CVHISTOGRAM(self), &hist);
}
catch (cv::Exception& e) {
raise_cverror(e);
}
return dest;
}
@ -141,7 +152,12 @@ rb_copy(VALUE self)
VALUE
rb_clear_bang(VALUE self)
{
try {
cvClearHist(CVHISTOGRAM(self));
}
catch (cv::Exception& e) {
raise_cverror(e);
}
return self;
}
@ -166,7 +182,12 @@ rb_normalize(VALUE self, VALUE factor)
VALUE
rb_normalize_bang(VALUE self, VALUE factor)
{
try {
cvNormalizeHist(CVHISTOGRAM(self), NUM2DBL(factor));
}
catch (cv::Exception& e) {
raise_cverror(e);
}
return self;
}
@ -191,10 +212,14 @@ rb_thresh(VALUE self, VALUE factor)
VALUE
rb_thresh_bang(VALUE self, VALUE factor)
{
try {
cvThreshHist(CVHISTOGRAM(self), NUM2DBL(factor));
}
catch (cv::Exception& e) {
raise_cverror(e);
}
return self;
}
__NAMESPACE_END_CVHISTOGRAM
__NAMESPACE_END_OPENCV

4
ext/opencv/cvhistogram.h
View file

@ -38,8 +38,8 @@ VALUE rb_thresh_bang(VALUE self, VALUE factor);
__NAMESPACE_END_CVHISTOGRAM
inline CvHistogram
*CVHISTOGRAM(VALUE object)
inline CvHistogram*
CVHISTOGRAM(VALUE object)
{
CvHistogram *ptr;
Data_Get_Struct(object, CvHistogram, ptr);