libtiff upgrade to version 4.6.0#25096
Conversation
|
Looks like |
|
@opencv-alalek should we update CMake with the original project CMake as they diverge significantly. |
All 3rdparty libs have adoption to OpenCV build scripts. We can't use original "as is". |
|
Please ignore CMake warnings - they are expected (internal checks of build configurations). |
asmorkalov
left a comment
There was a problem hiding this comment.
👍 Looks good to me. I propose to drop versioninfo.rc, makefiles and other files that are not used in OpenCV build.
|
Thanks! I'll try to get rid of those unused files |
Please ignore. It is CI infrastructure problem. |
|
@opencv-alalek Any sugesstions? May I merge the pr? |
3rdparty/libtiff/libtiff.def
Outdated
| @@ -0,0 +1,195 @@ | |||
| EXPORTS TIFFAccessTagMethods | |||
There was a problem hiding this comment.
We don't use .def files.
libtiff is always compiled as static library in OpenCV so it is not exported.
3rdparty/libtiff/mkg3states.c
Outdated
| } | ||
|
|
||
| /* initialise the huffman code tables */ | ||
| int main(int argc, char *argv[]) |
There was a problem hiding this comment.
No utility files in OpenCV
|
removed more files yesterday, which seems to have a peculiar effect - Android CI is now green, but Ubuntu started to fail. I'm wondering whether it may be an infrastructure problem as well. |
|
Thank you for update! Ignore, these CI builders fails on other PRs too in the same way (not related to this PR). |
opencv-alalek
left a comment
There was a problem hiding this comment.
Well done! Thank you for contribution 👍
CMakeLists.txt
Outdated
| @@ -227,7 +227,7 @@ endif() | |||
| OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable non-free algorithms" OFF) | |||
|
|
|||
| # 3rd party libs | |||
| OCV_OPTION(OPENCV_FORCE_3RDPARTY_BUILD "Force using 3rdparty code from source" OFF) | |||
| OCV_OPTION(OPENCV_FORCE_3RDPARTY_BUILD "Force using 3rdparty code from source" ON) | |||
There was a problem hiding this comment.
Please revert this "validation" change before merge.
|
the temporary change to OPENCV_FORCE_3RDPARTY_BUILD is reverted. Ready to submit. |
|
@asmorkalov @opencv-alalek, just checking if there's anything else left to do in this PR, or it can be merged. |
* libtiff upgrade to version 4.6.0 * fix tiffvers.h cmake generation * temp: force build 3rd party deps from source * remove libport.h and spintf.c * cmake fixes * don't use tiff_dummy_namespace on windows * introduce numeric_types namespace alias * include cstdint * uint16_t is not a numeric_types type * fix uint16 and uint32 type defs * use standard c++ types * remove unused files * remove more unused files * revert build 3rd party code from source --------- Co-authored-by: Misha Klatis <misha.klatis@autodesk.com>
Upgrade libtiff dependency from version 4.2.0 to 4.6.0.
Patch to opencv_extra has the same branch name.