Commit 8240e026 authored by Sebastien Jodogne's avatar Sebastien Jodogne
Browse files

New upstream version 1.3.2+dfsg

parent 4d644cab

.hg_archival.txt

+4 −4
Original line number Diff line number Diff line 
repo: 3959d33612ccaadc0d4d707227fbed09ac35e5fe

node: 4d4dff4693b87cb4a29cd563776a739b0e8fdebf

branch: Orthanc-1.3.1

node: 78e5414d57f8874cfe88997726b97bd3b25e48df

branch: Orthanc-1.3.2

latesttag: dcmtk-3.6.1

latesttagdistance: 97

changessincelatesttag: 102
 
latesttagdistance: 205

changessincelatesttag: 213

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ before_script: 
    ..; fi

  - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == ON ]; then cmake

    -DCMAKE_BUILD_TYPE=Debug -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON -DALLOW_DOWNLOADS=ON

    -DCMAKE_TOOLCHAIN_FILE=Resources/MinGWToolchain.cmake -DUSE_DCMTK_360=ON

    -DCMAKE_TOOLCHAIN_FILE=Resources/MinGWToolchain.cmake -DUSE_DCMTK_360=ON -DUSE_LEGACY_JSONCPP=ON

    ..; fi

  - if [ $TRAVIS_OS_NAME == osx ]; then cmake 

    -DCMAKE_BUILD_TYPE=Debug -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON -DALLOW_DOWNLOADS=ON

AUTHORS

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ Authors of Orthanc 
  4000 Liege

  Belgium



* Osimis <info@osimis.io>

* Osimis S.A. <info@osimis.io>

  Rue des Chasseurs Ardennais 3

  4031 Liege 

  Belgium

CMakeLists.txt

+1 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ set(ENABLE_PUGIXML ON) 
set(ENABLE_SQLITE ON)

set(ENABLE_WEB_CLIENT ON)

set(ENABLE_WEB_SERVER ON)

set(ENABLE_ZLIB ON)



set(HAS_EMBEDDED_RESOURCES ON)
@@ -46,8 +47,6 @@ SET(UNIT_TESTS_WITH_HTTP_CONNEXIONS ON CACHE BOOL "Allow unit tests to make HTTP 
include(${CMAKE_SOURCE_DIR}/Resources/CMake/VisualStudioPrecompiledHeaders.cmake)

include(${CMAKE_SOURCE_DIR}/Resources/CMake/OrthancFrameworkConfiguration.cmake)



include_directories(${ORTHANC_ROOT})





#####################################################################

## List of source files
@@ -124,7 +123,6 @@ if (ENABLE_PLUGINS) 
    Plugins/Engine/PluginsEnumerations.cpp

    Plugins/Engine/PluginsErrorDictionary.cpp

    Plugins/Engine/PluginsManager.cpp

    Plugins/Engine/SharedLibrary.cpp

    )



  list(APPEND ORTHANC_UNIT_TESTS_SOURCES

Core/Cache/ICachePageProvider.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * Orthanc - A Lightweight, RESTful DICOM Store

 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics

 * Department, University Hospital of Liege, Belgium

 * Copyright (C) 2017 Osimis, Belgium

 * Copyright (C) 2017-2018 Osimis S.A., Belgium

 *

 * This program is free software: you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as