[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. 50e47289102bf564771302e7cfd24422e37986ab

[Mathieu M. <ma...@us...>]

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 "Grassroots DICOM".

The branch, release has been updated
       via  50e47289102bf564771302e7cfd24422e37986ab (commit)
       via  2724016fa764a66c1823e5bc59857d70b8b694e1 (commit)
      from  4c60e6df1a774e41ea35a957e20277aac4bbeefb (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 -----------------------------------------------------------------
https://sourceforge.net/p/gdcm/gdcm/ci/50e47289102bf564771302e7cfd24422e37986ab/

commit 50e47289102bf564771302e7cfd24422e37986ab
Author: Mathieu Malaterre <mat...@gm...>
Date:   Fri Sep 23 15:11:36 2022 +0200

    Fix compilation on windows

diff --git a/Applications/Cxx/CMakeLists.txt b/Applications/Cxx/CMakeLists.txt
index 6b3e0bb99..e18ec85ef 100644
--- a/Applications/Cxx/CMakeLists.txt
+++ b/Applications/Cxx/CMakeLists.txt
@@ -163,6 +163,12 @@ if(GDCM_USE_SYSTEM_PAPYRUS3)
     )
 endif()
 
+if(NOT GDCM_USE_SYSTEM_ZLIB)
+  include_directories(
+    "${GDCM_BINARY_DIR}/Utilities/gdcmzlib"
+    )
+endif()
+
 foreach(exename ${GDCM_EXECUTABLE_NAME})
   if(${exename} STREQUAL "gdcminfo")
     add_executable(${exename} ${exename}.cxx puff.c)

https://sourceforge.net/p/gdcm/gdcm/ci/2724016fa764a66c1823e5bc59857d70b8b694e1/

commit 2724016fa764a66c1823e5bc59857d70b8b694e1
Author: Mathieu Malaterre <mat...@gm...>
Date:   Fri Sep 23 15:11:12 2022 +0200

    Hopefully fix recursive + gdcmanon

diff --git a/Applications/Cxx/gdcmanon.cxx b/Applications/Cxx/gdcmanon.cxx
index f2b32e033..cfa29ca28 100644
--- a/Applications/Cxx/gdcmanon.cxx
+++ b/Applications/Cxx/gdcmanon.cxx
@@ -752,6 +752,10 @@ int main(int argc, char *argv[])
       std::cerr << "Input directory should be different from output directory" << std::endl;
       return 1;
       }
+#ifdef _MSC_VER
+    if (outfilename.back() == '\\')
+      outfilename = outfilename.substr(0, outfilename.size() - 1);
+#endif
     if( outfilename.back() != '/' ) outfilename += '/';
     nfiles = dir.Load(filename, (recursive > 0 ? true : false));
     filenames = dir.GetFilenames();
diff --git a/Source/Common/gdcmDirectory.cxx b/Source/Common/gdcmDirectory.cxx
index 684b99605..171dfbecc 100644
--- a/Source/Common/gdcmDirectory.cxx
+++ b/Source/Common/gdcmDirectory.cxx
@@ -65,8 +65,10 @@ unsigned int Directory::Explore(FilenameType const &name, bool recursive)
   std::wstring dirName = System::ConvertToUNC(name.c_str());
   Directories.push_back(ToUtf8(dirName));
   WIN32_FIND_DATAW fileData;
-  if ('\\' != dirName[dirName.size()-1]) dirName.push_back('\\');
-  assert( '\\' == dirName[dirName.size()-1] );
+  if ('\\' == dirName[dirName.size() - 1])
+    dirName = dirName.substr(0, dirName.size() - 1);
+  if ('/' != dirName[dirName.size() - 1]) dirName.push_back('/');
+  assert( '/' == dirName[dirName.size()-1] );
   const std::wstring firstfile = dirName+L"*";
   HANDLE hFile = FindFirstFileW(firstfile.c_str(), &fileData);
 

-----------------------------------------------------------------------

Summary of changes:
 Applications/Cxx/CMakeLists.txt | 6 ++++++
 Applications/Cxx/gdcmanon.cxx   | 4 ++++
 Source/Common/gdcmDirectory.cxx | 6 ++++--
 3 files changed, 14 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Grassroots DICOM