Skip to content

add fast bilateral solver from master #1883

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

Merged
merged 3 commits into from
Nov 9, 2018
Merged

add fast bilateral solver from master #1883

merged 3 commits into from
Nov 9, 2018

Conversation

ytyytyyt
Copy link
Contributor

@ytyytyyt ytyytyyt commented Nov 8, 2018

This pullrequest changes

Adds fixed version of the Fast Bilateral Solver (FBS) from master.

relates #1877

force_builders=linux,docs,windows,macosx

@alalek
Copy link
Member

alalek commented Nov 8, 2018

Thank you for the contribution!

Please take a look on build issues here: http://pullrequest.opencv.org/#/summary/contrib

@ytyytyyt
Copy link
Contributor Author

ytyytyyt commented Nov 8, 2018

Thank you for the contribution!

Please take a look on build issues here: http://pullrequest.opencv.org/#/summary/contrib

I will fix the 'Docs' issue (Failed whitespace opencv_contrib).

The warnings are related to unusable variables cause by:

#ifdef HAVE_EIGEN
        //! [filtering_fbs]
        solving_time = (double)getTickCount();        
        fastBilateralSolverFilter(left, left_disp_resized, conf_map/255.0f, solved_disp, fbs_spatial, fbs_luma, fbs_chroma);
        solving_time = ((double)getTickCount() - solving_time)/getTickFrequency();
        //! [filtering_fbs]

        //! [filtering_wls2fbs]
        fastBilateralSolverFilter(left, filtered_disp, conf_map/255.0f, solved_filtered_disp, fbs_spatial, fbs_luma, fbs_chroma);
        //! [filtering_wls2fbs]
#endif

Should I remove the the HAVE_EIGEN or include the unused variables within this block?

One of the failing tests is not related to files I have been adding/modifying, i.e. Failed test_face:
/build/precommit-contrib_linux64/3.4/opencv_contrib/modules/face/test/test_mace.cpp:78: Failure Expected: (self_ok) >= (nSampsTest/2), actual: 0 vs 2

@alalek
Copy link
Member

alalek commented Nov 8, 2018

Add #else branch for HAVE_EIGEN:

#else
    (void)fbs_spatial;
    (void)fbs_luma;
    (void)fbs_chroma;
#endif

test_face

Ignore, it is sporadic failure.

Copy link
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well done! Thank you 👍

@alalek alalek merged commit 6e3eea5 into opencv:3.4 Nov 9, 2018
@ytyytyyt ytyytyyt deleted the 3.4 branch November 9, 2018 20:09
@ytyytyyt ytyytyyt restored the 3.4 branch November 9, 2018 20:12
@alalek alalek mentioned this pull request Nov 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants