[Gdcm-hackers] gdcm-git:Grassroots DICOM branch master updated. a14f2570cb02bc613c4f364b4fc2f1099b853b34

[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, master has been updated
       via  a14f2570cb02bc613c4f364b4fc2f1099b853b34 (commit)
      from  34b73e3212189343d276fbc152ac6eb6b237ff47 (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/a14f2570cb02bc613c4f364b4fc2f1099b853b34/

commit a14f2570cb02bc613c4f364b4fc2f1099b853b34
Author: Mathieu Malaterre <mat...@gm...>
Date:   Wed Feb 1 10:44:38 2017 +0100

    Remove more openjpeg 1.5.x legacy stuff

diff --git a/CMake/FindOpenJPEG.cmake b/CMake/FindOpenJPEG.cmake
index 507ff9b..bdd5773 100644
--- a/CMake/FindOpenJPEG.cmake
+++ b/CMake/FindOpenJPEG.cmake
@@ -20,46 +20,16 @@
 
 # Try with pkg-config first
 find_package(PkgConfig)
-pkg_check_modules(OPENJPEG libopenjpeg1)
-if(OPENJPEG_FOUND)
-    set(OPENJPEG_INCLUDE_DIR ${OPENJPEG_INCLUDE_DIRS})
-    set(OPENJPEG_LIBRARIES ${OPENJPEG_LDFLAGS})
-else()
-# Try to locate a cmake config file
-find_package(OpenJPEG QUIET NO_MODULE)
-mark_as_advanced(OpenJPEG_DIR)
+pkg_check_modules(OPENJPEG libopenjp2)
 
-if( NOT OpenJPEG_DIR )
-set(OPENJPEG_VERSION_MAJOR 2) # FIXME ?
-set(OPENJPEG_VERSION_MINOR 0) # FIXME ?
-set(OPENJPEG_VERSION_PATCH 0) # FIXME ?
-set(OPENJPEG_VERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_PATCH}")
-find_path(OPENJPEG_INCLUDE_DIR
-  NAMES openjpeg.h #openjpeg-1.0/openjpeg.h
-  PATHS /usr/local/include
-  /usr/local/include/openjpeg-1.0
-  /usr/include
-  /usr/include/openjpeg-1.0
-  )
-
-find_library(OPENJPEG_LIBRARY
-  NAMES openjpeg
-  )
-endif()
-endif()
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(OpenJPEG REQUIRED_VARS
-  OPENJPEG_LIBRARY
-  OPENJPEG_INCLUDE_DIR
+  OPENJPEG_LIBRARIES
+  OPENJPEG_INCLUDE_DIRS
   VERSION_VAR OPENJPEG_VERSION
 )
 
-if(OPENJPEG_FOUND)
-  set(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY})
-  set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_DIR})
-endif()
-
 mark_as_advanced(
-  OPENJPEG_LIBRARY
-  OPENJPEG_INCLUDE_DIR
+  OPENJPEG_LIBRARIES
+  OPENJPEG_INCLUDE_DIRS
   )
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee74980..e84b062 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -364,7 +364,7 @@ else()
 endif()
 
 if(GDCM_USE_SYSTEM_OPENJPEG)
-  find_package(OpenJPEG 2.0 REQUIRED)
+  find_package(OpenJPEG 2.0.0 REQUIRED)
   set(GDCM_OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARIES})
 else()
   set(GDCM_OPENJPEG_LIBRARIES gdcmopenjp2)
diff --git a/Source/MediaStorageAndFileFormat/CMakeLists.txt b/Source/MediaStorageAndFileFormat/CMakeLists.txt
index 55bd018..00b1875 100644
--- a/Source/MediaStorageAndFileFormat/CMakeLists.txt
+++ b/Source/MediaStorageAndFileFormat/CMakeLists.txt
@@ -92,16 +92,8 @@ set(MSFF_SRCS
   gdcmSurfaceReader.cxx
   gdcmSurfaceHelper.cxx
   gdcmSegmentHelper.cxx
+  gdcmJPEG2000Codec.cxx
   )
-if(OPENJPEG_VERSION VERSION_LESS 2.0)
-  list(APPEND MSFF_SRCS
-    gdcmJPEG2000Codec.cxx
-  )
-else ()
-  list(APPEND MSFF_SRCS
-    gdcmOpenJPEG2Codec.cxx
-  )
-endif()
 
   list(APPEND MSFF_SRCS
     ${GDCM_SOURCE_DIR}/Utilities/gdcmrle/rle.cxx

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

Summary of changes:
 CMake/FindOpenJPEG.cmake                        |   40 +++--------------------
 CMakeLists.txt                                  |    2 +-
 Source/MediaStorageAndFileFormat/CMakeLists.txt |   10 +-----
 3 files changed, 7 insertions(+), 45 deletions(-)


hooks/post-receive
-- 
Grassroots DICOM