From bd362275e7d2916f9db70be478237caaa1f9258f Mon Sep 17 00:00:00 2001 From: ser1zw Date: Sat, 18 Jan 2014 19:08:13 +0900 Subject: [PATCH] small fix --- ext/opencv/cvmat.cpp | 50 ++++++++++++++++++------------------ ext/opencv/cvmoments.cpp | 2 +- ext/opencv/cvscalar.cpp | 2 +- ext/opencv/cvseq.cpp | 8 +++--- ext/opencv/cvslice.cpp | 2 +- ext/opencv/cvvideowriter.cpp | 6 ++--- ext/opencv/gui.cpp | 2 +- ext/opencv/iplimage.cpp | 16 ++++++------ ext/opencv/pointset.cpp | 4 +-- ext/opencv/trackbar.cpp | 4 +-- ext/opencv/window.cpp | 18 ++++++------- 11 files changed, 57 insertions(+), 57 deletions(-) diff --git a/ext/opencv/cvmat.cpp b/ext/opencv/cvmat.cpp index 922a506..de9c664 100644 --- a/ext/opencv/cvmat.cpp +++ b/ext/opencv/cvmat.cpp @@ -3982,7 +3982,7 @@ rb_log_polar(int argc, VALUE *argv, VALUE self) /* * call-seq: - * erode([element = nil, iteration = 1]) -> cvmat + * erode([element = nil, iteration = 1]) -> cvmat * * Create erodes image by using arbitrary structuring element. * element is structuring element used for erosion. @@ -3997,7 +3997,7 @@ rb_erode(int argc, VALUE *argv, VALUE self) /* * call-seq: - * erode!([element = nil][,iteration = 1]) -> self + * erode!([element = nil][,iteration = 1]) -> self * * Erodes image by using arbitrary structuring element. * see also #erode. @@ -4019,7 +4019,7 @@ rb_erode_bang(int argc, VALUE *argv, VALUE self) /* * call-seq: - * dilate([element = nil][,iteration = 1]) -> cvmat + * dilate([element = nil][,iteration = 1]) -> cvmat * * Create dilates image by using arbitrary structuring element. * element is structuring element used for erosion. @@ -4034,7 +4034,7 @@ rb_dilate(int argc, VALUE *argv, VALUE self) /* * call-seq: - * dilate!([element = nil][,iteration = 1]) -> self + * dilate!([element = nil][,iteration = 1]) -> self * * Dilate image by using arbitrary structuring element. * see also #dilate. @@ -4056,7 +4056,7 @@ rb_dilate_bang(int argc, VALUE *argv, VALUE self) /* * call-seq: - * morpholohy(operation[,element = nil][,iteration = 1]) -> cvmat + * morpholohy(operation[,element = nil][,iteration = 1]) -> cvmat * * Performs advanced morphological transformations. * operation @@ -4097,7 +4097,7 @@ rb_morphology(int argc, VALUE *argv, VALUE self) /* * call-seq: - * smooth_blur_no_scale([p1 = 3, p2 = 3]) -> cvmat + * smooth_blur_no_scale([p1 = 3, p2 = 3]) -> cvmat * * Smooths the image by simple blur with no scaling. * * 8bit unsigned -> return 16bit unsigned @@ -4128,7 +4128,7 @@ rb_smooth_blur_no_scale(int argc, VALUE *argv, VALUE self) /* * call-seq: - * smooth_blur([p1 = 3, p2 = 3]) -> cvmat + * smooth_blur([p1 = 3, p2 = 3]) -> cvmat * * Smooths the image by simple blur. * Summation over a pixel p1 x p2 neighborhood with subsequent scaling by 1 / (p1*p2). @@ -4146,7 +4146,7 @@ rb_smooth_blur(int argc, VALUE *argv, VALUE self) /* * call-seq: - * smooth_gaussian([p1 = 3, p2 = 3, p3 = 0.0, p4 = 0.0]) -> cvmat + * smooth_gaussian([p1 = 3, p2 = 3, p3 = 0.0, p4 = 0.0]) -> cvmat * * Smooths the image by gaussian blur. * Convolving image with p1 x p2 Gaussian kernel. @@ -4172,7 +4172,7 @@ rb_smooth_gaussian(int argc, VALUE *argv, VALUE self) /* * call-seq: - * smooth_median([p1 = 3]) -> cvmat + * smooth_median([p1 = 3]) -> cvmat * * Smooths the image by median blur. * Finding median of p1 x p1 neighborhood (i.e. the neighborhood is square). @@ -4190,7 +4190,7 @@ rb_smooth_median(int argc, VALUE *argv, VALUE self) /* * call-seq: - * smooth_bilateral([p1 = 3][p2 = 3]) -> cvmat + * smooth_bilateral([p1 = 3][p2 = 3]) -> cvmat * * Smooths the image by bilateral filter. * Applying bilateral 3x3 filtering with color sigma=p1 and space sigma=p2. @@ -4277,7 +4277,7 @@ rb_smooth(int argc, VALUE *argv, VALUE self) /* * call-seq: - * filter2d(kernel[,anchor]) -> cvmat + * filter2d(kernel[,anchor]) -> cvmat * * Convolves image with the kernel. * Convolution kernel, single-channel floating point matrix (or same depth of self's). @@ -4304,7 +4304,7 @@ rb_filter2d(int argc, VALUE *argv, VALUE self) /* * call-seq: - * copy_make_border(border_type, size, offset[,value = CvScalar.new(0)]) + * copy_make_border(border_type, size, offset[,value = CvScalar.new(0)]) * * Copies image and makes border around it. * border_type: @@ -4348,7 +4348,7 @@ rb_copy_make_border(int argc, VALUE *argv, VALUE self) /* * call-seq: - * integral(need_sqsum = false, need_tilted_sum = false) -> [cvmat, cvmat or nil, cvmat or nil] + * integral(need_sqsum = false, need_tilted_sum = false) -> [cvmat, cvmat or nil, cvmat or nil] * * Calculates integral images. * If need_sqsum = true, calculate the integral image for squared pixel values. @@ -4538,7 +4538,7 @@ rb_adaptive_threshold(int argc, VALUE *argv, VALUE self) /* * call-seq: - * pyr_down([filter = :gaussian_5x5]) -> cvmat + * pyr_down([filter = :gaussian_5x5]) -> cvmat * * Return downsamples image. * @@ -4578,7 +4578,7 @@ rb_pyr_down(int argc, VALUE *argv, VALUE self) /* * call-seq: - * pyr_up([filter = :gaussian_5x5]) -> cvmat + * pyr_up([filter = :gaussian_5x5]) -> cvmat * * Return upsamples image. * @@ -4859,7 +4859,7 @@ rb_draw_chessboard_corners_bang(VALUE self, VALUE pattern_size, VALUE corners, V /* * call-seq: - * pyr_mean_shift_filtering(sp, sr[,max_level = 1][termcrit = CvTermCriteria.new(5,1)]) -> cvmat + * pyr_mean_shift_filtering(sp, sr[,max_level = 1][termcrit = CvTermCriteria.new(5,1)]) -> cvmat * * Does meanshift image segmentation. * @@ -5061,7 +5061,7 @@ rb_hough_circles(int argc, VALUE *argv, VALUE self) /* * call-seq: - * inpaint(inpaint_method, mask, radius) -> cvmat + * inpaint(inpaint_method, mask, radius) -> cvmat * * Inpaints the selected region in the image * The radius of circlular neighborhood of each point inpainted that is considered by the algorithm. @@ -5193,7 +5193,7 @@ rb_match_template(int argc, VALUE *argv, VALUE self) /* * call-seq: - * match_shapes(object, method) -> float + * match_shapes(object, method) -> float * * Compares two shapes(self and object). object should be CvMat or CvContour. * @@ -5228,7 +5228,7 @@ rb_match_shapes(int argc, VALUE *argv, VALUE self) /** * Port from OpenCV sample: matching_to_many_images.cpp * call-seq: - * match_descriptors(images[, detector_type="SURF"][, descriptor_type="SURF"][, matcher_type="FlannBased"]) -> Hash + * match_descriptors(images[, detector_type="SURF"][, descriptor_type="SURF"][, matcher_type="FlannBased"]) -> Hash * * Matching descriptors detected on one image to descriptors detected in image array. * Returns a Hash contains match count of each image index. @@ -5360,7 +5360,7 @@ rb_cam_shift(VALUE self, VALUE window, VALUE criteria) /* * call-seq: - * snake_image(points, alpha, beta, gamma, window, criteria[, calc_gradient = true]) -> array(pointset) + * snake_image(points, alpha, beta, gamma, window, criteria[, calc_gradient = true]) -> array(pointset) * * Updates snake in order to minimize its total energy that is a sum of internal energy * that depends on contour shape (the smoother contour is, the smaller internal energy is) @@ -5444,7 +5444,7 @@ rb_snake_image(int argc, VALUE *argv, VALUE self) /* * call-seq: - * optical_flow_hs(prev[,velx = nil][,vely = nil][,options]) -> [cvmat, cvmat] + * optical_flow_hs(prev[,velx = nil][,vely = nil][,options]) -> [cvmat, cvmat] * * Calculates optical flow for two images (previous -> self) using Horn & Schunck algorithm. * Return horizontal component of the optical flow and vertical component of the optical flow. @@ -5500,7 +5500,7 @@ rb_optical_flow_hs(int argc, VALUE *argv, VALUE self) /* * call-seq: - * optical_flow_lk(prev, win_size) -> [cvmat, cvmat] + * optical_flow_lk(prev, win_size) -> [cvmat, cvmat] * * Calculates optical flow for two images (previous -> self) using Lucas & Kanade algorithm * Return horizontal component of the optical flow and vertical component of the optical flow. @@ -5529,7 +5529,7 @@ rb_optical_flow_lk(VALUE self, VALUE prev, VALUE win_size) /* * call-seq: - * optical_flow_bm(prev[,velx = nil][,vely = nil][,option]) -> [cvmat, cvmat] + * optical_flow_bm(prev[,velx = nil][,vely = nil][,option]) -> [cvmat, cvmat] * * Calculates optical flow for two images (previous -> self) using block matching method. * Return horizontal component of the optical flow and vertical component of the optical flow. @@ -5592,7 +5592,7 @@ rb_optical_flow_bm(int argc, VALUE *argv, VALUE self) /* * call-seq: - * CvMat.find_fundamental_mat(points1, points2[,options = {}]) -> fundamental_matrix(cvmat) or nil + * CvMat.find_fundamental_mat(points1, points2[,options = {}]) -> fundamental_matrix(cvmat) or nil * * Calculates fundamental matrix from corresponding points. * Size of the output fundamental matrix is 3x3 or 9x3 (7-point method may return up to 3 matrices) @@ -5655,7 +5655,7 @@ rb_find_fundamental_mat(int argc, VALUE *argv, VALUE klass) /* * call-seq: - * CvMat.compute_correspond_epilines(points, which_image, fundamental_matrix) -> correspondent_lines(cvmat) + * CvMat.compute_correspond_epilines(points, which_image, fundamental_matrix) -> correspondent_lines(cvmat) * * For points in one image of stereo pair computes the corresponding epilines in the other image. * Finds equation of a line that contains the corresponding point (i.e. projection of the same 3D point) diff --git a/ext/opencv/cvmoments.cpp b/ext/opencv/cvmoments.cpp index 8618bd5..8ac2c96 100644 --- a/ext/opencv/cvmoments.cpp +++ b/ext/opencv/cvmoments.cpp @@ -38,7 +38,7 @@ rb_allocate(VALUE klass) } /* * call-seq: - * CvMoments.new(src[,is_binary = nil]) + * CvMoments.new(src[,is_binary = nil]) * * Calculates all moments up to third order of a polygon or rasterized shape. * src should be CvMat or CvPolygon. diff --git a/ext/opencv/cvscalar.cpp b/ext/opencv/cvscalar.cpp index d9c9e41..55565a5 100644 --- a/ext/opencv/cvscalar.cpp +++ b/ext/opencv/cvscalar.cpp @@ -51,7 +51,7 @@ rb_allocate(VALUE klass) /* * call-seq: - * new([d1][,d2][,d3][,d4]) + * new([d1][,d2][,d3][,d4]) * * Create new Scalar. Argument should be Fixnum (or nil as 0). */ diff --git a/ext/opencv/cvseq.cpp b/ext/opencv/cvseq.cpp index 7b2ec50..a9da209 100644 --- a/ext/opencv/cvseq.cpp +++ b/ext/opencv/cvseq.cpp @@ -82,7 +82,7 @@ rb_allocate(VALUE klass) /* * call-seq: - * CvSeq.new(type[,storage]) + * CvSeq.new(type[,storage]) * * Return a new CvSeq. type should be following classes. * @@ -335,7 +335,7 @@ rb_seq_push(VALUE self, VALUE args, int flag) /* * call-seq: - * push(obj, ...) -> self + * push(obj, ...) -> self * * Append - Pushes the given object(s) on the end of this sequence. This expression return the sequence itself, * so several append may be chained together. @@ -499,7 +499,7 @@ rb_each_index(VALUE self) /* * call-seq: - * insert(index,obj) -> self + * insert(index,obj) -> self * * Inserts the given values before element with the given index (which may be negative). */ @@ -527,7 +527,7 @@ rb_insert(VALUE self, VALUE index, VALUE object) /* * call-seq: - * remove(index) -> obj or nil + * remove(index) -> obj or nil * * Deletes the elements at the specified index. */ diff --git a/ext/opencv/cvslice.cpp b/ext/opencv/cvslice.cpp index 69d19b8..29e85b8 100644 --- a/ext/opencv/cvslice.cpp +++ b/ext/opencv/cvslice.cpp @@ -37,7 +37,7 @@ rb_allocate(VALUE klass) /* * call-seq: - * new(start, end) + * new(start, end) * * Create new slice object. */ diff --git a/ext/opencv/cvvideowriter.cpp b/ext/opencv/cvvideowriter.cpp index 4c7877d..dcd5531 100644 --- a/ext/opencv/cvvideowriter.cpp +++ b/ext/opencv/cvvideowriter.cpp @@ -28,8 +28,8 @@ rb_class() /* * call-seq: - * CvVideoWriter.new(filname, fourcc, fps, size[, is_color]) -> cvvideowriter - * CvVideoWriter.new(filname, fourcc, fps, size[, is_color]){|vw| ... } -> nil + * CvVideoWriter.new(filname, fourcc, fps, size[, is_color]) -> cvvideowriter + * CvVideoWriter.new(filname, fourcc, fps, size[, is_color]){|vw| ... } -> nil * * Open new video writer. If block given, writer is closed automatically when end of block. * @@ -81,7 +81,7 @@ rb_initialize(int argc, VALUE *argv, VALUE self) /* * call-seq: - * write(frame) + * write(frame) * * Write image as frame of video stream. * frame should be IplImage diff --git a/ext/opencv/gui.cpp b/ext/opencv/gui.cpp index 90b2749..7816a41 100644 --- a/ext/opencv/gui.cpp +++ b/ext/opencv/gui.cpp @@ -27,7 +27,7 @@ rb_module_GUI() /* * call-seq: - * wait_key([delay]) -> int or nil + * wait_key([delay]) -> int or nil * * Waits for a pressed key each GUI wedget. * Return the code of the pressed key or nil if no key were pressed until the specified timeout has elapsed. diff --git a/ext/opencv/iplimage.cpp b/ext/opencv/iplimage.cpp index 581627f..e5998a3 100644 --- a/ext/opencv/iplimage.cpp +++ b/ext/opencv/iplimage.cpp @@ -41,7 +41,7 @@ rb_allocate(VALUE klass) /* * call-seq: - * new(width, height[, depth = CV_8U][, channel = 3]) + * new(width, height[, depth = CV_8U][, channel = 3]) * * Create width * height image. Each element-value set 0. * @@ -65,7 +65,7 @@ rb_initialize(int argc, VALUE *argv, VALUE self) /* * call-seq: - * IplImage::load(filename[,iscolor = CV_LOAD_IMAGE_COLOR]) + * IplImage::load(filename[,iscolor = CV_LOAD_IMAGE_COLOR]) * * Load an image from file. * iscolor = CV_LOAD_IMAGE_COLOR, the loaded image is forced to be a 3-channel color image @@ -149,8 +149,8 @@ rb_get_roi(VALUE self) /* * call-seq: - * set_roi(rect) - * set_roi(rect){|image| ...} + * set_roi(rect) + * set_roi(rect){|image| ...} * * Set ROI. rect should be CvRect or compatible object. * Return self. @@ -210,8 +210,8 @@ rb_get_coi(VALUE self) /* * call-seq: - * set_coi(coi) - * set_coi(coi){|image| ...} + * set_coi(coi) + * set_coi(coi){|image| ...} * * Set COI. coi should be Fixnum. * Return self. @@ -254,7 +254,7 @@ rb_reset_coi(VALUE self) /* * call-seq: - * IplImage.smoothness(lowFreqRatio, blankDensity, messyDensity, highFreqRatio) -> [ symbol, float, float ] + * IplImage.smoothness(lowFreqRatio, blankDensity, messyDensity, highFreqRatio) -> [ symbol, float, float ] * * Determines if the image's smoothness is either, :smooth, :messy, or :blank. * @@ -559,7 +559,7 @@ high_pass_range(const IplImage *pImage, float lostPercentage, int &outLow, int & /* * call-seq: - * pyr_segmentation(level, threshold1, threshold2) -> [iplimage, cvseq(include cvconnectedcomp)] + * pyr_segmentation(level, threshold1, threshold2) -> [iplimage, cvseq(include cvconnectedcomp)] * * Does image segmentation by pyramids. * The pyramid builds up to the level level. diff --git a/ext/opencv/pointset.cpp b/ext/opencv/pointset.cpp index f8b980d..3afbcdd 100644 --- a/ext/opencv/pointset.cpp +++ b/ext/opencv/pointset.cpp @@ -67,7 +67,7 @@ rb_fit_ellipse2(VALUE self) /* * call-seq: - * convex_hull2([orientation_clockwise = true]) -> cvcontour + * convex_hull2([orientation_clockwise = true]) -> cvcontour * * Finds convex hull of 2D point set using Sklansky's algorithm. * @@ -113,7 +113,7 @@ rb_check_contour_convexity(VALUE self) /* * call-seq: - * convexity_defects(hull) -> cvseq(include CvConvexityDefect) + * convexity_defects(hull) -> cvseq(include CvConvexityDefect) * * Finds convexity defects of contour. */ diff --git a/ext/opencv/trackbar.cpp b/ext/opencv/trackbar.cpp index bd7b5e8..360091f 100644 --- a/ext/opencv/trackbar.cpp +++ b/ext/opencv/trackbar.cpp @@ -42,8 +42,8 @@ void trackbar_free(void *ptr) { /* * call-seq: - * new(name,maxval[,val],&block) - * new(name,maxval[,val]){|value| ... } + * new(name,maxval[,val],&block) + * new(name,maxval[,val]){|value| ... } * * Create new Trackbar. * name should be String. diff --git a/ext/opencv/window.cpp b/ext/opencv/window.cpp index b1b8d37..1193686 100644 --- a/ext/opencv/window.cpp +++ b/ext/opencv/window.cpp @@ -57,7 +57,7 @@ window_free(void *ptr) /* * call-seq: - * new(name[, flags]) + * new(name[, flags]) * * Create new window named name. * If flags is CV_WINDOW_AUTOSIZE (default), window size automatically resize when image given. @@ -140,8 +140,8 @@ rb_destroy_all(VALUE klass) /* * call-seq: - * resize(size) - * resize(width, height) + * resize(size) + * resize(width, height) * * Set window size. */ @@ -176,8 +176,8 @@ rb_resize(int argc, VALUE *argv, VALUE self) /* * call-seq: - * move(point) - * move(x, y) + * move(point) + * move(x, y) * * Set window position. */ @@ -212,7 +212,7 @@ rb_move(int argc, VALUE *argv, VALUE self) /* * call-seq: - * show_image(image) + * show_image(image) * * Show the image. If the window was created with flags = CV_WINDOW_AUTOSIZE then the image is shown * with its original size, otherwize the image is scaled to fit the window. @@ -239,9 +239,9 @@ trackbar_callback(int value, void* block) /* * call-seq: - * set_trackbar(trackbar) - * set_trackbar(name,maxval[,val],&block) - * set_trackbar(name,maxval[,val]){|value| ... } + * set_trackbar(trackbar) + * set_trackbar(name,maxval[,val],&block) + * set_trackbar(name,maxval[,val]){|value| ... } * * Create Trackbar on this window. Return new Trackbar. * see Trackbar.new