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

New upstream version 0.8.11

parent 9b58e3dd

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ include(CTest) 
# Project version

set(DICOM_MAJOR_VERSION 0)

set(DICOM_MINOR_VERSION 8)

set(DICOM_PATCH_VERSION 10)

set(DICOM_PATCH_VERSION 11)

set(DICOM_SHORT_VERSION "${DICOM_MAJOR_VERSION}.${DICOM_MINOR_VERSION}")

set(DICOM_VERSION "${DICOM_SHORT_VERSION}.${DICOM_PATCH_VERSION}")

DicomCli/mainmacro.cxx

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ bool Arguments::ExpandArgs(int argc, wchar_t *argv[], const char *passthrough) 
                // Append wildcard result to the directory.

                wchar_t *result;

                size_t n = 0;

                while (data.cFileName[n] != 0 && n < MAX_PATH) {

                while (n < MAX_PATH && data.cFileName[n] != 0) {

                  n++;

                }

                // Ensure that the true filename matches the wildcards.

DicomCli/readquery.cxx

+5 −8
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ public: 
  size_t ReadLine(std::string *s);



private:

  LineReader(const LineReader&); // = delete;

  LineReader& operator=(const LineReader&); // = delete;



  vtkDICOMFile *File;

  size_t BufferSize;

  unsigned char *Buffer;
@@ -340,12 +343,11 @@ bool dicomcli_readkey_query( 
  // read the DICOM vr

  vtkDICOMVR vr;



  size_t vrStart = s;

  size_t vrEnd = s;

  if (s < n && cp[s] == ':')

  {

    s++;

    vrStart = s;

    size_t vrStart = s;

    vrEnd = s;

    if (n - s >= 2)

    {
@@ -422,7 +424,6 @@ bool dicomcli_readkey_query( 
    keyHasAssignment = true;

    s++;

    valueStart = s;

    valueEnd = s;

    if (s < n && qfile && cp[s] == '\"')

    {

      char delim = cp[s++];
@@ -445,10 +446,6 @@ bool dicomcli_readkey_query( 
        s++;

      }

      valueEnd = s;

      if (s < n)

      {

        s++;

      }

    }

    else

    {
@@ -526,7 +523,7 @@ bool dicomcli_readkey_query( 
    }

  }



  return !tagError;

  return true;

}



bool dicomcli_readkey(

Programs/dicomdump.cxx

+0 −13
Original line number Diff line number Diff line
@@ -548,19 +548,6 @@ int MAINMACRO(int argc, char *argv[]) 
    vtkSmartPointer<vtkDICOMMetaData>::New();

  parser->SetMetaData(data);



      {

        vtkDICOMDataElementIterator iter = query.Begin();

        vtkDICOMDataElementIterator iterEnd = query.End();



        for (; iter != iterEnd; ++iter)

        {

          printElement(data, 0, iter, 0, 0);

        }

        for (size_t i = 0; i < qtlist.size(); i++)

        {

          std::cout << qtlist[i] << "\n";

        }

      }

  int m = sorter->GetNumberOfStudies();

  for (int j = 0; j < m; j++)

  {

Source/vtkDICOMDictHash.cxx

+3604 −3346

File changed.

Preview size limit exceeded, changes collapsed.