Skip to content

Commit

Permalink
fixed the code to make it work with the current minc tools
Browse files Browse the repository at this point in the history
  • Loading branch information
mcvaneede committed Mar 14, 2016
1 parent 6b0b4a9 commit e33cb3b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
10 changes: 6 additions & 4 deletions m4/mni_REQUIRE_MNILIBS.m4
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ AC_DEFUN([mni_REQUIRE_MINC],
mni_REQUIRE_LIB(hdf5,[#include <hdf5.h>],[int f = H5Fopen("",0,H5P_DEFAULT);])
mni_REQUIRE_LIB(minc2,[#include <minc.h>],[int i = miicv_create();])
AC_DEFINE([MINC2], 1, [Define if should build with MINC 2.0])
AC_DEFINE([HAVE_MINC2], 1, [Define that we should build with MINC 2.0 agian])
else
mni_REQUIRE_LIB(minc,[#include <minc.h>],[int i = miicv_create();])
fi
Expand All @@ -22,17 +23,17 @@ AC_DEFUN([mni_REQUIRE_VOLUMEIO],
[
AC_REQUIRE([mni_REQUIRE_MINC])
if test "$with_minc2" = "yes"; then
mni_REQUIRE_LIB(volume_io2,
mni_REQUIRE_LIB(minc2,
[#include <volume_io.h>],
[VIO_Volume vol;
VIO_Real voxel = 0;
VIO_Real x = convert_voxel_to_value(vol,voxel);])
else
mni_REQUIRE_LIB(volume_io,
[#include <volume_io.h>],
[Volume vol;
Real voxel = 0;
Real x = convert_voxel_to_value(vol,voxel);])
[VIO_Volume vol;
VIO_Real voxel = 0;
VIO_Real x = convert_voxel_to_value(vol,voxel);])
fi
])

Expand All @@ -57,6 +58,7 @@ AC_DEFUN([mni_REQUIRE_EBTKS],
AC_DEFUN([mni_REQUIRE_OOBICPL],
[
AC_REQUIRE([mni_REQUIRE_BICPL])
AC_DEFINE([HAVE_MINC1], 1, [Define that we need MINC 1.0 for NC_UNSPECIFIED])
# the regular expression C library
smr_REQUIRED_LIB(pcre, pcre_compile, pcre.h)
Expand Down
3 changes: 3 additions & 0 deletions src/create_initial_deformation_grid.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#define HAVE_MINC1 1
#define HAVE_MINC2 1

#include <minc2.h>
#include <stdio.h>
#include <stdlib.h>
Expand Down

0 comments on commit e33cb3b

Please sign in to comment.