Commit 7268d99c authored by Gert Wollny's avatar Gert Wollny
Browse files

New upstream version 3.0.1

parent 0ef6bc05

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ matrix: 
    - compiler: gcc

      os: linux

        # No docbook-xsl-ns

      addons: {apt: {packages: [default-jdk, mono-devel, swig, libcharls-dev, libvtk5-dev, libexpat-dev, libz-dev, uuid-dev, python-all-dev, libpoppler-dev, xsltproc, docbook-xsl, dcmtk]}}

      addons: {apt: {packages: [default-jdk, mono-devel, swig, libcharls-dev, libvtk5-dev, libexpat-dev, libz-dev, uuid-dev, python-all-dev, libpoppler-private-dev, xsltproc, docbook-xsl, dcmtk]}}

      env:

        - CFLAGS="-Wall -Wextra -m64"

        - CXXFLAGS="-Wall -Wextra -m64"

Applications/Cxx/gdcmanon.cxx

+25 −22
Original line number Diff line number Diff line
@@ -723,6 +723,8 @@ int main(int argc, char *argv[]) 
    }



  gdcm::FileMetaInformation::SetSourceApplicationEntityTitle( "gdcmanon" );

  if( !dumb_mode )

  {

    gdcm::Global& g = gdcm::Global::GetInstance();

    if( !resourcespath )

      {
@@ -750,6 +752,7 @@ int main(int argc, char *argv[]) 
      return 1;

      }

    const gdcm::Defs &defs = g.GetDefs(); (void)defs;

  }

  if( !rootuid )

    {

    // only read the env var if no explicit cmd line option

Applications/Cxx/gdcmdump.cxx

+2 −2
Original line number Diff line number Diff line
@@ -139,8 +139,8 @@ static void printbinary(std::istream &is, PDFElement const & pdfel ) 
  std::cout << "  " << bufferref << " ";

  uint32_t type = pdfel.gettype();

  uint32_t numels = pdfel.getnumelems();

  uint32_t dummy = pdfel.getdummy();

  assert( dummy == 0 ); (void)dummy;

  //uint32_t dummy = pdfel.getdummy();

  //assert( dummy == 0 ); (void)dummy;

  uint32_t offset = pdfel.getoffset();

  uint32_t pos = (uint32_t)(offset + is.tellg() - 4);

  printvalue(is, type, numels, pos);

Applications/Cxx/gdcmimg.cxx

+1 −9
Original line number Diff line number Diff line
@@ -70,14 +70,6 @@ 
#include <getopt.h>

#include <string.h>



#ifndef GDCM_HAVE_ATOLL

#ifdef _MSC_VER

#define atoll _atoi64

#else

#define atoll atol

#endif

#endif



static unsigned int readsize(const char *str, unsigned int * size)

{

  int n = sscanf( str, "%i,%i,%i", size, size+1, size+2);
@@ -596,7 +588,7 @@ int main (int argc, char *argv[]) 
            {

            assert( strcmp(s, "offset") == 0 );

            poffset = 1;

            start_pos = (size_t)atoll(optarg);

            start_pos = (size_t)std::atoll(optarg);

            }

          else if( option_index == 17 ) /* template */

            {

CMake/CMakeDetermineCSharpCompiler.cmake

+3 −2
Original line number Diff line number Diff line
@@ -36,9 +36,10 @@ if(NOT CMAKE_CSharp_COMPILER) 
    set(CMAKE_CSharp_COMPILER_LIST ${CMAKE_CSharp_COMPILER_INIT})

  else()

    # Known compilers:

    # mcs/gmcs/smcs # mono

    # mcs/gmcs/smcs/dmcs # mono

    # see: https://www.mono-project.com/docs/about-mono/languages/csharp/

    # csc: DotNet

    set(CMAKE_CSharp_COMPILER_LIST csc mcs gmcs smcs)

    set(CMAKE_CSharp_COMPILER_LIST csc mcs gmcs smcs dmcs)

  endif()



  # Find the compiler.