# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1589281508 -7200
# Node ID 07127c525e6b2ec8bc9485f389f212536b956d08
# Parent  1b09b29434105c53b14d838bcc9019d5322ca4a0
creating branch transcoding

diff -r 1b09b2943410 -r 07127c525e6b CMakeLists.txt
--- a/CMakeLists.txt	Thu Mar 26 08:20:15 2020 +0100
+++ b/CMakeLists.txt	Tue May 12 13:05:08 2020 +0200
@@ -24,7 +24,8 @@
 set(ORTHANC_DICOM_WEB_VERSION "mainline")
 
 if (ORTHANC_DICOM_WEB_VERSION STREQUAL "mainline")
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
+  # cmake .. -DALLOW_DOWNLOADS=ON -DUSE_SYSTEM_GOOGLE_TEST=OFF -DUSE_SYSTEM_ORTHANC_SDK=OFF -DORTHANC_SDK_VERSION=framework -G Ninja
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "transcoding")  # TODO - Revert this to "mainline"
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.6.0")
diff -r 1b09b2943410 -r 07127c525e6b Plugin/WadoRsRetrieveFrames.cpp
--- a/Plugin/WadoRsRetrieveFrames.cpp	Thu Mar 26 08:20:15 2020 +0100
+++ b/Plugin/WadoRsRetrieveFrames.cpp	Tue May 12 13:05:08 2020 +0200
@@ -627,6 +627,13 @@
       OrthancPlugins::LogInfo(s);
     }
 
+    if (0)
+    {
+      OrthancPlugins::DicomInstance instance(content.GetData(), content.GetSize());
+      printf("[%s]\n", instance.GetTransferSyntaxUid().c_str());
+      throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError, "Bye bye");
+    }
+    
     std::auto_ptr<OrthancPlugins::GdcmParsedDicomFile> source;
     
     Orthanc::DicomTransferSyntax sourceSyntax;
diff -r 1b09b2943410 -r 07127c525e6b Resources/Orthanc/DownloadOrthancFramework.cmake
--- a/Resources/Orthanc/DownloadOrthancFramework.cmake	Thu Mar 26 08:20:15 2020 +0100
+++ b/Resources/Orthanc/DownloadOrthancFramework.cmake	Tue May 12 13:05:08 2020 +0200
@@ -70,6 +70,12 @@
       set(ORTHANC_FRAMEWORK_MINOR 999)
       set(ORTHANC_FRAMEWORK_REVISION 999)
 
+    elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "transcoding")  # TODO - REMOVE
+      set(ORTHANC_FRAMEWORK_BRANCH "transcoding")
+      set(ORTHANC_FRAMEWORK_MAJOR 999)
+      set(ORTHANC_FRAMEWORK_MINOR 999)
+      set(ORTHANC_FRAMEWORK_REVISION 999)
+
     else()
       set(ORTHANC_FRAMEWORK_BRANCH "Orthanc-${ORTHANC_FRAMEWORK_VERSION}")
 
@@ -216,7 +222,7 @@
   else()
     message("Forking the Orthanc source repository using Mercurial")
     execute_process(
-      COMMAND ${ORTHANC_FRAMEWORK_HG} clone "https://bitbucket.org/sjodogne/orthanc"
+      COMMAND ${ORTHANC_FRAMEWORK_HG} clone "https://hg.orthanc-server.com/orthanc/"
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       RESULT_VARIABLE Failure
       )    
diff -r 1b09b2943410 -r 07127c525e6b Resources/Orthanc/LinuxStandardBaseToolchain.cmake
--- a/Resources/Orthanc/LinuxStandardBaseToolchain.cmake	Thu Mar 26 08:20:15 2020 +0100
+++ b/Resources/Orthanc/LinuxStandardBaseToolchain.cmake	Tue May 12 13:05:08 2020 +0200
@@ -1,11 +1,19 @@
-# LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_LIBICU=ON -DBOOST_LOCALE_BACKEND=icu -G Ninja
+#
+# Full build, as used on the BuildBot CIS:
+#
+#   $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_LIBICU=ON -DBOOST_LOCALE_BACKEND=icu -DENABLE_PKCS11=ON -G Ninja
+#
+# Or, more lightweight version (without libp11 and ICU):
+#
+#   $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -G Ninja
+#
 
 INCLUDE(CMakeForceCompiler)
 
-SET(LSB_PATH $ENV{LSB_PATH})
-SET(LSB_CC $ENV{LSB_CC})
-SET(LSB_CXX $ENV{LSB_CXX})
-SET(LSB_TARGET_VERSION "4.0")
+SET(LSB_PATH $ENV{LSB_PATH} CACHE STRING "")
+SET(LSB_CC $ENV{LSB_CC} CACHE STRING "")
+SET(LSB_CXX $ENV{LSB_CXX} CACHE STRING "")
+SET(LSB_TARGET_VERSION "4.0" CACHE STRING "")
 
 IF ("${LSB_PATH}" STREQUAL "")
   SET(LSB_PATH "/opt/lsb")