Skip to content

Properly preserve chi_table license as mandated by BSD-3-Clause#24204

Merged
asmorkalov merged 5 commits intoopencv:4.xfrom
georgthegreat:mser-license
Sep 5, 2023
Merged

Properly preserve chi_table license as mandated by BSD-3-Clause#24204
asmorkalov merged 5 commits intoopencv:4.xfrom
georgthegreat:mser-license

Conversation

@georgthegreat
Copy link
Copy Markdown
Contributor

Amend reference to online hosted file with the full license quotation as mandated by the original license.

@georgthegreat georgthegreat changed the title Properly preserve chi_table license and mandated by BSD-3-Clause Properly preserve chi_table license as mandated by BSD-3-Clause Aug 28, 2023
@mshabunin
Copy link
Copy Markdown
Contributor

Maybe it would be better to follow SoftFloat scheme instead and install license file separately? @asmorkalov , @vpisarev , what do you think? Otherwise we would not comply with the second license clause regarding binary redistribution.

@georgthegreat
Copy link
Copy Markdown
Contributor Author

As I understand, only parts of the original code are actually used by opencv.
There is no need to copy chitab1 factors.

Plus I am not familiar with opencv vendoring routine so someone else is needed to do the trick.

@mshabunin
Copy link
Copy Markdown
Contributor

@georgthegreat , I've updated your PR: license is now in a separate file which will be installed to the <prefix>/share/licenses/opencv4/MSCR-chi_table_LICENSE.txt.

@georgthegreat
Copy link
Copy Markdown
Contributor Author

Actually, having this license inlined was intentional.
We use automatic licenses scanning (i. e. scancode-toolkit) and having the license text inlined is a better option.

@mshabunin
Copy link
Copy Markdown
Contributor

Perhaps it would be better to extract chi_table.h to a separate file then...

@asmorkalov asmorkalov added the category: documentation Documentation fix or update label Sep 5, 2023
@asmorkalov asmorkalov requested a review from mshabunin September 5, 2023 07:02
@asmorkalov asmorkalov added this to the 4.9.0 milestone Sep 5, 2023
@asmorkalov asmorkalov self-requested a review September 5, 2023 14:04
@asmorkalov asmorkalov self-assigned this Sep 5, 2023
Copy link
Copy Markdown
Contributor

@asmorkalov asmorkalov left a comment

Choose a reason for hiding this comment

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

👍

@asmorkalov asmorkalov merged commit 2c53e3f into opencv:4.x Sep 5, 2023
@georgthegreat georgthegreat deleted the mser-license branch September 5, 2023 14:32
@asmorkalov asmorkalov mentioned this pull request Sep 11, 2023
thewoz pushed a commit to thewoz/opencv that referenced this pull request Jan 4, 2024
Properly preserve chi_table license as mandated by BSD-3-Clause opencv#24204

Amend reference to online hosted file with the full license quotation as mandated by the original license.
thewoz pushed a commit to thewoz/opencv that referenced this pull request May 29, 2024
Properly preserve chi_table license as mandated by BSD-3-Clause opencv#24204

Amend reference to online hosted file with the full license quotation as mandated by the original license.
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.

4 participants