From: malaterre Date: Fri, 3 Dec 2004 16:57:49 +0000 (+0000) Subject: ENH: Remove warnings on gcc296 about aggregate partly bracketed initializer X-Git-Tag: Version1.0.bp~544 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=38d772b8588bc4e7106dbafcb24f6bff91b8c4c1;p=gdcm.git ENH: Remove warnings on gcc296 about aggregate partly bracketed initializer --- diff --git a/Dicts/CMakeLists.txt b/Dicts/CMakeLists.txt index 094d08b6..098f6c85 100644 --- a/Dicts/CMakeLists.txt +++ b/Dicts/CMakeLists.txt @@ -22,11 +22,11 @@ SET(DICOM_DATA_DICTIONARY "") FOREACH(line ${ENT}) STRING(REGEX REPLACE "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f]) ([0-9a-f][0-9a-f][0-9a-f][0-9a-f]) ([A-Z]+) ([A-Z?]+) (.*)$" - " 0x\\1, 0x\\2, \"\\3\" , \"\\4\" , \"\\5\", " nline "${line}") + " { 0x\\1, 0x\\2, \"\\3\" , \"\\4\" , \"\\5\" }, " nline "${line}") SET(DICOM_DATA_DICTIONARY "${DICOM_DATA_DICTIONARY}\n${nline}") ENDFOREACH(line) -SET(DICOM_DATA_DICTIONARY "${DICOM_DATA_DICTIONARY} \n 0,0,0,0,0") +SET(DICOM_DATA_DICTIONARY "${DICOM_DATA_DICTIONARY} \n { 0,0,0,0,0 }") FILE(READ "dicomTS.dic" ENT_TS) STRING(REGEX REPLACE "\n" ";" ENT_TS "${ENT_TS}") @@ -60,11 +60,11 @@ SET(DICOM_DIR_DICTIONARY "") FOREACH(line ${ENT_DIR}) STRING(REGEX REPLACE "^(metaElem|patientElem|studyElem|serieElem|imageElem) *([a-f0-9]+) ([a-f0-9]+) [\"](.*)[\"](.*)$" - " \"\\1\" , 0x\\2 , 0x\\3 , \"\\4\", \\5" nline "${line}") + " { \"\\1\" , 0x\\2 , 0x\\3 , \"\\4\" }, \\5" nline "${line}") SET(DICOM_DIR_DICTIONARY "${DICOM_DIR_DICTIONARY}\n${nline}") ENDFOREACH(line) -SET(DICOM_DIR_DICTIONARY "${DICOM_DIR_DICTIONARY} \n 0,0,0,0") +SET(DICOM_DIR_DICTIONARY "${DICOM_DIR_DICTIONARY} \n { 0,0,0,0 }") # See above CONFIGURE_FILE("${GDCM_SOURCE_DIR}/src/gdcmDefaultDicts.cxx.in" "${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx" IMMEDIATE) diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx index 99d63606..62b38d49 100644 --- a/src/gdcmHeader.cxx +++ b/src/gdcmHeader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmHeader.cxx,v $ Language: C++ - Date: $Date: 2004/12/02 15:14:18 $ - Version: $Revision: 1.210 $ + Date: $Date: 2004/12/03 16:57:49 $ + Version: $Revision: 1.211 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -1314,53 +1314,53 @@ void Header::InitializeDefaultHeader() std::string uid = Util::CreateUniqueUID(); static DICOM_DEFAULT_VALUE defaultvalue[] = { - "76", 0x0002, 0x0000, // MetaElementGroup Length // FIXME: how to recompute ? - "1.2.840.10008.5.1.4.1.1.2", 0x0002, 0x0002, // MediaStorageSOPInstanceUID (CT Image Storage) - uid.c_str(), 0x0002, 0x0012, // META Implementation Class UID - "ISO_IR 100",0x0008, 0x0005, // Specific Character Set - "DERIVED\\SECONDARY\\OTHER\\GDCM", 0x0008, 0x0008, // Image Type - "1.2.840.10008.5.1.4.1.1.2", 0x0008, 0x0016, // SOP Class UID - "", 0x0008, 0x0050, // Accession Number - "GDCM", 0x0008, 0x0070, // Manufacturer - "GDCM", 0x0008, 0x0080, // Institution Name - "http://www-creatis.insa-lyon.fr/Public/Gdcm/", 0x0008, 0x0081, // Institution Address - "", 0x0008, 0x0090, // Refering Physician Name - "", 0x0008, 0x1030, // Study Description - "", 0x0008, 0x1050, // Performing Physician's Name - "", 0x0008, 0x1060, // Name of Physician(s) Reading Study - "", 0x0010, 0x0040, // Patient's Sex - uid.c_str(), 0x0020, 0x000d, // StudyInstanceUID - uid.c_str(), 0x0020, 0x000e, // SeriesInstanceUID - "", 0x0020, 0x0011, // AcquisitionNumber - "1\\0\\0\\0\\1\\0", 0x0020, 0x0037, // Image Orientation Patient - "1", 0x0028, 0x0002, // Samples per pixel 1 or 3 - "MONOCHROME2",0x0028, 0x0004, // photochromatic interpretation + { "76", 0x0002, 0x0000}, // MetaElementGroup Length // FIXME: how to recompute ? + { "1.2.840.10008.5.1.4.1.1.2", 0x0002, 0x0002}, // MediaStorageSOPInstanceUID (CT Image Storage) + { uid.c_str(), 0x0002, 0x0012}, // META Implementation Class UID + { "ISO_IR 100",0x0008, 0x0005}, // Specific Character Set + { "DERIVED\\SECONDARY\\OTHER\\GDCM", 0x0008, 0x0008}, // Image Type + { "1.2.840.10008.5.1.4.1.1.2", 0x0008, 0x0016}, // SOP Class UID + { "", 0x0008, 0x0050}, // Accession Number + { "GDCM", 0x0008, 0x0070}, // Manufacturer + { "GDCM", 0x0008, 0x0080}, // Institution Name + { "http://www-creatis.insa-lyon.fr/Public/Gdcm/", 0x0008, 0x0081}, // Institution Address + { "", 0x0008, 0x0090}, // Refering Physician Name + { "", 0x0008, 0x1030}, // Study Description + { "", 0x0008, 0x1050}, // Performing Physician's Name + { "", 0x0008, 0x1060}, // Name of Physician(s) Reading Study + { "", 0x0010, 0x0040}, // Patient's Sex + { uid.c_str(), 0x0020, 0x000d}, // StudyInstanceUID + { uid.c_str(), 0x0020, 0x000e}, // SeriesInstanceUID + { "", 0x0020, 0x0011}, // AcquisitionNumber + { "1\\0\\0\\0\\1\\0", 0x0020, 0x0037}, // Image Orientation Patient + { "1", 0x0028, 0x0002}, // Samples per pixel 1 or 3 + { "MONOCHROME2",0x0028, 0x0004}, // photochromatic interpretation // Date and timeG - date.c_str(), 0x0008, 0x0012, // Instance Creation Date - time.c_str(), 0x0008, 0x0013, // Instance Creation Time - date.c_str(), 0x0008, 0x0020, // Study Date - date.c_str(), 0x0008, 0x0022, // Acquisition Date - date.c_str(), 0x0008, 0x0023, // Content Date - time.c_str(), 0x0008, 0x0030, // Study Time - "CT", 0x0008, 0x0060, // Modality - "GDCM", 0x0010, 0x0010, // Patient's Name - "GDCMID", 0x0010, 0x0020, // Patient ID - "1", 0x0020, 0x0010, // StudyID - "1", 0x0020, 0x0011, // SeriesNumber - "1.0", 0x0018, 0x0050, // slice Thickness - "1.0", 0x0018, 0x0088, // space between slices - "1.0\\1.0", 0x0028, 0x0030, // pixelSpacing - "64", 0x0028, 0x0010, // nbRows - "64", 0x0028, 0x0011, // nbCols - "16", 0x0028, 0x0100, // BitsAllocated 8 or 16 - "12", 0x0028, 0x0101, // BitsStored 8 or 12 - "11", 0x0028, 0x0102, // HighBit 7 or 11 - "0", 0x0028, 0x0103, // Pixel Representation 0(unsigned) or 1(signed) - "1000.0", 0x0028, 0x1051, // Window Width - "500.0", 0x0028, 0x1050, // Window Center - 0, 0, 0 + { date.c_str(), 0x0008, 0x0012 } , // Instance Creation Date + { time.c_str(), 0x0008, 0x0013 } , // Instance Creation Time + { date.c_str(), 0x0008, 0x0020 } , // Study Date + { date.c_str(), 0x0008, 0x0022 } , // Acquisition Date + { date.c_str(), 0x0008, 0x0023 } , // Content Date + { time.c_str(), 0x0008, 0x0030 } , // Study Time + { "CT", 0x0008, 0x0060 } , // Modality + { "GDCM", 0x0010, 0x0010 } , // Patient's Name + { "GDCMID", 0x0010, 0x0020 } , // Patient ID + { "1", 0x0020, 0x0010 } , // StudyID + { "1", 0x0020, 0x0011 } , // SeriesNumber + { "1.0", 0x0018, 0x0050 } , // slice Thickness + { "1.0", 0x0018, 0x0088 } , // space between slices + { "1.0\\1.0", 0x0028, 0x0030 } , // pixelSpacing + { "64", 0x0028, 0x0010 } , // nbRows + { "64", 0x0028, 0x0011 } , // nbCols + { "16", 0x0028, 0x0100 } , // BitsAllocated 8 or 16 + { "12", 0x0028, 0x0101 } , // BitsStored 8 or 12 + { "11", 0x0028, 0x0102 } , // HighBit 7 or 11 + { "0", 0x0028, 0x0103 } , // Pixel Representation 0(unsigned) or 1(signed) + { "1000.0", 0x0028, 0x1051 } , // Window Width + { "500.0", 0x0028, 0x1050 } , // Window Center + { 0, 0, 0 } }; // default value