Skip to content

Fixes to #66#1216

Closed
muschellij2 wants to merge 83 commits intoInsightSoftwareConsortium:masterfrom
muschellij2:master
Closed

Fixes to #66#1216
muschellij2 wants to merge 83 commits intoInsightSoftwareConsortium:masterfrom
muschellij2:master

Conversation

@muschellij2
Copy link
Copy Markdown
Contributor

Fixes for #66 with respect to #66 (comment)

  • COMP: Fixes the HDF5 build on MinGW

The HDF532defs.h were changed, as the number of arguments was wrong in Mingw32. This was referenced on #562 (comment) in #562 but wasn't incorporated. Left it as it didn't seem to be an issue anyone else had until yesterday.

stnava and others added 30 commits September 4, 2018 10:26
Change-Id: I63ccba3a5ba610fffc6453cb6e125fd47b68521b
Change-Id: I79c6cbbcbb0595635612dd6bdca3de51c509dc05
Change-Id: I00b5e22e526421d3d4aeedf71b248adfe0cfca3d
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Change-Id: I63ccba3a5ba610fffc6453cb6e125fd47b68521b
Change-Id: I00b5e22e526421d3d4aeedf71b248adfe0cfca3d
...

Change-Id: Ibd069b33f0bf4a11c34e1fcdc20e6dfbb2dea730
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'themaster/master'
Change-Id: I415e606b91c477f973abb21c1b81c0d1c8699bbb
Merge remote-tracking branch 'themaster/master'
Change-Id: I03270c61ffcaaff48aad79f571624193f5aaaf53
...

Change-Id: Ia7f07eb19a5cd5c4853f4fc5d060490cff8abd03
http://review.source.kitware.com/#/c/23783/ is the correct way

Change-Id: Ifc2e13c323d128ddc86dd55449f9b782e90b188e
Change-Id: I1cdb904a6beb96ff836bd65e15d969ba892a6a9b
...

Change-Id: I7bb742f3493cb055b93cbfc7aa0751fe816b64ca
great fixes for annoying hdf5 warnings

Change-Id: I258109d16c17db31e5abb507355c0d5f2d603d28
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'themaster/master'
    vnl_matrix_fixed+double.1.1-.cxx error
@thewtex
Copy link
Copy Markdown
Member

thewtex commented Aug 30, 2019

CI build error with Visual Studio:

D:\a\1\s\Modules\ThirdParty\HDF5\src\itkhdf5\src\H5Defl.c(291): error C2059: syntax error: ')'

@hjmjohnson
Copy link
Copy Markdown
Member

git remote add muschellij2 git@github.com:muschellij2/ITK.git
git fetch muschellij2 
git checkout muschellij2/master -b XXX
git merge-base XXX origin/master
git reset 122173dd6fa1e67c1a45c89d4891d726a1a500ae

Pushed the result to #1217 to provide a much much smaller diff to review

@hjmjohnson hjmjohnson closed this Aug 30, 2019
@thewtex
Copy link
Copy Markdown
Member

thewtex commented Aug 30, 2019

Thanks @hjmjohnson

@muschellij2 I believe I submitted a variant of this to upstream HDF5, but there are still build issues with Visual Studio that we need to resolve.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants