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

Merge branch 'develop' into fix/issues-33_opencv_gpulib_not_found

Browse source 
Conflicts:
	ext/opencv/extconf.rb
This commit is contained in:
ser1zw 2014-03-29 16:59:03 +09:00
commit b851cd07a5
120 changed files with 8006 additions and 7951 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/opencv/opencv.h
View file

@ -112,8 +112,6 @@ extern "C" {
#include "cvmat.h"
#include "iplimage.h"
#include "cvmatnd.h"
#include "cvsparsemat.h"
#include "cvhistogram.h"
#include "cvcapture.h"
#include "cvvideowriter.h"
@ -122,8 +120,6 @@ extern "C" {
#include "cvtwopoints.h"
#include "cvcircle32f.h"
#include "cvcondensation.h"
#include "cvconnectedcomp.h"
#include "cvavgcomp.h"
#include "cvhaarclassifiercascade.h"
@ -203,7 +199,7 @@ void release_object(void *ptr);
void release_iplconvkernel_object(void *ptr);
VALUE rb_module_opencv();
void define_ruby_module();
void init_ruby_module();
// Ruby/OpenCV inline functions
inline CvArr*