ENH: update to openjpeg CVS

diff --git a/src/gdcmopenjpeg/CMakeLists.txt b/src/gdcmopenjpeg/CMakeLists.txt
index a2b8d36e92fb639e753860a6984662f4795c1972..fb070f58631203b9f8a8ed24693d2981251db827 100644 (file)
--- a/src/gdcmopenjpeg/CMakeLists.txt
+++ b/src/gdcmopenjpeg/CMakeLists.txt
@@ -21,10 +21,6 @@ SET(OPENJPEG_BUILD_VERSION 0)
 SET(OPENJPEG_VERSION
   "${OPENJPEG_MAJOR_VERSION}.${OPENJPEG_MINOR_VERSION}.${OPENJPEG_BUILD_VERSION}")
 
-#-----------------------------------------------------------------------------
-# OpenJPEG build configuration options.
-OPTION(BUILD_SHARED_LIBS "Build OpenJPEG with shared libraries." OFF)
-
 #-----------------------------------------------------------------------------
 # For the codec...
 OPTION(BUILD_EXAMPLES "Build the Examples (codec...)." OFF)

diff --git a/src/gdcmopenjpeg/DartConfig.cmake b/src/gdcmopenjpeg/DartConfig.cmake
deleted file mode 100644 (file)
index 20e6733..0000000
--- a/src/gdcmopenjpeg/DartConfig.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-# Dashboard is opened for submissions for a 24 hour period starting at
-# the specified NIGHLY_START_TIME. Time is specified in 24 hour format.
-SET (NIGHTLY_START_TIME "21:00:00 EDT")
-
-# Dart server to submit results (used by client)
-SET (DROP_METHOD "http")
-SET (DROP_SITE "public.kitware.com")
-SET (DROP_LOCATION "/cgi-bin/HTTPUploadDartFile.cgi")
-SET (TRIGGER_SITE 
-    "http://${DROP_SITE}/cgi-bin/Submit-Public-TestingResults.cgi")
-
-# Not used right now, since on public:
-# Project Home Page
-SET (PROJECT_URL "http://www.openjpeg.org")
-
-# Dart server configuration
-#SET (ROLLUP_URL "http://${DROP_SITE}/cgi-bin/openjpeg-rollup-dashboard.sh")
-SET (CVS_WEB_URL "http://euterpe.tele.ucl.ac.be/cgi-bin/viewcvs.cgi/")
-SET (CVS_WEB_CVSROOT "OpenJPEG")
-
-SET (USE_DOXYGEN "On")
-SET (DOXYGEN_URL "http://www.openjpeg.org/libdoc/index.html")

diff --git a/src/gdcmopenjpeg/codec/image_to_j2k.c b/src/gdcmopenjpeg/codec/image_to_j2k.c
index 1df97e9c785ec941fdd0fad44ae8a6e73ad35dd6..dbc0ebe731cf98c72568c332ba34a391abe0f6a4 100644 (file)
--- a/src/gdcmopenjpeg/codec/image_to_j2k.c
+++ b/src/gdcmopenjpeg/codec/image_to_j2k.c
@@ -654,7 +654,7 @@ int main(int argc, char **argv) {
   }
 
   if(parameters.cp_comment == NULL) {
-    parameters.cp_comment = "Created by OpenJPEG version 0.9";
+    parameters.cp_comment = "Created by OpenJPEG version 1.0";
     /* no need to delete parameters.cp_comment on exit */
     delete_comment = false;
   }