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

fix for OpenCV 2.4 (tested using OpenCV 2.4-beta2)

Browse source
This commit is contained in:
ser1zw 2012-04-22 22:27:58 +09:00
parent ce0f55d038
commit 55f57e7eed
6 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/opencv/cverror.cpp
View file

@ -139,8 +139,6 @@ void define_ruby_class()
REGISTER_CVERROR("CvStsAssert", CV_StsAssert);
REGISTER_CVERROR("CvGpuNotSupported", CV_GpuNotSupported);
REGISTER_CVERROR("CvGpuApiCallError", CV_GpuApiCallError);
REGISTER_CVERROR("CvGpuNppCallError", CV_GpuNppCallError);
REGISTER_CVERROR("CvGpuCufftCallError", CV_GpuCufftCallError);
}
VALUE

2
ext/opencv/opencv.cpp
View file

@ -695,5 +695,7 @@ extern "C" {
mOpenCV::mMachineLearning::define_ruby_module();
*/
#endif
cv::initModule_nonfree();
}
}

2
ext/opencv/opencv.h
View file

@ -62,6 +62,7 @@ extern "C" {
#include "opencv2/video/tracking.hpp"
#include "opencv2/video/background_segm.hpp"
#include "opencv2/features2d/features2d.hpp"
#include "opencv2/nonfree/nonfree.hpp"
#include "opencv2/flann/flann.hpp"
#include "opencv2/calib3d/calib3d.hpp"
#include "opencv2/objdetect/objdetect.hpp"
@ -72,6 +73,7 @@ extern "C" {
#include "opencv2/highgui/highgui_c.h"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/core/internal.hpp"
#include "opencv2/photo/photo.hpp"
#ifdef HAVE_ML_H
#include "opencv2/ml/ml.hpp"

7
extconf.rb
View file

@ -18,16 +18,17 @@ opencv_headers = ["opencv2/core/core_c.h", "opencv2/core/core.hpp", "opencv2/img
"opencv2/imgproc/imgproc.hpp", "opencv2/video/tracking.hpp", "opencv2/features2d/features2d.hpp",
"opencv2/flann/flann.hpp", "opencv2/calib3d/calib3d.hpp", "opencv2/objdetect/objdetect.hpp",
"opencv2/legacy/compat.hpp", "opencv2/legacy/legacy.hpp", "opencv2/highgui/highgui_c.h",
"opencv2/highgui/highgui.hpp"]
"opencv2/highgui/highgui.hpp", "opencv2/photo/photo.hpp", "opencv2/nonfree/nonfree.hpp"]
opencv_libraries = ["opencv_calib3d", "opencv_contrib", "opencv_core", "opencv_features2d",
"opencv_flann", "opencv_gpu", "opencv_highgui", "opencv_imgproc",
"opencv_legacy", "opencv_ml", "opencv_objdetect", "opencv_video"]
"opencv_legacy", "opencv_ml", "opencv_objdetect", "opencv_video",
"opencv_photo", "opencv_nonfree"]
puts ">> Check the required libraries..."
OPENCV_VERSION_SUFFIX = '231'
OPENCV_VERSION_SUFFIX = '240'
case CONFIG["arch"]
when /mswin32/
opencv_libraries.map! {|lib| lib + OPENCV_VERSION_SUFFIX }

2
test/test_cverror.rb
View file

@ -18,7 +18,7 @@ class TestCvError < OpenCVTestCase
end
def test_subclass
errors = [CvStsBackTrace, CvStsError, CvStsInternal, CvStsNoMem, CvStsBadArg, CvStsBadFunc, CvStsNoConv, CvStsAutoTrace, CvHeaderIsNull, CvBadImageSize, CvBadOffset, CvBadDataPtr, CvBadStep, CvBadModelOrChSeq, CvBadNumChannels, CvBadNumChannel1U, CvBadDepth, CvBadAlphaChannel, CvBadOrder, CvBadOrigin, CvBadAlign, CvBadCallBack, CvBadTileSize, CvBadCOI, CvBadROISize, CvMaskIsTiled, CvStsNullPtr, CvStsVecLengthErr, CvStsFilterStructContentErr, CvStsKernelStructContentErr, CvStsFilterOffsetErr, CvStsBadSize, CvStsDivByZero, CvStsInplaceNotSupported, CvStsObjectNotFound, CvStsUnmatchedFormats, CvStsBadFlag, CvStsBadPoint, CvStsBadMask, CvStsUnmatchedSizes, CvStsUnsupportedFormat, CvStsOutOfRange, CvStsParseError, CvStsNotImplemented, CvStsBadMemBlock, CvStsAssert, CvGpuNotSupported, CvGpuApiCallError, CvGpuNppCallError, CvGpuCufftCallError]
errors = [CvStsBackTrace, CvStsError, CvStsInternal, CvStsNoMem, CvStsBadArg, CvStsBadFunc, CvStsNoConv, CvStsAutoTrace, CvHeaderIsNull, CvBadImageSize, CvBadOffset, CvBadDataPtr, CvBadStep, CvBadModelOrChSeq, CvBadNumChannels, CvBadNumChannel1U, CvBadDepth, CvBadAlphaChannel, CvBadOrder, CvBadOrigin, CvBadAlign, CvBadCallBack, CvBadTileSize, CvBadCOI, CvBadROISize, CvMaskIsTiled, CvStsNullPtr, CvStsVecLengthErr, CvStsFilterStructContentErr, CvStsKernelStructContentErr, CvStsFilterOffsetErr, CvStsBadSize, CvStsDivByZero, CvStsInplaceNotSupported, CvStsObjectNotFound, CvStsUnmatchedFormats, CvStsBadFlag, CvStsBadPoint, CvStsBadMask, CvStsUnmatchedSizes, CvStsUnsupportedFormat, CvStsOutOfRange, CvStsParseError, CvStsNotImplemented, CvStsBadMemBlock, CvStsAssert, CvGpuNotSupported, CvGpuApiCallError]
errors.each { |err|
assert_equal(CvError, err.superclass)

6
test/test_opencv.rb
View file

@ -9,10 +9,10 @@ include OpenCV
class TestOpenCV < OpenCVTestCase
def test_constants
# OpenCV version
assert_equal('2.3.1', CV_VERSION)
assert_equal('2.4.0', CV_VERSION)
assert_equal(2, CV_MAJOR_VERSION)
assert_equal(3, CV_MINOR_VERSION)
assert_equal(1, CV_SUBMINOR_VERSION)
assert_equal(4, CV_MINOR_VERSION)
assert_equal(0, CV_SUBMINOR_VERSION)
# Depths
assert_equal(0, CV_8U)