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

modified cvcontourtree.cpp, cvfont.h, iplconvkernel.cpp to suppress warnings

Browse source
This commit is contained in:
ser1zw 2011-04-18 01:08:47 +09:00
parent b6eebd4fb4
commit a3e10782ae
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/opencv/cvcontourtree.cpp
View file

@ -78,7 +78,9 @@ rb_contour(int argc, VALUE *argv, VALUE self)
{ {
VALUE criteria, storage; VALUE criteria, storage;
rb_scan_args(argc, argv, "01", &criteria); rb_scan_args(argc, argv, "01", &criteria);
CvSeq *contour = cvContourFromContourTree(CVCONTOURTREE(self), CVMEMSTORAGE(storage), VALUE_TO_CVTERMCRITERIA(criteria)); storage = cCvMemStorage::new_object();
CvSeq *contour = cvContourFromContourTree(CVCONTOURTREE(self), CVMEMSTORAGE(storage),
VALUE_TO_CVTERMCRITERIA(criteria));
return cCvSeq::new_sequence(cCvContour::rb_class(), contour, cCvPoint::rb_class(), storage); return cCvSeq::new_sequence(cCvContour::rb_class(), contour, cCvPoint::rb_class(), storage);
} }

2
ext/opencv/cvfont.h
View file

@ -24,7 +24,7 @@ __NAMESPACE_BEGIN_CVFONT
#define FO_VSCALE(op) NUM2DBL(rb_hash_aref(op, ID2SYM(rb_intern("vscale")))) #define FO_VSCALE(op) NUM2DBL(rb_hash_aref(op, ID2SYM(rb_intern("vscale"))))
#define FO_SHEAR(op) NUM2DBL(rb_hash_aref(op, ID2SYM(rb_intern("shear")))) #define FO_SHEAR(op) NUM2DBL(rb_hash_aref(op, ID2SYM(rb_intern("shear"))))
#define FO_THICKNESS(op) FIX2INT(rb_hash_aref(op, ID2SYM(rb_intern("thickness")))) #define FO_THICKNESS(op) FIX2INT(rb_hash_aref(op, ID2SYM(rb_intern("thickness"))))
#define FO_LINE_TYPE(op) FIX2INT(rb_hash_aref(op, ID2SYM(rb_intern("line_type"))) == ID2SYM("aa") ? INT2FIX(CV_AA) : rb_hash_aref(op, ID2SYM(rb_intern("line_type")))) #define FO_LINE_TYPE(op) FIX2INT(rb_hash_aref(op, ID2SYM(rb_intern("line_type"))))
VALUE rb_class(); VALUE rb_class();

2
ext/opencv/iplconvkernel.cpp
View file

@ -89,7 +89,7 @@ rb_initialize(int argc, VALUE *argv, VALUE self)
int _cols = NUM2INT(cols); int _cols = NUM2INT(cols);
int _rows = NUM2INT(rows); int _rows = NUM2INT(rows);
int num_values; int num_values;
int *_values; int *_values = NULL;
const int INVALID_SHAPE = -1; const int INVALID_SHAPE = -1;
shape_type = CVMETHOD("STRUCTURING_ELEMENT_SHAPE", shape, INVALID_SHAPE); shape_type = CVMETHOD("STRUCTURING_ELEMENT_SHAPE", shape, INVALID_SHAPE);