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

Update the OpenCV constants to the corresponding ones in cpp namespace. #578

Merged
merged 14 commits into from
Oct 5, 2018

Conversation

taoyudong
Copy link

Change some macros to enable OpenFace with OpenCV3.4 (Not using #ifdef so the updated version can only work with OpenCV3.4. Can be done in the future)

TadasBaltrusaitis and others added 2 commits August 29, 2018 08:34
Bug report template
Change some macros to install OpenFace with OpenCV3.4
@taoyudong
Copy link
Author

Tested on my mac high Sierra 10.13.6 and should be deployable for other OS. OpenCV version is 3.4.2 from homebrew. Have not been heavily tested.
I do not have time to provide a version compatible with both versions in the coming weeks. If desired, I might be able to finish it in Oct. It should be easy with #ifdef.

@taoyudong
Copy link
Author

Somehow the name in the header was wrongly encoded. I updated it with my web browser, so there're multiple commits.

@TadasBaltrusaitis
Copy link
Owner

Hi, I'm a bit confused by the PR.

OpenFace already works with OpenCV 3.4, or did you encounter any issues with that?

@taoyudong
Copy link
Author

The title is kind of misleading here. It is not really due to the version of OpenCV.
The constant used in OpenFace, such as CV_BGR2GRAY. They are defined in opencv2/imgproc/type_c.h, which is designed for c interface.
When I specify to use cpp compiler in mac, these headers will not be loaded and thus produce "use of undeclared identifier ***" error.
This can surely be resolved by using the proper compiler setting. However, it would be better to use the equivalent constant defined in the namespace for cpp project.

@taoyudong taoyudong changed the title Accommodate OpenCV3.4 Update the OpenCV constants to the corresponding ones in cpp namespace. Oct 5, 2018
@TadasBaltrusaitis
Copy link
Owner

Sounds good, thanks for the explanation. Before completing the pull request could you make it to develop rather that the master branch? I use develop as a stop-gap before including changes into master.

@taoyudong taoyudong changed the base branch from master to develop October 5, 2018 09:17
@taoyudong
Copy link
Author

Done

@TadasBaltrusaitis TadasBaltrusaitis merged commit 9c2e5d6 into TadasBaltrusaitis:develop Oct 5, 2018
@TadasBaltrusaitis
Copy link
Owner

Thanks!

TadasBaltrusaitis added a commit that referenced this pull request Nov 29, 2018
* Removing code duplication and getting rid of some C++ warnings due to float/double and signed/unsigned mixing.

* Fixing the screenshot functionality.

* Feature/code cleanup (#573)

* Header guard cleanup (making sure naming is compliant with C++ standards and consistent).

* Removing un-needed nullptr checks.

* Removing SSE warnings for x64 builds (as SSE is enabled by default no need for a flag)

* Reverting Mat deletion

* Adding Visual Studio 2017 solution

* Feature/code cleanup (#580)

- name of revision
- better scripts for model download (not only in Dropbox also OneDrive)

* Update the OpenCV constants to the corresponding ones in cpp namespace. (#578)

Updating OpenCV macros.

* Slight change in packaging code (use a shared download script).

* Removing TBB dependency (#590)

Removing a TBB dependence for code parallelization (done through OpenCV's parralel_for_

* Updating OpenBLAS (#594)

Updating the 64 bit OpenBLAS version for Windows to 0.3.3 (50% perf improvement on certain machines)

* Ability to specify output image formats and removing unused quiet parameter.

* Update Windows download script (#608) (#610)

- Automatically choose correct path to the model files so that it works for both, source code compilation and binary use
- Use absolute paths in the system exists methods

* Updating version.

* Packaging code update.
ratgen pushed a commit to ratgen/OpenFace that referenced this pull request Jul 7, 2022
* Removing code duplication and getting rid of some C++ warnings due to float/double and signed/unsigned mixing.

* Fixing the screenshot functionality.

* Feature/code cleanup (TadasBaltrusaitis#573)

* Header guard cleanup (making sure naming is compliant with C++ standards and consistent).

* Removing un-needed nullptr checks.

* Removing SSE warnings for x64 builds (as SSE is enabled by default no need for a flag)

* Reverting Mat deletion

* Adding Visual Studio 2017 solution

* Feature/code cleanup (TadasBaltrusaitis#580)

- name of revision
- better scripts for model download (not only in Dropbox also OneDrive)

* Update the OpenCV constants to the corresponding ones in cpp namespace. (TadasBaltrusaitis#578)

Updating OpenCV macros.

* Slight change in packaging code (use a shared download script).

* Removing TBB dependency (TadasBaltrusaitis#590)

Removing a TBB dependence for code parallelization (done through OpenCV's parralel_for_

* Updating OpenBLAS (TadasBaltrusaitis#594)

Updating the 64 bit OpenBLAS version for Windows to 0.3.3 (50% perf improvement on certain machines)

* Ability to specify output image formats and removing unused quiet parameter.

* Update Windows download script (TadasBaltrusaitis#608) (TadasBaltrusaitis#610)

- Automatically choose correct path to the model files so that it works for both, source code compilation and binary use
- Use absolute paths in the system exists methods

* Updating version.

* Packaging code update.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants