comp, style

AlizaMedicalImaging · Jul 5, 2022 · 47e3c64 · 47e3c64
1 parent 07289bd
commit 47e3c64
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 32 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -67,7 +67,7 @@ project(ALIZAMS)
 #
 #
 if(APPLE)
- set(ALIZAMS_OSX_BUNDLE_VERSION "1.7.5")
+ set(ALIZAMS_OSX_BUNDLE_VERSION "1.8.0")
 endif()
 
 # Qt major version, required.
@@ -132,10 +132,6 @@ option(MDCM_USE_SYSTEM_OPENJPEG "Use system OpenJPEG" OFF)
 
 option(MDCM_USE_SYSTEM_CHARLS "Use system CharLS" OFF)
 
-# Set ON for production build.
-option(MDCM_SUPPORT_BROKEN_IMPLEMENTATION "Handle broken DICOM" ON)
-mark_as_advanced(MDCM_SUPPORT_BROKEN_IMPLEMENTATION)
-
 # Currently not used.
 if(FALSE)
  # OpenSSL is currently unused in AlizaMS.
@@ -243,7 +239,6 @@ if(UNIX AND NOT APPLE)
  endif()
 endif()
 
-# TODO
 if(ALIZA_DISABLE_SIMDMATH)
  add_definitions(-DDISABLE_SIMDMATH)
 else()

diff --git a/alizams_version.h b/alizams_version.h
@@ -1,4 +1,4 @@
 #ifndef ALIZAMS_VERSION
-#define ALIZAMS_VERSION "1.7.5"
+#define ALIZAMS_VERSION "1.8.0"
 #endif
 
diff --git a/debian-10/changelog b/debian-10/changelog
@@ -1,4 +1,4 @@
-alizams (1.7.5-1) stable; urgency=low
+alizams (1.8.0-1) stable; urgency=low
 
  * Initial upload to Debian. Closes: #999999.
 

diff --git a/debian-10/rules b/debian-10/rules
@@ -8,12 +8,9 @@ export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
  dh $@ --buildsystem=cmake
 
 # Option -DALIZA_CXX_STANDARD:STRING=14 sets CMAKE_CXX_STANDARD
-# to 14 only to get rid of ITK-4.12 dev-package VNL warnings
-# (Debian 10, cmake-3.13.4), should be not required generally,
-# C++ >= 11 is OK for Aliza MS.
+# to 14 only to get rid of ITK-4.12 dev-package VNL warnings.
 #
 # ITK version 5 is OK too.
-#
 CMAKEFLAGS = -DALIZA_QT_VERSION:STRING=5 \
  -DCMAKE_SKIP_RPATH:BOOL=ON \
  -DALIZA_CXX_STANDARD:STRING=14 \

diff --git a/debian-12-qt5/alizams.lintian-overrides b/debian-12-qt5/alizams.lintian-overrides
diff --git a/debian-12-qt5/changelog b/debian-12-qt5/changelog
@@ -1,4 +1,4 @@
-alizams (1.7.5-1) stable; urgency=low
+alizams (1.8.0-1) stable; urgency=low
 
  * Initial upload to Debian. Closes: #999999.
 

diff --git a/debian-12-qt5/rules b/debian-12-qt5/rules
@@ -7,16 +7,9 @@ export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
 %:
  dh $@ --buildsystem=cmake
 
-# Option -DALIZA_CXX_STANDARD:STRING=14 sets CMAKE_CXX_STANDARD
-# to 14 only to get rid of ITK-4.12 dev-package VNL warnings
-# (Debian 10, cmake-3.13.4), should be not required generally,
-# C++ >= 11 is OK for Aliza MS.
-#
 # ITK version 5 is OK too.
-#
 CMAKEFLAGS = -DALIZA_QT_VERSION:STRING=5 \
  -DCMAKE_SKIP_RPATH:BOOL=ON \
- -DALIZA_CXX_STANDARD:STRING=14 \
  -DALIZA_USE_SYSTEM_BULLET:BOOL=ON \
  -DALIZA_USE_SYSTEM_LCMS2:BOOL=ON \
  -DMDCM_USE_SYSTEM_UUID:BOOL=ON \

diff --git a/debian-12-qt6/alizams.lintian-overrides b/debian-12-qt6/alizams.lintian-overrides
diff --git a/debian-12-qt6/changelog b/debian-12-qt6/changelog
@@ -1,4 +1,4 @@
-alizams (1.7.5-1) stable; urgency=low
+alizams (1.8.0-1) stable; urgency=low
 
  * Initial upload to Debian. Closes: #999999.
 

diff --git a/debian-12-qt6/control b/debian-12-qt6/control
@@ -11,6 +11,7 @@ Build-Depends: cmake,
  libqt6opengl6-dev,
  libqt6svg6-dev,
  libqt6core5compat6-dev,
+ libxkbcommon-dev,
  libbullet-dev,
  uuid-dev,
  libz-dev,

diff --git a/debian-12-qt6/rules b/debian-12-qt6/rules
@@ -8,8 +8,6 @@ export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
  dh $@ --buildsystem=cmake
 
 # ITK version 5 is OK too
-# C++ standard can be set with e.g. -DALIZA_CXX_STANDARD:STRING=17
-#
 CMAKEFLAGS = -DALIZA_QT_VERSION:STRING=6 \
  -DALIZA_CXX_STANDARD:STRING=17 \
  -DCMAKE_SKIP_RPATH:BOOL=ON \

diff --git a/fedora-34/alizams.spec b/fedora-34/alizams.spec
@@ -1,5 +1,5 @@
 Name: alizams
-Version: 1.7.5
+Version: 1.8.0
 Release: 1%{?dist}
 Summary: Aliza MS DICOM Viewer
 License: GPLv3

diff --git a/mdcm/Source/Common/mdcmConfigure.h.in b/mdcm/Source/Common/mdcmConfigure.h.in
@@ -52,6 +52,8 @@
 #define MDCM_VERSION "@MDCM_VERSION@"
 #define MDCM_API_VERSION "@MDCM_API_VERSION@"
 
+#define MDCM_SUPPORT_BROKEN_IMPLEMENTATION
+
 #cmakedefine MDCM_USE_SYSTEM_ZLIB
 #cmakedefine MDCM_USE_SYSTEM_UUID
 #cmakedefine MDCM_USE_SYSTEM_OPENSSL
@@ -79,14 +81,7 @@
 #cmakedefine MDCM_HAVE__SNPRINTF
 #cmakedefine MDCM_HAVE_GETTIMEOFDAY
 #cmakedefine MDCM_HAVE_ATOLL
-#cmakedefine MDCM_SUPPORT_BROKEN_IMPLEMENTATION
 #cmakedefine MDCM_USE_COREFOUNDATION_LIBRARY
 
-// MM: I have a feeling that if MDCM_HAVE_WCHAR_IFSTREAM, then UNICODE filename
-// are expected to be specified as UTF-16, but if no API exist for UTF-16
-// at std::ifstream level, then const char* of std::ifstream might accept
-// UTF-8
-#cmakedefine MDCM_HAVE_WCHAR_IFSTREAM
-
 #endif
 
diff --git a/package/archive/usr/share/man/man1/alizams.1 b/package/archive/usr/share/man/man1/alizams.1
@@ -1,4 +1,4 @@
-.TH ALIZAMS "1" "Sep 2021" "AlizaMS version: 1.7" "User Commands"
+.TH ALIZAMS "1" "Jul 2022" "AlizaMS version: 1.8" "User Commands"
 .SH NAME
 alizams \- Medical Imaging
 .SH SYNOPSIS