Mercurial > mxe-octave
view src/gdcm-4-iconv.patch @ 7199:ea296e38047a default tip @
maint: Merge release to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Thu, 16 May 2024 11:42:51 +0200 |
parents | f5d9317aea34 |
children |
line wrap: on
line source
diff -ur gdcm-3.0.23.orig/Source/MediaStorageAndFileFormat/CMakeLists.txt gdcm-3.0.23/Source/MediaStorageAndFileFormat/CMakeLists.txt --- gdcm-3.0.23.orig/Source/MediaStorageAndFileFormat/CMakeLists.txt 2024-01-11 07:41:56.800302334 -0500 +++ gdcm-3.0.23/Source/MediaStorageAndFileFormat/CMakeLists.txt 2024-01-11 07:49:28.533961424 -0500 @@ -228,7 +228,7 @@ if(GDCM_USE_SYSTEM_JSON) target_link_libraries(gdcmMSFF LINK_PRIVATE ${JSON_LIBRARIES}) endif() -if(UNIX) +if(UNIX OR MINGW) find_package(Iconv) target_link_libraries(gdcmMSFF LINK_PRIVATE ${Iconv_LIBRARIES}) endif() diff -ur gdcm-3.0.23.orig/Utilities/gdcmext/mec_mr3_io.c gdcm-3.0.23/Utilities/gdcmext/mec_mr3_io.c --- gdcm-3.0.23.orig/Utilities/gdcmext/mec_mr3_io.c 2024-01-11 07:52:37.007305489 -0500 +++ gdcm-3.0.23/Utilities/gdcmext/mec_mr3_io.c 2024-01-11 07:54:30.411529519 -0500 @@ -138,7 +138,7 @@ } static void *aligned_alloc_impl(size_t alignment, size_t size) { -#ifdef _MSC_VER +#ifdef _WIN32 return _aligned_malloc(size, alignment); #else // return aligned_alloc(alignment, size); @@ -843,7 +843,7 @@ good = good && read_group(self, group, nitems, &info, &data); } // release memory: -#ifdef _MSC_VER +#ifdef _WIN32 _aligned_free(data.buffer); #else free(data.buffer);