Skip to content

Added the tutorial on background subtraction, in the video section#1315

Merged
opencv-pushbot merged 9 commits intoopencv:masterfrom
dbloisi:add_bs_tutorial
Oct 1, 2013
Merged

Added the tutorial on background subtraction, in the video section#1315
opencv-pushbot merged 9 commits intoopencv:masterfrom
dbloisi:add_bs_tutorial

Conversation

@dbloisi
Copy link
Copy Markdown
Contributor

@dbloisi dbloisi commented Aug 21, 2013

Added a tutorial on background subtraction, in the video section. I also added the complete code in the samples folder. A minor fix in the file modules/stitching/src/motion_estimators.cpp because I was unable to compile without adding std:: at line 262.

@BKNio
Copy link
Copy Markdown
Contributor

BKNio commented Aug 21, 2013

@dbloisi thx for PR! unfortunately your changes causes an error, please take a look http://build.opencv.org/pullrequest

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Is it somehow related to the bg subtraction tutorial?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

No, it is not. I added it because my compiler mingw32-g++ 4.6.2 gave me an error.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

It has already been fixed in current master.

@ghost ghost assigned vpisarev Aug 26, 2013
@vpisarev
Copy link
Copy Markdown
Contributor

very good tutorial, thank you very much! Unfortunately, our buildbot still fails to merge it: http://pullrequest.opencv.org

@dbloisi
Copy link
Copy Markdown
Contributor Author

dbloisi commented Aug 29, 2013

I will try a new fork. Is it ok?

2013/8/26 Vadim Pisarevsky notifications@github.com

very good tutorial, thank you very much! Unfortunately, our buildbot still
fails to merge it: http://pullrequest.opencv.org


Reply to this email directly or view it on GitHubhttps://github.com//pull/1315#issuecomment-23264284
.

@SpecLad
Copy link
Copy Markdown

SpecLad commented Aug 29, 2013

You don't have to, but if you want, no one's to stop you.

@dbloisi
Copy link
Copy Markdown
Contributor Author

dbloisi commented Aug 29, 2013

Ok, I will not.
Can you please tell me what can I do for solving the merge errors?
Will they be solved manually by the user assigned to it?
Can I visualize an error log or something similar?

I am new to gitHub and I am sorry for the above questions

2013/8/29 òÏÍÁÎ äÏÎÞÅÎËÏ notifications@github.com

You don't have to, but if you want, no one's to stop you.

Reply to this email directly or view it on GitHubhttps://github.com//pull/1315#issuecomment-23478287
.

@SpecLad
Copy link
Copy Markdown

SpecLad commented Aug 29, 2013

You need to rebase your branch on top of the current master, which is done like this:

$ git checkout master
$ git pull
$ git checkout add_bs_tutorial
$ git rebase master

At this point Git will print a message, which explains where the conflicts are and how you can resolve them. If you get lost resolving conflicts, you can always abort (git rebase --abort) and try again.

Alternatively, you can delete your local branch, recreate it on top of the current master and reapply your changes manually.

Either way, after you're done, you'll need to force-push your branch to your fork (git push -f), and then the pull request will be automatically updated with the new commits.

tambo83 and others added 2 commits August 29, 2013 17:20
@alekcac
Copy link
Copy Markdown
Contributor

alekcac commented Aug 30, 2013

Some builders for automatic checking request are failed. Details here: pullrequest.opencv.org
Few problems are due to white spaces in documentation.
The way to fix them is described here in the bottom part of the page (Q3): http://code.opencv.org/projects/opencv/wiki/How_to_contribute

doc/conf.py Outdated
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

These lines are misaligned.

@Daniil-Osokin
Copy link
Copy Markdown

@vpisarev Any updates?

@vpisarev
Copy link
Copy Markdown
Contributor

👍

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.

8 participants