Skip to content

Jimc/foo #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Jimc/foo #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81ab06d
check opencv version, avoid 3.0 til code is ready.
jimc May 13, 2015
f54c72b
sent upstream - appear correct
jimc Apr 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@ group :development do
gem "hoe-gemspec"
gem "rake-compiler"
gem "yard"
gem "minitest"
gem "test-unit"
end

15 changes: 14 additions & 1 deletion ext/opencv/extconf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

require "mkmf"

def cv_version_suffix(incdir)
def _cv_version_suffix(incdir)
major, minor, subminor = nil, nil, nil
open("#{incdir}/opencv2/core/version.hpp", 'r') { |f|
f.read.lines.each { |line|
Expand All @@ -20,15 +20,28 @@ def cv_version_suffix(incdir)
subminor = $1.to_s if line =~ /\A#define\s+(?:CV_VERSION_MINOR|CV_SUBMINOR_VERSION)\s+(\d+)\s*\Z/
}
}
end

def cv_version_suffix(incdir)
major, minor, subminor = _cv_version_suffix(incdir)
major + minor + subminor
end

def cv_version_major(incdir)
major, minor, subminor = _cv_version_suffix(incdir)
major
end

# Quick fix for 2.0.0
# @libdir_basename is set to nil and dir_config() sets invalid libdir '${opencv-dir}/' when --with-opencv-dir option passed.
@libdir_basename ||= 'lib'
incdir, libdir = dir_config("opencv", "/usr/local/include", "/usr/local/lib")
dir_config("libxml2", "/usr/include", "/usr/lib")

if cv_version_suffix(incdir) == "3"
raise "not ready for ", cv_version_suffix(incdir), "yet\n"
end

opencv_headers = ["opencv2/core/core_c.h", "opencv2/core/core.hpp", "opencv2/imgproc/imgproc_c.h",
"opencv2/imgproc/imgproc.hpp", "opencv2/video/tracking.hpp", "opencv2/features2d/features2d.hpp",
"opencv2/flann/flann.hpp", "opencv2/calib3d/calib3d.hpp", "opencv2/objdetect/objdetect.hpp",
Expand Down
2 changes: 1 addition & 1 deletion test/test_cvbox2d.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
# -*- mode: ruby; coding: utf-8 -*-
require 'test/unit'
require 'test-unit'
require 'opencv'
require File.expand_path(File.dirname(__FILE__)) + '/helper'

Expand Down