Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

COMP: itktiff: Suppress C99 inline only on MSVC from VS 2013 and below - For Release Branch #4958

Merged

Conversation

blowekamp
Copy link
Member

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: #4820

PR Checklist

  • No API changes were made (or the changes have been approved)
  • No major design changes were made (or the changes have been approved)
  • Added test (or behavior not changed)
  • Updated API documentation (or API not changed)
  • Added license to new files (if any)
  • Added Python wrapping to new files (if any) as described in ITK Software Guide Section 9.5
  • Added ITK examples for all new major features (if any)

Refer to the ITK Software Guide for
further development details if necessary.

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
@blowekamp blowekamp requested review from thewtex and dzenanz November 18, 2024 15:19
@github-actions github-actions bot added type:Compiler Compiler support or related warnings area:ThirdParty Issues affecting the ThirdParty module labels Nov 18, 2024
@dzenanz
Copy link
Member

dzenanz commented Nov 18, 2024

@dyollb yes, this fix should be backported.

@dzenanz
Copy link
Member

dzenanz commented Nov 18, 2024

Related discussion: InsightSoftwareConsortium/ITKModuleTemplate#167.

Copy link
Member

@thewtex thewtex left a comment

Choose a reason for hiding this comment

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

@blowekamp thanks! I will merge into release, master.

@thewtex thewtex merged commit 49413c3 into InsightSoftwareConsortium:release-5.4 Nov 21, 2024
16 of 17 checks passed
thewtex added a commit to thewtex/ITKRemoteModuleBuildTestPackageAction that referenced this pull request Nov 21, 2024
Incorporates libtiff symbol conflicts addressed in InsightSoftwareConsortium/ITK#4958
which has started to cause issues on Windows builds.
@cookpa
Copy link
Contributor

cookpa commented Dec 2, 2024

Hi @thewtex, is this PR going to be merged into master?

@dzenanz
Copy link
Member

dzenanz commented Dec 2, 2024

This PR/commit was not explicitly merged to master, but release-5.4 branch was merged into release, and then release was merged into master. But this change does not exist in master, because PR #4961 made big changes to this file, removing the code in question.

@blowekamp
Copy link
Member Author

Hi @thewtex, is this PR going to be merged into master?

In short, ITK master now has libtiff version 4.7.0. Please let us know if there are any issues.

@cookpa
Copy link
Contributor

cookpa commented Dec 2, 2024

Thanks @dzenanz @blowekamp, I'll try this out

@cookpa
Copy link
Contributor

cookpa commented Dec 2, 2024

Update: ITK now builds on Windows for me. Thanks for these fixes!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:ThirdParty Issues affecting the ThirdParty module type:Compiler Compiler support or related warnings
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants