[clitk-commits-list] Clitk software branch master updated. v1.2.0-586-g9e137f7
root
root at tux.creatis.insa-lyon.fr
Mon Dec 5 08:58:47 CET 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Clitk software".
The branch, master has been updated
via 9e137f701e07fdd5aef6982e6f1ce3153977c3f6 (commit)
via d5d7649dc98a8b698bca05a170253513834f04bf (commit)
via 14678a46d28327b25957a1efc59f0c29d2a83564 (commit)
via 39562adceed3b608834959f2ed079b945187bb22 (commit)
via 9ccee79cde666f3b8964f64cfccb81ca4c056deb (commit)
via cc3f1a5d0b32bebe5207ee30fe355fc2ce386f2a (commit)
from e2b37672d5ee8eafc7b1ac075f4e70596349f0c3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff;h=9e137f701e07fdd5aef6982e6f1ce3153977c3f6
commit 9e137f701e07fdd5aef6982e6f1ce3153977c3f6
Author: Simon Rit <simon.rit at creatis.insa-lyon.fr>
Date: Mon Dec 5 08:58:31 2011 +0100
Fixed MSVC warning
diff --git a/segmentation/clitkRelativePositionList.txx b/segmentation/clitkRelativePositionList.txx
index 7a53a99..254fa4c 100644
--- a/segmentation/clitkRelativePositionList.txx
+++ b/segmentation/clitkRelativePositionList.txx
@@ -150,7 +150,7 @@ GenerateOutputInformation() {
if (mArgsInfoList[i].orientation_given) text += std::string(mArgsInfoList[i].orientation_arg[0])+" ";
else text = text+"("+toString(mArgsInfoList[i].angle1_arg)+" "+
toString(mArgsInfoList[i].angle2_arg)+" "+
- (mArgsInfoList[i].inverse_flag==true?"true":"false")+") ";
+ (mArgsInfoList[i].inverse_flag?"true":"false")+") ";
text = text+mArgsInfoList[i].object_arg+" "+toString(mArgsInfoList[i].threshold_arg);
if (mArgsInfoList[i].sliceBySlice_flag) {
text += " slice by slice";
http://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff;h=d5d7649dc98a8b698bca05a170253513834f04bf
commit d5d7649dc98a8b698bca05a170253513834f04bf
Author: Simon Rit <simon.rit at creatis.insa-lyon.fr>
Date: Mon Dec 5 08:57:38 2011 +0100
Define mkstemp for MSVC. Not sure if it also works for other compilers
on Windows
diff --git a/common/clitkPortability.h b/common/clitkPortability.h
index 1ab74f9..7fae01e 100644
--- a/common/clitkPortability.h
+++ b/common/clitkPortability.h
@@ -36,4 +36,9 @@ int IsNormal(const T val) {
#endif
}
+#if defined(_MSC_VER)
+# include <io.h>
+# define mkstemp(x) _mktemp_s(x, sizeof(x))
+#endif
+
#endif /* end #define CLITKPORTABILITY_H */
http://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff;h=14678a46d28327b25957a1efc59f0c29d2a83564
commit 14678a46d28327b25957a1efc59f0c29d2a83564
Author: Simon Rit <simon.rit at creatis.insa-lyon.fr>
Date: Mon Dec 5 08:56:46 2011 +0100
Gate text file I/O is not cross-platform due to regex, compile only on unix
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index ec826a2..380ce41 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -24,8 +24,6 @@ SET(clitkCommon_SRC
clitkXdrImageIOFactory.cxx
clitkHndImageIO.cxx
clitkHndImageIOFactory.cxx
- clitkGateAsciiImageIO.cxx
- clitkGateAsciiImageIOFactory.cxx
clitkDicomRTDoseIO.cxx
clitkDicomRTDoseIOFactory.cxx
clitkOrientation.cxx
@@ -38,6 +36,14 @@ SET(clitkCommon_SRC
vvImageWriter.cxx
)
+IF(UNIX)
+ SET(clitkCommon_SRC
+ ${clitkCommon_SRC}
+ clitkGateAsciiImageIO.cxx
+ clitkGateAsciiImageIOFactory.cxx
+ )
+ENDIF(UNIX)
+
### Declare clitkCommon library
ADD_LIBRARY(clitkCommon STATIC ${clitkCommon_SRC})
diff --git a/common/clitkIO.cxx b/common/clitkIO.cxx
index 1acd352..2126a5a 100644
--- a/common/clitkIO.cxx
+++ b/common/clitkIO.cxx
@@ -38,7 +38,9 @@
// Register factories
void clitk::RegisterClitkFactories()
{
+#ifdef unix
clitk::GateAsciiImageIOFactory::RegisterOneFactory();
+#endif
clitk::DicomRTDoseIOFactory::RegisterOneFactory();
#if ITK_VERSION_MAJOR <= 3
itk::ImageIOFactory::RegisterBuiltInFactories();
http://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff;h=39562adceed3b608834959f2ed079b945187bb22
commit 39562adceed3b608834959f2ed079b945187bb22
Author: Simon Rit <simon.rit at creatis.insa-lyon.fr>
Date: Sun Dec 4 18:18:08 2011 +0100
Add quotes in case variables are not defined
diff --git a/cmake/gengetopt/CMakeLists.txt b/cmake/gengetopt/CMakeLists.txt
index 2f586f9..7829924 100644
--- a/cmake/gengetopt/CMakeLists.txt
+++ b/cmake/gengetopt/CMakeLists.txt
@@ -6,10 +6,10 @@ ADD_DEFINITIONS(-DHAVE_SSTREAM)
ADD_DEFINITIONS(-DHAVE_NAMESPACES)
# Remove compiler warnings
-STRING(REPLACE "/W3" "/w" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-STRING(REPLACE "/W3" "/w" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
-STRING(REPLACE "-Wall" "-w" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-STRING(REPLACE "-Wall" "-w" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
+STRING(REPLACE "/W3" "/w" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+STRING(REPLACE "/W3" "/w" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+STRING(REPLACE "-Wall" "-w" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+STRING(REPLACE "-Wall" "-w" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
# MSVC specific issues
IF(MSVC)
http://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff;h=9ccee79cde666f3b8964f64cfccb81ca4c056deb
commit 9ccee79cde666f3b8964f64cfccb81ca4c056deb
Author: Simon Rit <simon.rit at creatis.insa-lyon.fr>
Date: Sun Dec 4 18:06:31 2011 +0100
Use the gnugetopt.h header part of gengetopt instead of cygwin's
diff --git a/cmake/gengetopt/gnugetopt.h b/cmake/gengetopt/getopt.h
similarity index 100%
rename from cmake/gengetopt/gnugetopt.h
rename to cmake/gengetopt/getopt.h
http://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff;h=cc3f1a5d0b32bebe5207ee30fe355fc2ce386f2a
commit cc3f1a5d0b32bebe5207ee30fe355fc2ce386f2a
Author: Simon Rit <simon.rit at creatis.insa-lyon.fr>
Date: Sun Dec 4 17:35:50 2011 +0100
Subdirectory filters has been removed
diff --git a/make_new_tool.sh b/make_new_tool.sh
index 950df79..f2b5484 100755
--- a/make_new_tool.sh
+++ b/make_new_tool.sh
@@ -6,7 +6,7 @@ then
exit 1
fi
-find filters tools -name "clitkFooImage*" |
+find tools -name "clitkFooImage*" |
while read i
do
cp $i ${i/FooImage/$1}
-----------------------------------------------------------------------
Summary of changes:
cmake/gengetopt/CMakeLists.txt | 8 ++++----
cmake/gengetopt/{gnugetopt.h => getopt.h} | 0
common/CMakeLists.txt | 10 ++++++++--
common/clitkIO.cxx | 2 ++
common/clitkPortability.h | 5 +++++
make_new_tool.sh | 2 +-
segmentation/clitkRelativePositionList.txx | 2 +-
7 files changed, 21 insertions(+), 8 deletions(-)
rename cmake/gengetopt/{gnugetopt.h => getopt.h} (100%)
hooks/post-receive
--
Clitk software
More information about the Clitk-commits-list
mailing list