diff --git a/ext/opencv/cverror.cpp b/ext/opencv/cverror.cpp index 6b9ba6e..a2e3ff7 100644 --- a/ext/opencv/cverror.cpp +++ b/ext/opencv/cverror.cpp @@ -152,7 +152,7 @@ by_code(int error_code) } void -raise_cverror(cv::Exception e) +raise(cv::Exception e) { rb_raise(by_code(e.code), e.what()); } diff --git a/ext/opencv/cverror.h b/ext/opencv/cverror.h index 0c0d35b..789191d 100644 --- a/ext/opencv/cverror.h +++ b/ext/opencv/cverror.h @@ -20,7 +20,7 @@ __NAMESPACE_BEGIN_CVERROR void define_ruby_class(); VALUE by_code(int error_code); -void raise_cverror(cv::Exception e); +void raise(cv::Exception e); __NAMESPACE_END_CVERROR __NAMESPACE_END_OPENCV diff --git a/ext/opencv/cvutils.cpp b/ext/opencv/cvutils.cpp index b6ff746..9d075d0 100644 --- a/ext/opencv/cvutils.cpp +++ b/ext/opencv/cvutils.cpp @@ -10,13 +10,15 @@ #include "cvutils.h" void -raise_typeerror(VALUE object, VALUE expected_class) { +raise_typeerror(VALUE object, VALUE expected_class) +{ rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)", rb_obj_classname(object), rb_class2name(expected_class)); } void -raise_compatible_typeerror(VALUE object, VALUE expected_class) { +raise_compatible_typeerror(VALUE object, VALUE expected_class) +{ rb_raise(rb_eTypeError, "wrong argument type %s (expected %s or compatible object)", rb_obj_classname(object), rb_class2name(expected_class)); } diff --git a/ext/opencv/cvutils.h b/ext/opencv/cvutils.h index ff87e86..73bae0f 100644 --- a/ext/opencv/cvutils.h +++ b/ext/opencv/cvutils.h @@ -14,6 +14,8 @@ #include "opencv2/imgproc/imgproc_c.h" #include "opencv2/imgproc/imgproc.hpp" +#define raise_cverror(e) cCvError::raise(e) + void raise_typeerror(VALUE object, VALUE expected_class); void raise_compatible_typeerror(VALUE object, VALUE expected_class); void* rb_cvAlloc(size_t size);