Skip to content

Remove blurb about patent in python SIFT example#19258

Merged
alalek merged 2 commits intoopencv:3.4from
notmatthancock:doc/update-sift-patent-blurb
Jan 5, 2021
Merged

Remove blurb about patent in python SIFT example#19258
alalek merged 2 commits intoopencv:3.4from
notmatthancock:doc/update-sift-patent-blurb

Conversation

@notmatthancock
Copy link
Copy Markdown
Contributor

@notmatthancock notmatthancock commented Jan 4, 2021

This is a minor fix to the python SIFT example in the documentation. It removes a couple of sentences related to the patent and the part that points to the contrib repo since those those no longer seem applicable.

relates #19258

Copy link
Copy Markdown
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.

Thank you for contribution!

relates #16736

paper is highly recommended. Remember one thing, this algorithm is patented. So this algorithm is
included in [the opencv contrib repo](https://github.com/opencv/opencv_contrib)
This is a summary of SIFT algorithm. For more details and understanding, reading the original
paper is highly recommended.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I would suggest to keep a note about the patent expiration. Something like these.

-Remember one thing, this algorithm is patented.
+The patent on SIFT expired in 2020

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.

Sure, I added the note to the "SIFT in OpenCV" section, instead. It seemed a little out of context in the step-by-step algorithm summary section.

@alalek
Copy link
Copy Markdown
Member

alalek commented Jan 5, 2021

This patch should go into 3.4 branch first.
We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

Please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@notmatthancock notmatthancock force-pushed the doc/update-sift-patent-blurb branch from d83a97b to 6a39053 Compare January 5, 2021 01:36
@notmatthancock notmatthancock changed the base branch from master to 3.4 January 5, 2021 01:37
Copy link
Copy Markdown
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 for contribution 👍

@alalek alalek merged commit 2d2d72a into opencv:3.4 Jan 5, 2021
@alalek alalek mentioned this pull request Jan 12, 2021
@alalek alalek mentioned this pull request Apr 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category: documentation Documentation fix or update

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants