ENH: itktiff: Update source tree layout to match upstream #4957
Conversation
Remove files not needed since the update to libtiff 4.0.3 by commit 54c790a (ENH: updating to libtif 4.0.3, 2012-11-09, v4.3rc01~24^2).
Import version 4.0.3 to match what was last manually imported by commit 54c790a (ENH: updating to libtif 4.0.3, 2012-11-09, v4.3rc01~24^2).
Code extracted from:
https://gitlab.com/libtiff/libtiff.git
at commit 21a904d74c72b86d7daf9e4d4e6301b6322894bc (v4.0.3).
# By Tiff Upstream * upstream-tiff: tiff 2012-09-22 (21a904d7)
Manufacture a merge commit with the second parent pointing at the commit before the old import was removed so that `git blame` can follow the edited lines back through their original history.
github-actions
bot
added
the
type:Enhancement
|
This needs to be merged to |
|
@thewtex Should we move forward even though the ITK.Pixi-Cxx (windows-2022) is failing on all PRs? |
|
I see the following build error: itktiff-6.0.lib(tif_color.c.obj) : error LNK2005: __ucrt_int_to_float already defined in itktiff-6.0.lib(tif_aux.c.obj) |
|
@blowekamp I'm not able to reproduce that error on Windows, and CI is happy too. Can you reproduce it in a fresh build tree? |
@thewtex Are the only configuration setting on the Pixi build here: https://github.com/InsightSoftwareConsortium/ITK/blob/master/pyproject.toml#L26-L34 I don't see the job published to CDash, but the configuration is here: I don't see anything particularly different about this build that might be causing this error. |
It's not failing on all PR's. It has mostly been successfully passing: https://github.com/InsightSoftwareConsortium/ITK/actions/workflows/pixi.yml?query=branch%3Amaster It passed on this recent PR: https://github.com/InsightSoftwareConsortium/ITK/actions/runs/11860511746/job/33055924587?pr=4956 |
These are the ITK configuration settings. Also worth noting is that it is using the conda-forge |
It's failing in CI, with fresh builds. |
|
A few Git bisects may helpful to find the underlying issue. |
|
The |
Extend the condition from commit 08bf6be (COMP: Conditionalize insane "#define inline" in libtiff, 2013-10-07, v4.5rc01~139^2). Newer MSVC versions need it to avoid duplicating `__ucrt_int_to_float`. Issue: InsightSoftwareConsortium#4820
|
Nice Job tracking that down! |
blowekamp
merged commit 9dc3985
into
InsightSoftwareConsortium:master
Re-import tiff 4.0.3 from upstream using our modern history structure.
Retain local edits made by ITK since 4.0.3 was imported previously.
Issue: #4953