removed some unused codes, and uniformed code format

ext/opencv/cvavgcomp.cpp

@@ -14,7 +14,7 @@
  * CvRect with parameter "neighbors".
  * CvHaarClassifierCascade#detect_object. 
  *
- *   typedef struct CvAvgComp{
+ *   typedef struct CvAvgComp {
  *     CvRect rect;
  *     int neighbors;
  *   }

ext/opencv/cvavgcomp.h

@@ -10,7 +10,7 @@
 #ifndef RUBY_OPENCV_AVGCOMP_H
 #define RUBY_OPENCV_AVGCOMP_H
 
-#define __NAMESPACE_BEGIN_AVGCOMP namespace cCvAvgComp{
+#define __NAMESPACE_BEGIN_AVGCOMP namespace cCvAvgComp {
 #define __NAMESPACE_END_AVGCOMP }
 
 #include <opencv.h>

ext/opencv/cvbox2d.cpp

@@ -12,11 +12,11 @@
  * Document-class: OpenCV::CvBox2D
  *
  * C structure is here.
- *   typdef struct CvBox2D{
+ *   typdef struct CvBox2D {
  *     CvPoint2D32f center; // center of the box.
  *     CvSize2D32f size;    // box width and length
  *     float angle;         // angle between the horizonal axis and the first side (i.e length) in radians
- *   }CvBox2D;
+ *   } CvBox2D;
  */
 __NAMESPACE_BEGIN_OPENCV
 __NAMESPACE_BEGIN_CVBOX2D

ext/opencv/cvcircle32f.h

@@ -12,12 +12,12 @@
 
 #include "opencv.h"
 
-#define __NAMESPACE_BEGIN_CVCIRCLE32F namespace cCvCircle32f{
+#define __NAMESPACE_BEGIN_CVCIRCLE32F namespace cCvCircle32f {
 #define __NAMESPACE_END_CVCIRCLE32F }
 
 __NAMESPACE_BEGIN_OPENCV
 
-typedef struct CvCircle32f{
+typedef struct CvCircle32f {
   CvPoint2D32f center;
   float radius;
 } CvCircle32f;

ext/opencv/cvcondensation.cpp

@@ -190,7 +190,7 @@ rb_update_by_time(VALUE self)
 
 /*
  * call-seq:
- *   each_sample{|mat| ... }
+ *   each_sample {|mat| ... }
  *
  * Evaluate each sample by given block.
  */
@@ -208,7 +208,7 @@ rb_each_sample(VALUE self)
 
 /*
  * call-seq:
- *   calculate_confidence{|value| ... }
+ *   calculate_confidence {|value| ... }
  *
  * Evalute each sample by given block, then return value set to confidence.
  */

ext/opencv/cvcondensation.h

@@ -12,7 +12,7 @@
 
 #include "opencv.h"
 
-#define __NAMESPACE_BEGIN_CVCONDENSATION namespace cCvConDensation{
+#define __NAMESPACE_BEGIN_CVCONDENSATION namespace cCvConDensation {
 #define __NAMESPACE_END_CVCONDENSATION }
 
 __NAMESPACE_BEGIN_OPENCV

ext/opencv/cvconnectedcomp.h

@@ -12,7 +12,7 @@
 
 #include "opencv.h"
 
-#define __NAMESPACE_BEGIN_CVCONNECTEDCOMP namespace cCvConnectedComp{
+#define __NAMESPACE_BEGIN_CVCONNECTEDCOMP namespace cCvConnectedComp {
 #define __NAMESPACE_END_CVCONNECTEDCOMP }
 
 __NAMESPACE_BEGIN_OPENCV

ext/opencv/cvconvexitydefect.cpp

@@ -18,7 +18,7 @@
  *     CvPoint* end;
  *     CvPoint* depth_point;
  *     float depth;
- *   }CvConvexityDefect;
+ *   } CvConvexityDefect;
  *
  */
 __NAMESPACE_BEGIN_OPENCV

ext/opencv/cvconvexitydefect.h

@@ -12,7 +12,7 @@
 
 #include "opencv.h"
 
-#define __NAMESPACE_BEGIN_CVCONVEXITYDEFECT namespace cCvConvexityDefect{
+#define __NAMESPACE_BEGIN_CVCONVEXITYDEFECT namespace cCvConvexityDefect {
 #define __NAMESPACE_END_CVCONVEXITYDEFECT }
 
 __NAMESPACE_BEGIN_OPENCV

ext/opencv/cvfont.h

@@ -12,7 +12,7 @@
 
 #include "opencv.h"
 
-#define __NAMESPACE_BEGIN_CVFONT namespace cCvFont{
+#define __NAMESPACE_BEGIN_CVFONT namespace cCvFont {
 #define __NAMESPACE_END_CVFONT }
 
 __NAMESPACE_BEGIN_OPENCV

ext/opencv/cvhumoments.h

@@ -12,7 +12,7 @@
 
 #include "opencv.h"
 
-#define __NAMESPACE_BEGIN_CVHUMOMENTS namespace cCvHuMoments{
+#define __NAMESPACE_BEGIN_CVHUMOMENTS namespace cCvHuMoments {
 #define __NAMESPACE_END_CVHUMOMENTS }
 
 __NAMESPACE_BEGIN_OPENCV

ext/opencv/cvline.h

@@ -12,12 +12,12 @@
 
 #include "opencv.h"
 
-#define __NAMESPACE_BEGIN_CVLINE namespace cCvLine{
+#define __NAMESPACE_BEGIN_CVLINE namespace cCvLine {
 #define __NAMESPACE_END_CVLINE }
 
 __NAMESPACE_BEGIN_OPENCV
 
-typedef struct CvLine{
+typedef struct CvLine {
   float rho;
   float theta;
 } CvLine;

ext/opencv/cvmat.cpp

@@ -40,7 +40,7 @@
  *  #else
  *    int rows; // number of row
  *    int cols; // number of columns
- *  }CvMat;
+ *  } CvMat;
  */
 __NAMESPACE_BEGIN_OPENCV
 __NAMESPACE_BEGIN_CVMAT
@@ -312,8 +312,6 @@ void define_ruby_class()
   rb_define_singleton_method(rb_klass, "rotation_matrix2D", RUBY_METHOD_FUNC(rb_rotation_matrix2D), 3);
   rb_define_method(rb_klass, "warp_perspective", RUBY_METHOD_FUNC(rb_warp_perspective), -1);
   rb_define_singleton_method(rb_klass, "find_homography", RUBY_METHOD_FUNC(rb_find_homograpy), -1);
-  //rb_define_method(rb_klass, "get_perspective_transform", RUBY_METHOD_FUNC(rb_get_perspective_transform), -1);
-  //rb_define_alias(rb_klass, "warp_perspective_q_matrix", "get_perspective_transform");
   rb_define_method(rb_klass, "remap", RUBY_METHOD_FUNC(rb_remap), -1);
   //rb_define_method(rb_klass, "log_polar", RUBY_METHOD_FUNC(rb_log_polar), -1);
 
@@ -447,29 +445,12 @@ rb_load_imageM(int argc, VALUE *argv, VALUE self)
   return OPENCV_OBJECT(rb_klass, mat);
 }
 
-
 /*
  * nodoc
  */
 VALUE
 rb_method_missing(int argc, VALUE *argv, VALUE self)
 {
-  /*
-  const char *to_str = "\\Ato_(\\w+)";
-  VALUE name, args, str[3], method;
-  rb_scan_args(argc, argv, "1*", &name, &args);
-  if (RARRAY_LEN(args) != 0)
-    return rb_call_super(argc, argv);
-  if (rb_reg_match(rb_reg_new(to_str, strlen(to_str), 0), rb_funcall(name, rb_intern("to_s"), 0)) == Qnil)
-    return rb_call_super(argc, argv);
-  str[0] = rb_str_new2("%s2%s");
-  str[1] = rb_color_model(self);
-  str[2] = rb_reg_nth_match(1, rb_backref_get());
-  method = rb_f_sprintf(3, str);
-  if (rb_respond_to(rb_module_opencv(), rb_intern(StringValuePtr(method))))
-    return rb_funcall(rb_module_opencv(), rb_intern(StringValuePtr(method)), 1, self);
-  return rb_call_super(argc, argv);
-  */
   VALUE name, args, method;
   rb_scan_args(argc, argv, "1*", &name, &args);
   method = rb_funcall(name, rb_intern("to_s"), 0);
@@ -877,7 +858,7 @@ rb_square_q(VALUE self)
 VALUE
 rb_to_CvMat(VALUE self)
 {
-  // CvMat#to_CvMat aborts when self's class is CvMat. (I don't know why...)
+  // CvMat#to_CvMat aborts when self's class is CvMat.
   if (CLASS_OF(self) == rb_klass)
     return self;
 
@@ -1044,7 +1025,7 @@ rb_each_row(VALUE self)
 
 /*
  * call-seq:
- *   each_col{|col| ... } -> self
+ *   each_col {|col| ... } -> self
  *
  * Calls block once for each column in self, passing that element as a parameter.
  *
@@ -1113,12 +1094,6 @@ rb_size(VALUE self)
   return cCvSize::new_object(size);
 }
 
-/*
-  VALUE rb_elem_type(VALUE self) {
-  return INT2FIX(cvGetElemType(CVARR(self)));
-  }
-*/
-
 /*
  * call-seq:
  *   dims -> array(int, int, ...)

ext/opencv/cvmat.h

@@ -13,7 +13,7 @@
 #include "opencv.h"
 
 
-#define __NAMESPACE_BEGIN_CVMAT namespace cCvMat{
+#define __NAMESPACE_BEGIN_CVMAT namespace cCvMat {
 #define __NAMESPACE_END_CVMAT }
 
 __NAMESPACE_BEGIN_OPENCV
@@ -136,8 +136,6 @@ VALUE rb_calc_covar_matrix(int argc, VALUE *argv, VALUE self);
 VALUE rb_mahalonobis(int argc, VALUE *argv, VALUE self);
 
 VALUE rb_dft(int argc, VALUE *argv, VALUE self);
-//VALUE rb_optimal_dft_size(VALUE self);
-//VALUE rb_mul_spectrums(int argc, VALUE *argv, VALUE self);
 VALUE rb_dct(int argc, VALUE *argv, VALUE self);
 
 /* drawing function*/
@@ -179,7 +177,6 @@ VALUE rb_warp_affine(int argc, VALUE *argv, VALUE self);
 VALUE rb_rotation_matrix2D(VALUE self, VALUE center, VALUE angle, VALUE scale);
 VALUE rb_warp_perspective(int argc, VALUE *argv, VALUE self);
 VALUE rb_find_homograpy(int argc, VALUE *argv, VALUE self);
-//VALUE rb_perspective_transform();
 VALUE rb_remap(int argc, VALUE *argv, VALUE self);
 VALUE rb_log_polar(int argc, VALUE *argv);
 
@@ -218,7 +215,6 @@ VALUE rb_equalize_hist(VALUE self);
 /* Matching*/
 VALUE rb_match_template(int argc, VALUE *argv, VALUE self);
 VALUE rb_match_shapes(int argc, VALUE *argv, VALUE self);
-// VALUE rb_calc_emd(int argc, VALUE *argv, VALUE self);
 /* Object Tracking */
 VALUE rb_mean_shift(VALUE self, VALUE window, VALUE criteria);
 VALUE rb_cam_shift(VALUE self, VALUE window, VALUE criteria);

ext/opencv/cvmatnd.h

@@ -12,7 +12,7 @@
 
 #include "opencv.h"
 
-#define __NAMESPACE_BEGIN_CVMATND namespace cCvMatND{
+#define __NAMESPACE_BEGIN_CVMATND namespace cCvMatND {
 #define __NAMESPACE_END_CVMATND }
 
 __NAMESPACE_BEGIN_OPENCV

ext/opencv/cvmoments.h

@@ -12,7 +12,7 @@
 
 #include "opencv.h"
 
-#define __NAMESPACE_BEGIN_CVMOMENTS namespace cCvMoments{
+#define __NAMESPACE_BEGIN_CVMOMENTS namespace cCvMoments {
 #define __NAMESPACE_END_CVMOMENTS }
 
 __NAMESPACE_BEGIN_OPENCV

ext/opencv/cvpoint.cpp

@@ -15,7 +15,7 @@
  * X and Y takes the value of the Fixnum. see also CvPoint2D32F
  * 
  * C structure is here, very simple.
- *   typdef struct CvPoint{
+ *   typdef struct CvPoint {
  *     int x;
  *     int y;
  *   }

ext/opencv/cvpoint.h

@@ -12,7 +12,7 @@
 
 #include "opencv.h"
 
-#define __NAMESPACE_BEGIN_CVPOINT namespace cCvPoint{
+#define __NAMESPACE_BEGIN_CVPOINT namespace cCvPoint {
 #define __NAMESPACE_END_CVPOINT }
 
 __NAMESPACE_BEGIN_OPENCV

ext/opencv/cvpoint2d32f.cpp

@@ -15,7 +15,7 @@
  * X and Y takes the value of the Float. see also CvPoint
  * 
  * C structure is here, very simple.
- *   typdef struct CvPoint2D32f{
+ *   typdef struct CvPoint2D32f {
  *     float x;
  *     float y;
  *   }

ext/opencv/cvrect.cpp

@@ -15,7 +15,7 @@
  * 
  * 
  * C stracture is here, very simple.
- *   typdef struct CvRect{
+ *   typdef struct CvRect {
  *     int x;
  *     int y;
  *     int width;

ext/opencv/cvscalar.cpp

@@ -16,9 +16,9 @@
  * Therefore, CvScalar has 4-values.
  * 
  * C structure is here, very simple.
- *   typdef struct CvScalar{
+ *   typdef struct CvScalar {
  *     double val[4];
- *   }CvScalar;
+ *   } CvScalar;
  *
  * If obtain CvScalar-object from the method of CvMat(or IplImage),
  * the channel outside the range is obtained as all 0.

ext/opencv/cvscalar.h

@@ -12,7 +12,7 @@
 
 #include "opencv.h"
 
-#define __NAMESPACE_BEGIN_CVSCALAR namespace cCvScalar{
+#define __NAMESPACE_BEGIN_CVSCALAR namespace cCvScalar {
 #define __NAMESPACE_END_CVSCALAR }
 
 __NAMESPACE_BEGIN_OPENCV

ext/opencv/cvseq.cpp

@@ -493,13 +493,13 @@ rb_shift(VALUE self)
 
 /*
  * call-seq:
- *   each{|obj| ... } -> self
+ *   each {|obj| ... } -> self
  *
  * Calls block once for each sequence-block in <i>self</i>,
  * passing that sequence-block as a parameter.
  *   seq = CvSeq.new(CvIndex)
  *   seq.push(5, 6, 7)
- *   seq.each{|x| print x, " -- " }
+ *   seq.each {|x| print x, " -- " }
  * produces:
  *   5 -- 6 -- 7 --
  */
@@ -526,7 +526,7 @@ rb_each(VALUE self)
 
 /*
  * call-seq:
- *    each_index{|index| ... } -> self
+ *    each_index {|index| ... } -> self
  *
  * Same as CvSeq#each, but passes the index of the element instead of the element itself.
  */
@@ -595,15 +595,5 @@ new_sequence(VALUE klass, CvSeq *seq, VALUE element_klass, VALUE storage)
   return Data_Wrap_Struct(klass, mark_root_object, unregister_elem_class, seq);
 }
 
-VALUE
-auto_extend(VALUE object)
-{
-  CvSeq *seq = CVSEQ(object);
-  if (CV_IS_SEQ_POINT_SET(seq)) {
-    rb_extend_object(object, mPointSet::rb_module());
-  }
-  return object;
-}
-
 __NAMESPACE_END_CVSEQ
 __NAMESPACE_END_OPENCV

ext/opencv/cvseq.h

@@ -48,7 +48,6 @@ VALUE rb_clear(VALUE self);
 VALUE new_object(CvSeq *seq, VALUE klass);
 VALUE new_object(CvSeq *seq, VALUE klass, VALUE storage);
 VALUE new_sequence(VALUE klass, CvSeq *seq, VALUE element_klass, VALUE storage);
-VALUE auto_extend(VALUE object);
 
 __NAMESPACE_END_CVSEQ
 

ext/opencv/cvset.h

@@ -12,7 +12,7 @@
 
 #include "opencv.h"
 
-#define __NAMESPACE_BEGIN_CVSET namespace cCvSet{
+#define __NAMESPACE_BEGIN_CVSET namespace cCvSet {
 #define __NAMESPACE_END_CVSET }
 
 __NAMESPACE_BEGIN_OPENCV

ext/opencv/cvsize.cpp

@@ -15,7 +15,7 @@
  * X and Y takes the value of the Fixnum.
  * 
  * C structure is here, very simple.
- *   typdef struct CvSize{
+ *   typdef struct CvSize {
  *     int width;
  *     int height;
  *   }

ext/opencv/cvsize2d32f.h

@@ -12,7 +12,7 @@
 
 #include "opencv.h"
 
-#define __NAMESPACE_BEGIN_CVSIZE2D32F namespace cCvSize2D32f{
+#define __NAMESPACE_BEGIN_CVSIZE2D32F namespace cCvSize2D32f {
 #define __NAMESPACE_END_CVSIZE2D32F }
 
 __NAMESPACE_BEGIN_OPENCV

ext/opencv/cvslice.cpp

@@ -12,10 +12,10 @@
  * Document-class: OpenCV::CvClice
  *
  * C structure is here, very simple.
- *   typdef struct CvSlice{
+ *   typdef struct CvSlice {
  *     int start_index;
  *     int end_index;
- *   }CvSlice;
+ *   } CvSlice;
  */
 __NAMESPACE_BEGIN_OPENCV
 __NAMESPACE_BEGIN_CVSLICE

ext/opencv/cvslice.h

@@ -12,7 +12,7 @@
 
 #include "opencv.h"
 
-#define __NAMESPACE_BEGIN_CVSLICE namespace cCvSlice{
+#define __NAMESPACE_BEGIN_CVSLICE namespace cCvSlice {
 #define __NAMESPACE_END_CVSLICE }
 
 __NAMESPACE_BEGIN_OPENCV

ext/opencv/cvsparsemat.h

@@ -12,7 +12,7 @@
 
 #include "opencv.h"
 
-#define __NAMESPACE_BEGIN_CVSPARSEMAT namespace cCvSparseMat{
+#define __NAMESPACE_BEGIN_CVSPARSEMAT namespace cCvSparseMat {
 #define __NAMESPACE_END_CVSPARSEMAT }
 
 __NAMESPACE_BEGIN_OPENCV

ext/opencv/cvtwopoints.cpp

@@ -15,7 +15,7 @@
  * X and Y takes the value of the Fixnum. see also CvTwopoints2D32F
  * 
  * C structure is here, very simple.
- *   typdef struct CvTwopoints{
+ *   typdef struct CvTwopoints {
  *     int x;
  *     int y;
  *   }

ext/opencv/cvvideowriter.h

@@ -12,7 +12,7 @@
 
 #include "opencv.h"
 
-#define __NAMESPACE_BEGIN_CVVIDEOWRITER namespace cCvVideoWriter{
+#define __NAMESPACE_BEGIN_CVVIDEOWRITER namespace cCvVideoWriter {
 #define __NAMESPACE_END_CVVIDEOWRITER }
 
 __NAMESPACE_BEGIN_OPENCV

ext/opencv/gui.h

@@ -10,7 +10,7 @@
 #ifndef RUBY_OPENCV_GUI_H
 #define RUBY_OPENCV_GUI_H
 
-#define __NAMESPACE_BEGIN_GUI namespace mGUI{
+#define __NAMESPACE_BEGIN_GUI namespace mGUI {
 #define __NAMESPACE_END_GUI }
 
 #include "opencv.h"

ext/opencv/iplconvkernel.h

@@ -12,7 +12,7 @@
 
 #include "opencv.h"
 
-#define __NAMESPACE_BEGIN_IPLCONVKERNEL namespace cIplConvKernel{
+#define __NAMESPACE_BEGIN_IPLCONVKERNEL namespace cIplConvKernel {
 #define __NAMESPACE_END_IPLCONVKERNEL }
 
 __NAMESPACE_BEGIN_OPENCV

ext/opencv/iplimage.cpp

@@ -313,7 +313,7 @@ rb_smoothness(int argc, VALUE *argv, VALUE self)
     pFourierImage = create_fourier_image(p64DepthImage);
   }
 
-  Smoothness result = compute_smoothness(pFourierImage, f_lowFreqRatio, f_blankDensity, f_messyDnsity,
+  Smoothness result = compute_smoothness(pFourierImage, f_lowFreqRatio, f_blankDensity, f_messyDensity,
 					 f_highFreqRatio, outLowDensity, outHighDensity);
 
   cvReleaseImage(&pFourierImage);
@@ -339,7 +339,7 @@ rb_smoothness(int argc, VALUE *argv, VALUE self)
  */
 Smoothness
 compute_smoothness(const IplImage *pFourierImage, const double lowFreqRatio, const double blankDensity,
-		   const double messyDensity, const double highFreqRatio, double &outLowDensity
+		   const double messyDensity, const double highFreqRatio, double &outLowDensity,
 		   double &outHighDensity)
 {
   int low, high;

ext/opencv/iplimage.h

@@ -12,7 +12,7 @@
 
 #include "opencv.h"
 
-#define __NAMESPACE_BEGIN_IPLIMAGE namespace cIplImage{
+#define __NAMESPACE_BEGIN_IPLIMAGE namespace cIplImage {
 #define __NAMESPACE_END_IPLIMAGE }
 
 __NAMESPACE_BEGIN_OPENCV

ext/opencv/pointset.cpp

@@ -46,18 +46,6 @@ define_ruby_module()
   rb_define_method(module, "min_enclosing_circle", RUBY_METHOD_FUNC(rb_min_enclosing_circle), 0);
 }
 
-VALUE
-rb_extend_object(VALUE self, VALUE object)
-{
-  CvSeq *seq = 0;
-  if (!rb_obj_is_kind_of(object, cCvSeq::rb_class()))
-    rb_raise(rb_eTypeError, "object is not %s.\n", rb_class2name(cCvSeq::rb_class()));
-  
-  if (!CV_IS_SEQ(seq))
-    rb_raise(rb_eTypeError, "object is not sequence.");  
-  return rb_call_super(1, &object);
-}
-
 /*
  * call-seq:
  *   contour_area -> float

ext/opencv/window.cpp

@@ -368,7 +368,7 @@ on_mouse(int event, int x, int y, int flags, void* param) {
 /*
  * call-seq:
  *   set_mouse_callback(&block)
- *   set_mouse_callback{|| ... }
+ *   set_mouse_callback {|| ... }
  *
  * Set mouse callback.
  * When the mouse is operated on the window, block will be called.
@@ -379,7 +379,7 @@ on_mouse(int event, int x, int y, int flags, void* param) {
  *   window = OpenCV::GUI::Window.new "sample window"
  *   image = OpenCV::IplImage::load "sample.png"
  *   window.show(image)
- *   window.set_mouse_callback{|mouse|  
+ *   window.set_mouse_callback {|mouse|  
  *     e = "#{mouse.x}, #{mouse.y} : #{mouse.event} : "
  *     e << "<L>" if mouse.left_button?
  *     e << "<R>" if mouse.right_button?

ext/opencv/window.h

@@ -28,7 +28,6 @@ VALUE rb_allocate(VALUE klass);
 
 void mark(void *ptr);
 VALUE each_protect(VALUE key, VALUE value);
-//VALUE each_protect(void *key, VALUE value);
 void free(void *ptr);
 
 VALUE rb_aref(VALUE klass, VALUE name);