Skip to content

3rdparty: libtiff: fix for small version expression problems for built-in tiff460#25257

Merged
asmorkalov merged 5 commits intoopencv:4.xfrom
Kumataro:fix25256
Mar 25, 2024
Merged

3rdparty: libtiff: fix for small version expression problems for built-in tiff460#25257
asmorkalov merged 5 commits intoopencv:4.xfrom
Kumataro:fix25256

Conversation

@Kumataro
Copy link
Copy Markdown
Contributor

Close #25256

  1. fix to show build-int libtiff version
  2. fix to set value of LIBTIFF_VERSION define.

(RELEASE-DATE file coms from original libtiff 4.6.0)

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
  • The PR is proposed to the proper branch
  • There is a reference to the original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

@Kumataro
Copy link
Copy Markdown
Contributor Author

This patch is for built-in libtiff.
So 3rd party deps from source is need to enable for testing.
If test is passed, I will revert it.

@Kumataro Kumataro changed the title 3rdparty: libtiff: fix for minor version expression problems for built-in tiff460 3rdparty: libtiff: fix for small version expression problems for built-in tiff460 Mar 24, 2024
@opencv-alalek opencv-alalek added this to the 4.10.0 milestone Mar 24, 2024
@opencv-alalek
Copy link
Copy Markdown
Contributor

relates #25096

@Kumataro
Copy link
Copy Markdown
Contributor Author

Tests are passed, and they shows built-in libtiff version as 4.6.0 correctly.
If it is OK, I will revert OPENCV_FORCE_3RDPARTY_BUILD default.

Copy link
Copy Markdown
Contributor

@opencv-alalek opencv-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 👍

Please revert test commit before merge

@Kumataro
Copy link
Copy Markdown
Contributor Author

Thank you for your reply, I reverted it.
And I notice broken indent around this patch. I fixed it but It has no side-effects.

@asmorkalov asmorkalov merged commit aae77b6 into opencv:4.x Mar 25, 2024
@asmorkalov asmorkalov mentioned this pull request Apr 1, 2024
klatism pushed a commit to klatism/opencv that referenced this pull request May 17, 2024
3rdparty: libtiff: fix for small version expression problems for built-in tiff460 opencv#25257

Close opencv#25256

1. fix to show build-int libtiff version
2. fix to set value of LIBTIFF_VERSION define.

(RELEASE-DATE file coms from original libtiff 4.6.0)

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
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.

3rdparty: Small version expression problems for built-in tiff460

3 participants