Skip to content
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.

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

OpenCV 3.1 + MingW build fix #217

Merged
merged 5 commits into from
Mar 11, 2016
Merged

OpenCV 3.1 + MingW build fix #217

merged 5 commits into from
Mar 11, 2016

Commits on Mar 9, 2016

  1. Updating Windows builds to use OpenCV 3.1 instead of 2.4.11. All plat…

    …forms now work with the same OpenCV version (3.1.0)
    
    - Updated MSVC build script to clone the 3.1.0 branch. Also updated the cmake commandline (3.1.0 needs opencv_ml to be built as well)
    - Updated MSVC readme to use 3.1.0
    - Updated osx build script to also clone 3.1.0 branch instead of whatever is currently at master
    - Due to a bug in OpenCV 3.1.0 it is not possible to call cvGetSize from C source files under MSVC (it will crash due to incorrect code generation). As a workaround for this (until the bug in OpenCV is fixed), the psmove_tracker.c file (which is the only code calling cvGetSize) is now force-compiled as C++. See opencv/opencv#6221 for more info.
    - In order to be able to build psmove_tracker.c as C++, some code needed to be updated (extern "C" added where relevant, tracker_default_settings can no longer be initialized using C-style designated initializer)
    rovarma committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    ec44888 View commit details
    Browse the repository at this point in the history
  2. - Removed tracker_default_settings; initializing it with a function c…

    …all is apparently not compatible with C99. Now using create_tracker_default_settings directly.
    rovarma committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    810f559 View commit details
    Browse the repository at this point in the history
  3. Fix for mingw build errors introduced by thp#215

    - Changed is_valid_float to use std::isnan instead of isnan (isnan is not supported on mingw). std::isnan is the portable version, but is obviously C++ only
    - Moved is_valid_float and assert_valid_float macros from psmove_math.h into psmove_quaternion.cpp (this is the only place where it was used anyway) in order to prevent it from being included by .c files by accident (which would cause a compile error due to std:: prefix)
    rovarma committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    7fb3db2 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2016

  1. - Removed create_tracker_default_settings; just setting defaults dire…

    …ctly in psmove_tracker_settings_set_default
    rovarma committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    bf2fc33 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3e1dece View commit details
    Browse the repository at this point in the history