Commit d2452e11 authored by Gert Wollny's avatar Gert Wollny
Browse files

New upstream version 3.0.4

parent 0dcd0210

Applications/Cxx/gdcmimg.cxx

+2 −2
Original line number Diff line number Diff line
@@ -1203,9 +1203,9 @@ int main (int argc, char *argv[]) 
    gdcm::ByteValue *bv = new gdcm::ByteValue();

    bv->SetLength( (uint32_t)len );

    //memcpy( bv->GetPointer(), imageori

    imageori.GetBuffer( (char*)bv->GetPointer() );

    imageori.GetBuffer( (char*)bv->GetVoidPointer() );

    // Rub out pixels:

    char *p = (char*)bv->GetPointer();

    char *p = (char*)bv->GetVoidPointer();

    switch(pixeltype)

      {

    case gdcm::PixelFormat::UINT8:

Applications/Cxx/gdcmtar.cxx

+1 −1
Original line number Diff line number Diff line
@@ -1415,7 +1415,7 @@ int main (int argc, char *argv[]) 
    //std::cout << image << std::endl;

    const gdcm::DataElement &pixeldata = image.GetDataElement();

    //const gdcm::ByteValue *bv = pixeldata.GetByteValue();

    gdcm::SmartPointer<gdcm::ByteValue> bv = (gdcm::ByteValue*)pixeldata.GetByteValue();

    gdcm::SmartPointer<gdcm::ByteValue> bv = const_cast<gdcm::ByteValue*>(pixeldata.GetByteValue());

    unsigned long slice_len = image.GetBufferLength() / dims[2];

    assert( slice_len * dims[2] == image.GetBufferLength() );

    //assert( image.GetBufferLength() == bv->GetLength() );

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ endif() 
#----------------------------------------------------------------------------



project(GDCM

  VERSION 3.0.3

  VERSION 3.0.4

  LANGUAGES CXX C

)

## NOTE: the "DESCRIPTION" feature of project() was introduced in cmake 3.10.0

Examples/Cxx/DumpPhilipsECHO.cxx

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static bool ProcessDeflate( const char *outfilename, const int nslices, const 
    uLongf destLen = buf_size; // >= 608,427

    Bytef *dest = (Bytef*)&outbuf[0];

    assert( is.tellg() == offsets[r] + 16 );

    const Bytef *source = (Bytef*)buf + offsets[r] + 16;

    const Bytef *source = (const Bytef*)buf + offsets[r] + 16;

    uLong sourceLen;

    if( r + 1 == nframes )

      sourceLen = (uLong)totalsize - (uLong)offsets[r] - 16;

Examples/Cxx/ELSCINT1WaveToText.cxx

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ bool dumpargs(std::ostream & os, T c1, T c2, T c3, T c4, T c5, T c6, T c7, T c8) 


bool wave2stream( std::ostream &text_file, const char *in, size_t len )

{

  short * buffer = (short*)in;

  const short * buffer = (const short*)in;

  size_t length = len / sizeof( short );

  text_file << "COMPLETE_WAVE" << '\t' << "MASK"       << '\t' << "AQUISITION_PROFIL" << '\t' << "END-INHALE" << '\t' << "END-EXHALE" << '\t' << "AQUISITION_WAVE" << '\t' << "WAVE_STATISTICS" << '\t' << "MASK"        << std::endl;

  for (size_t i=0;i<length-76;i+=2)