Commit 20bfc8ad authored by Sebastien Jodogne's avatar Sebastien Jodogne
Browse files

New upstream version 1.5.7+dfsg

parent cf3958ca

.hg_archival.txt

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

node: 56d7f3d50c89c6c66c9932621a1ae05403e34ee1

branch: Orthanc-1.5.6

node: 90140b7796a1738a525f3a9d1ef404cb35e5e2c7

branch: Orthanc-1.5.7

latesttag: dcmtk-3.6.1

latesttagdistance: 817

changessincelatesttag: 934
 
latesttagdistance: 938

changessincelatesttag: 1066

.hgignore

+1 −0
Original line number Diff line number Diff line
@@ -4,4 +4,5 @@ CMakeLists.txt.user 
*.cpp.orig

*.h.orig

.vs/

.vscode/

*~

CMakeLists.txt

+5 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ set(ORTHANC_UNIT_TESTS_SOURCES 
  UnitTestsSources/ImageProcessingTests.cpp

  UnitTestsSources/ImageTests.cpp

  UnitTestsSources/JpegLosslessTests.cpp

  UnitTestsSources/LoggingTests.cpp

  UnitTestsSources/LuaTests.cpp

  UnitTestsSources/MemoryCacheTests.cpp

  UnitTestsSources/MultiThreadingTests.cpp
@@ -123,6 +124,7 @@ set(ORTHANC_UNIT_TESTS_SOURCES 
  UnitTestsSources/SQLiteTests.cpp

  UnitTestsSources/ServerIndexTests.cpp

  UnitTestsSources/StreamTests.cpp

  UnitTestsSources/ToolboxTests.cpp

  UnitTestsSources/UnitTestsMain.cpp

  UnitTestsSources/VersionsTests.cpp

  UnitTestsSources/ZipTests.cpp
@@ -192,6 +194,7 @@ if (STANDALONE_BUILD) 
    ${ORTHANC_EMBEDDED_FILES}

    ORTHANC_EXPLORER ${CMAKE_CURRENT_SOURCE_DIR}/OrthancExplorer

    ${DCMTK_DICTIONARIES}

    ${LIBICU_RESOURCES}

    )

else()

  add_definitions(
@@ -200,6 +203,7 @@ else() 
    )

  EmbedResources(

    ${ORTHANC_EMBEDDED_FILES}

    ${LIBICU_RESOURCES}

    )

endif()
@@ -332,6 +336,7 @@ add_executable(UnitTests 
  ${GOOGLE_TEST_SOURCES}

  ${ORTHANC_UNIT_TESTS_PCH}

  ${ORTHANC_UNIT_TESTS_SOURCES}

  ${BOOST_EXTENDED_SOURCES}

  )



target_link_libraries(UnitTests

Core/ChunkedBuffer.cpp

+13 −0
Original line number Diff line number Diff line
@@ -77,6 +77,19 @@ namespace Orthanc 
  }





  void ChunkedBuffer::AddChunkDestructive(std::string& chunk)

  {

    size_t chunkSize = chunk.size();

    

    if (chunkSize > 0)

    {

      chunks_.push_back(new std::string);

      chunks_.back()->swap(chunk);

      numBytes_ += chunkSize;

    }

  }





  void ChunkedBuffer::Flatten(std::string& result)

  {

    result.resize(numBytes_);

Core/ChunkedBuffer.h

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ namespace Orthanc 


    void AddChunk(const std::string& chunk);



    // The source content will be emptied

    void AddChunkDestructive(std::string& chunk);



    void Flatten(std::string& result);

  };

}