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

removed some unused functions

Browse source
This commit is contained in:
ser1zw 2011-08-12 01:11:23 +09:00
parent d72fbd7c2c
commit d1809bc13f
2 changed files with 0 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ext/opencv/cvmat.cpp
View file

@ -45,11 +45,6 @@
__NAMESPACE_BEGIN_OPENCV __NAMESPACE_BEGIN_OPENCV
__NAMESPACE_BEGIN_CVMAT __NAMESPACE_BEGIN_CVMAT
#define SUPPORT_8UC1_ONLY(value) if (cvGetElemType(CVARR(value)) != CV_8UC1) {rb_raise(rb_eNotImpError, "support single-channel 8bit unsigned image only.");}
#define SUPPORT_8U_ONLY(value) if (CV_MAT_DEPTH(cvGetElemType(CVARR(value))) != CV_8U) {rb_raise(rb_eNotImpError, "support 8bit unsigned image only.");}
#define SUPPORT_C1_ONLY(value) if (CV_MAT_CN(cvGetElemType(CVARR(value))) != 1) {rb_raise(rb_eNotImpError, "support single-channel image only.");}
#define SUPPORT_C1C3_ONLY(value) if (CV_MAT_CN(cvGetElemType(CVARR(value))) != 1 && CV_MAT_CN(cvGetElemType(CVARR(value))) != 3) {rb_raise(rb_eNotImpError, "support single-channel or 3-channnel image only.");}
#define DRAWING_OPTION(op) NIL_P(op) ? rb_const_get(rb_class(), rb_intern("DRAWING_OPTION")) : rb_funcall(rb_const_get(rb_class(), rb_intern("DRAWING_OPTION")), rb_intern("merge"), 1, op) #define DRAWING_OPTION(op) NIL_P(op) ? rb_const_get(rb_class(), rb_intern("DRAWING_OPTION")) : rb_funcall(rb_const_get(rb_class(), rb_intern("DRAWING_OPTION")), rb_intern("merge"), 1, op)
#define DO_COLOR(op) VALUE_TO_CVSCALAR(rb_hash_aref(op, ID2SYM(rb_intern("color")))) #define DO_COLOR(op) VALUE_TO_CVSCALAR(rb_hash_aref(op, ID2SYM(rb_intern("color"))))
#define DO_THICKNESS(op) FIX2INT(rb_hash_aref(op, ID2SYM(rb_intern("thickness")))) #define DO_THICKNESS(op) FIX2INT(rb_hash_aref(op, ID2SYM(rb_intern("thickness"))))

61
ext/opencv/opencv.h
View file

@ -238,16 +238,6 @@ REFER_OBJECT(VALUE klass, void *ptr, VALUE root)
return Data_Wrap_Struct(klass, mark_root_object, unregister_object, ptr); return Data_Wrap_Struct(klass, mark_root_object, unregister_object, ptr);
} }
inline VALUE
CONVERT(VALUE object, VALUE klass)
{
VALUE method_name = rb_str_concat(rb_str_new2("from_"), rb_str_new2(rb_obj_classname(object)));
VALUE result = rb_funcall(klass, rb_intern(StringValueCStr(method_name)), 1, object);
if(CLASS_OF(result) != klass)
rb_raise(rb_eTypeError, "require %s, but return %s.", rb_class2name(klass), rb_class2name(CLASS_OF(result)));
return result;
}
inline int inline int
CVMETHOD(const char *name, VALUE method, int ifnone = 0) CVMETHOD(const char *name, VALUE method, int ifnone = 0)
{ {
@ -391,55 +381,4 @@ VALUE rb_HLS2RGB(VALUE klass, VALUE image);
__NAMESPACE_END_OPENCV __NAMESPACE_END_OPENCV
inline VALUE
extract_options_from_args_bang(VALUE ary)
{
return (RARRAY_LEN(ary) > 0 && rb_obj_is_kind_of(RARRAY_PTR(ary)[RARRAY_LEN(ary) -1], rb_cHash)) ? rb_ary_pop(ary) : rb_hash_new();
}
/*
inline VALUE
assert_valid_keys(VALUE keys, VALUE valid_keys)
{
VALUE unknown_keys = rb_funcall(keys, rb_intern("-"), 1, rb_funcall(valid_keys, rb_intern("flatten"), 0));
if (NUM2INT(rb_funcall(unknown_keys, rb_intern("empty?"), 0)) != 0){
rb_raise(rb_eArgError, "Unknown key(s): %s",
RSTRING_PTR(rb_funcall(unknown_keys, rb_intern("join"), 1, rb_str_new2(", "))));
}
return Qnil;
}
*/
/*
inline void
assert_valid_keys(VALUE options, int n, ...){
va_list valid_keys;
if (!(n > 0)) {return;}
VALUE unknown_keys = rb_funcall(options, rb_intern("keys"), 0);
va_start(valid_keys, n);
for (int i = 0; i < n; i++)
rb_ary_delete(unknown_keys, ID2SYM(rb_intern(va_arg(valid_keys, char*))));
if (RARRAY_LEN(unknown_keys) > 0)
rb_raise(rb_eArgError, "Unknown key(s): %s",
RSTRING_PTR(rb_funcall(unknown_keys, rb_intern("join"), 1, rb_str_new2(", "))));
va_end(valid_keys);
}
inline VALUE
validate_option(VALUE options, const *char key, char *ifnone, int n, ...){
va_list valid_values;
VALUE value = rb_hash_aref(options, ID2SYM(rb_intern(key)));
if (!value || !(n > 0)) {return ifnone;}
va_start(valid_values, n);
for (int i = 0; i < n; i++){
if (!strcmp(StringValueCStr(value), va_arg(valid_values, char*))){
rb_warn("Option :%s value :%s does not defined. Default value :%s is used.", StringValueCStr(value), );
return ifnone;
}
}
va_end(valid_values);
return value;
}
#define OPTIONS(value, hash, key, default) value = ((value = rb_hash_aref(hash, ID2SYM(rb_intern(key)))) ? value : default)
*/
#endif // RUBY_OPENCV_H #endif // RUBY_OPENCV_H