From 2c7fe209c1f16c1dfb4b50e5c3e4d4656990beb1 Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Fri, 22 Sep 2023 16:06:34 -0400 Subject: [PATCH 1/4] Uncertain if theese can change... --- Examples/Python/DumbAnonymizer.py | 2 +- Source/DataDictionary/gdcmPrivateDefaultDicts.cxx | 2 +- Source/DataDictionary/privatedicts.xml | 2 +- Utilities/gdcmext/mec_mr3_dict.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Examples/Python/DumbAnonymizer.py b/Examples/Python/DumbAnonymizer.py index 95fa22a4bb..c5dee3f4dc 100644 --- a/Examples/Python/DumbAnonymizer.py +++ b/Examples/Python/DumbAnonymizer.py @@ -56,7 +56,7 @@ (0x0018,0x1250):("Sequence Field","Receive Coil"), (0x0018,0x0088):("Sequence Field","Spacing Between Slice"), (0x0018,0x0095):("Sequence Field","Pixel Bandwidth"), - (0x0018,0x0082):("Sequence Field","Invertion Time"), + (0x0018,0x0082):("Sequence Field","Inversion Time"), } class MyAnon: diff --git a/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx b/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx index c014be6942..4c86aae8a0 100644 --- a/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx +++ b/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx @@ -4047,7 +4047,7 @@ static const DICT_ENTRY DICOMV3DataDict [] = { {0x0011,0x0040,"GEMS_GDXE_FALCON_04",VR::SL,VM::VM1,"Pasting Overlap",false }, {0x0011,0x0041,"GEMS_GDXE_FALCON_04",VR::IS,VM::VM24,"Sub-image Collimator Vertices",false }, {0x0011,0x0042,"GEMS_GDXE_FALCON_04",VR::LO,VM::VM1,"View IP",false }, - {0x0011,0x0043,"GEMS_GDXE_FALCON_04",VR::IS,VM::VM24,"Key-stone Co-ordinates",false }, + {0x0011,0x0043,"GEMS_GDXE_FALCON_04",VR::IS,VM::VM24,"Key-stone Coordinates",false }, {0x0011,0x0044,"GEMS_GDXE_FALCON_04",VR::CS,VM::VM1,"Receptor Type",false }, {0x0011,0x0046,"GEMS_GDXE_FALCON_04",VR::LO,VM::VM1_n,"?",false }, {0x0011,0x0047,"GEMS_GDXE_FALCON_04",VR::DS,VM::VM1,"?",false }, diff --git a/Source/DataDictionary/privatedicts.xml b/Source/DataDictionary/privatedicts.xml index 5e6141ccee..473e943f3d 100644 --- a/Source/DataDictionary/privatedicts.xml +++ b/Source/DataDictionary/privatedicts.xml @@ -3516,7 +3516,7 @@ - + diff --git a/Utilities/gdcmext/mec_mr3_dict.c b/Utilities/gdcmext/mec_mr3_dict.c index 006ebd21bd..8b529476f0 100644 --- a/Utilities/gdcmext/mec_mr3_dict.c +++ b/Utilities/gdcmext/mec_mr3_dict.c @@ -208,7 +208,7 @@ static const struct mec_mr3_dict dict[] = { {0x02, 0x0000a81c, 0xff003200, ""}, // {0x02, 0x0000a81d, 0xff002a00, ""}, // {0x02, 0x0000a822, 0x00000500, ""}, // - {0x02, 0x0000a823, 0xff002c00, "MR Acquition Type"}, // + {0x02, 0x0000a823, 0xff002c00, "MR Acquisition Type"}, // {0x02, 0x0000a824, 0xff002400, ""}, // {0x02, 0x0000a825, 0xff002400, ""}, // {0x02, 0x0000a826, 0xff003200, ""}, // From 5bd685c94699506585932e624ea645035bba8016 Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Wed, 20 Sep 2023 22:25:09 -0400 Subject: [PATCH 2/4] Fixed various typos / spelling mistakes found by codespell tool --- Applications/Cxx/puff.c | 2 +- Examples/Csharp/BasicImageAnonymizer.cs | 2 +- Examples/Csharp/DecompressImageMultiframe.cs | 2 +- Examples/Csharp/ReformatFile.cs | 2 +- Examples/Csharp/StandardizeFiles.cs | 2 +- Examples/Cxx/DumpExamCard.cxx | 4 +- Examples/Cxx/FixBrokenJ2K.cxx | 2 +- Examples/Cxx/FixJAIBugJPEGLS.cxx | 6 +- Examples/Cxx/GenFakeImage.cxx | 2 +- Examples/Cxx/HelloVizWorld.cxx | 2 +- Examples/Cxx/HelloWorld.cxx | 4 +- Examples/Cxx/LargeVRDSExplicit.cxx | 2 +- Examples/Cxx/MrProtocol.cxx | 2 +- Examples/Cxx/PatchFile.cxx | 2 +- Examples/Cxx/PrintLUT.cxx | 2 +- Examples/Cxx/PublicDict.cxx | 2 +- Examples/Cxx/ReadAndDumpDICOMDIR2.cxx | 2 +- Examples/Cxx/ReadAndPrintAttributes.cxx | 2 +- Examples/Cxx/pmsct_rgb1.cxx | 4 +- Examples/Python/FixCommaBug.py | 2 +- Examples/Python/HelloWorld.py | 2 +- Examples/Python/PrivateDict.py | 2 +- Examples/Python/ReWriteSCAsMR.py | 2 +- Examples/Python/RemovePrivateTags.py | 2 +- Examples/Python/ScanDirectory.py | 2 +- INSTALL.txt | 2 +- .../gdcmVR.h | 10 +-- .../gdcmIODEntry.h | 4 +- .../gdcmStreamImageWriter.cxx | 2 +- .../Source/Common/Cxx/TestSmartPointer.cxx | 8 +-- .../Cxx/TestReader3.cxx | 2 +- Utilities/Release/bootstrap.sh | 2 +- Utilities/VTK/Applications/gdcm2vtk.cxx | 2 +- Utilities/VTK/CMakeLists.txt | 6 +- .../VTK/Examples/Cxx/gdcmorthoplanes.cxx | 2 +- Utilities/VTK/Examples/Cxx/gdcmreslice.cxx | 2 +- Utilities/VTK/Examples/Cxx/gdcmtexture.cxx | 4 +- Utilities/VTK/Examples/Java/AWTMedical3.java | 18 ++--- .../VTK/Examples/Java/HelloVTKWorld.java | 2 +- .../VTK/Examples/Java/ReadSeriesIntoVTK.java | 2 +- .../Testing/Cxx/TestvtkGDCMImageWriter1.cxx | 2 +- .../Python/TestvtkGDCMThreadedImageReader2.py | 2 +- .../VTK/VTK4/vtkMedicalImageProperties.h | 6 +- Utilities/VTK/vtkGDCMImageReader.cxx | 4 +- Utilities/VTK/vtkGDCMImageReader.h | 6 +- Utilities/VTK/vtkGDCMImageReader2.cxx | 2 +- Utilities/VTK/vtkGDCMImageReader2.h | 8 +-- Utilities/VTK/vtkGDCMImageWriter.cxx | 4 +- Utilities/VTK/vtkGDCMImageWriter.h | 2 +- Utilities/VTK/vtkGDCMMedicalImageProperties.h | 6 +- Utilities/VTK/vtkGDCMPolyDataReader.cxx | 4 +- Utilities/VTK/vtkGDCMPolyDataReader.h | 2 +- Utilities/VTK/vtkGDCMThreadedImageReader.cxx | 4 +- Utilities/VTK/vtkGDCMThreadedImageReader2.cxx | 4 +- Utilities/VTK/vtkGDCMThreadedImageReader2.h | 2 +- .../vtkImagePlanarComponentsToComponents.cxx | 2 +- Utilities/VTK/vtkImageRGBToYBR.cxx | 2 +- Utilities/VTK/vtkImageYBRToRGB.cxx | 2 +- Utilities/VTK/vtkgdcm.py | 2 +- Utilities/doxygen/CMakeLists.txt | 4 +- Utilities/doxygen/README.txt.in | 2 +- Utilities/doxygen/man/gdcmanon.xml | 3 + Utilities/doxygen/man/gdcmclean.xml | 2 +- Utilities/doxygen/man/gdcmconv.xml | 2 +- Utilities/doxygen/vtk/doc_makeall.sh.in | 2 +- Utilities/gdcmext/csa.c | 2 +- Utilities/gdcmjpeg/README.GDCM.txt | 2 +- Utilities/getopt/CMakeLists.txt | 2 +- Wrapping/Csharp/docstrings.i | 72 +++++++++---------- Wrapping/Java/CMakeLists.txt | 2 +- Wrapping/PHP/CMakeLists.txt | 2 +- Wrapping/Python/docstrings.i | 4 +- Wrapping/Python/gdcmPythonFilter.cxx | 2 +- 73 files changed, 150 insertions(+), 147 deletions(-) diff --git a/Applications/Cxx/puff.c b/Applications/Cxx/puff.c index 1433785f97..00a2c43435 100644 --- a/Applications/Cxx/puff.c +++ b/Applications/Cxx/puff.c @@ -623,7 +623,7 @@ local int fixed(struct state *s) * are themselves compressed using Huffman codes and run-length encoding. In * the list of code lengths, a 0 symbol means no code, a 1..15 symbol means * that length, and the symbols 16, 17, and 18 are run-length instructions. - * Each of 16, 17, and 18 are follwed by extra bits to define the length of + * Each of 16, 17, and 18 are followed by extra bits to define the length of * the run. 16 copies the last length 3 to 6 times. 17 represents 3 to 10 * zero lengths, and 18 represents 11 to 138 zero lengths. Unused symbols * are common, hence the special coding for zero lengths. diff --git a/Examples/Csharp/BasicImageAnonymizer.cs b/Examples/Csharp/BasicImageAnonymizer.cs index 090eac57ae..16160979d0 100644 --- a/Examples/Csharp/BasicImageAnonymizer.cs +++ b/Examples/Csharp/BasicImageAnonymizer.cs @@ -23,7 +23,7 @@ public static int Main(string[] args) { string filename = args[0]; - // instanciate the reader: + // instantiate the reader: gdcm.ImageReader reader = new gdcm.ImageReader(); reader.SetFileName( filename ); diff --git a/Examples/Csharp/DecompressImageMultiframe.cs b/Examples/Csharp/DecompressImageMultiframe.cs index eacfced2a3..051279432b 100644 --- a/Examples/Csharp/DecompressImageMultiframe.cs +++ b/Examples/Csharp/DecompressImageMultiframe.cs @@ -74,7 +74,7 @@ public static int Main(string[] args) // Create a new SequenceOfFragments C++ object, store it as a SmartPointer : SmartPtrFrag sq = SequenceOfFragments.New(); - // Yeah, the file are not garantee to be in order, please adapt... + // Yeah, the files are not guaranteed to be in order, please adapt... for(uint i = 0; i < nfiles; ++i) { System.Console.WriteLine( filenames[(int)i] ); diff --git a/Examples/Csharp/ReformatFile.cs b/Examples/Csharp/ReformatFile.cs index f0116e1193..370637c0df 100644 --- a/Examples/Csharp/ReformatFile.cs +++ b/Examples/Csharp/ReformatFile.cs @@ -46,7 +46,7 @@ public static int Main(string[] args) UIDGenerator uid = new UIDGenerator(); // helper for uid generation FileDerivation fd = new FileDerivation(); - // For the pupose of this execise we will pretend that this image is referencing + // For the purpose of this exercise we will pretend that this image is referencing // two source image (we need to generate fake UID for that). string ReferencedSOPClassUID = "1.2.840.10008.5.1.4.1.1.7"; // Secondary Capture fd.AddReference( ReferencedSOPClassUID, uid.Generate() ); diff --git a/Examples/Csharp/StandardizeFiles.cs b/Examples/Csharp/StandardizeFiles.cs index 5d5be4d28d..3345a3d8e0 100644 --- a/Examples/Csharp/StandardizeFiles.cs +++ b/Examples/Csharp/StandardizeFiles.cs @@ -35,7 +35,7 @@ public static bool ProcessOneFile( string filename, string outfilename ) } ImageChangeTransferSyntax change = new ImageChangeTransferSyntax(); - change.SetForce( false ); // do we really want to recompress when input is alread compressed in same alg ? + change.SetForce( false ); // do we really want to recompress when input is already compressed in same alg ? change.SetCompressIconImage( false ); // Keep it simple change.SetTransferSyntax( new TransferSyntax( TransferSyntax.TSType.JPEG2000Lossless ) ); change.SetInput( reader.GetPixmap() ); diff --git a/Examples/Cxx/DumpExamCard.cxx b/Examples/Cxx/DumpExamCard.cxx index 7b64c94309..d59c86aa93 100644 --- a/Examples/Cxx/DumpExamCard.cxx +++ b/Examples/Cxx/DumpExamCard.cxx @@ -242,7 +242,7 @@ struct param void read( std::istream & is ) { is.read( name, 32 + 1); - // This is always the same issue the string can contains garbarge from previous run, + // This is always the same issue the string can contains garbage from previous run, // we need to print only until the first \0 character: assert( strlen( name ) <= 32 ); is.read( (char*)&boolean,1); @@ -528,7 +528,7 @@ Wotsit ? //fn += ".xml"; std::ofstream csv( fn.c_str() ); - // let's do some bookeeping: + // let's do some bookkeeping: uint32_t nfloats = 0; uint32_t nints = 0; uint32_t nstrings = 0; diff --git a/Examples/Cxx/FixBrokenJ2K.cxx b/Examples/Cxx/FixBrokenJ2K.cxx index c7c8e15e03..1931a2097e 100644 --- a/Examples/Cxx/FixBrokenJ2K.cxx +++ b/Examples/Cxx/FixBrokenJ2K.cxx @@ -22,7 +22,7 @@ // -> BuggyJ2Kvvvua-fixed2-j2k.dcm /* - * This program attemps to fix a broken J2K/DICOM: + * This program attempts to fix a broken J2K/DICOM: * It contains 2 bugs: * 1. The first 8 bytes seems to be random bytes: remove them * 2. YCC is set to 1, while image is grayscale need to set it back to 0 diff --git a/Examples/Cxx/FixJAIBugJPEGLS.cxx b/Examples/Cxx/FixJAIBugJPEGLS.cxx index 01bd0580cb..376b4f851b 100644 --- a/Examples/Cxx/FixJAIBugJPEGLS.cxx +++ b/Examples/Cxx/FixJAIBugJPEGLS.cxx @@ -100,7 +100,7 @@ int main(int argc, char *argv[]) char errorMsg[256+1]={'\0'}; if (JpegLsReadHeader(buffer, totalLen, &metadata, errorMsg) != charls::ApiResult::OK) { - std::cerr << "Cant parse jpegls: " << errorMsg << std::endl; + std::cerr << "Can't parse jpegls: " << errorMsg << std::endl; return 1; } @@ -170,7 +170,7 @@ int main(int argc, char *argv[]) } if( !marker_lse ) { - std::cerr << "Cant handle: " << metadata.bitsPerSample << std::endl; + std::cerr << "Can't handle: " << metadata.bitsPerSample << std::endl; return 1; } @@ -184,7 +184,7 @@ int main(int argc, char *argv[]) #endif const char *pbyteCompressed = vbuffer.data(); - size_t cbyteCompressed = vbuffer.size(); // updated legnth + size_t cbyteCompressed = vbuffer.size(); // updated length JlsParameters params; JpegLsReadHeader(pbyteCompressed, cbyteCompressed, ¶ms, nullptr); diff --git a/Examples/Cxx/GenFakeImage.cxx b/Examples/Cxx/GenFakeImage.cxx index 705e153383..1021d0c9a3 100644 --- a/Examples/Cxx/GenFakeImage.cxx +++ b/Examples/Cxx/GenFakeImage.cxx @@ -85,7 +85,7 @@ int main(int, char *[]) // Step 2: DERIVED object gdcm::FileDerivation fd; - // For the pupose of this execise we will pretend that this image is referencing + // For the purpose of this exercise we will pretend that this image is referencing // two source image (we need to generate fake UID for that). const char ReferencedSOPClassUID[] = "1.2.840.10008.5.1.4.1.1.7"; // Secondary Capture fd.AddReference( ReferencedSOPClassUID, uid.Generate() ); diff --git a/Examples/Cxx/HelloVizWorld.cxx b/Examples/Cxx/HelloVizWorld.cxx index 00bae1de62..5d890d7c69 100644 --- a/Examples/Cxx/HelloVizWorld.cxx +++ b/Examples/Cxx/HelloVizWorld.cxx @@ -33,7 +33,7 @@ int main(int argc, char *argv[]) const char *filename = argv[1]; const char *outfilename = argv[2]; - // Instanciate the image reader: + // Instantiate the image reader: gdcm::ImageReader reader; reader.SetFileName( filename ); if( !reader.Read() ) diff --git a/Examples/Cxx/HelloWorld.cxx b/Examples/Cxx/HelloWorld.cxx index 45b2d09bd5..d9cb6149cb 100644 --- a/Examples/Cxx/HelloWorld.cxx +++ b/Examples/Cxx/HelloWorld.cxx @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) const char *filename = argv[1]; const char *outfilename = argv[2]; - // Instanciate the reader: + // Instantiate the reader: gdcm::Reader reader; reader.SetFileName( filename ); if( !reader.Read() ) @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) // the dataset is the the set of element we are interested in: gdcm::DataSet &ds = file.GetDataSet(); - // Contruct a static(*) type for Image Comments : + // Construct a static(*) type for Image Comments : gdcm::Attribute<0x0020,0x4000> imagecomments; imagecomments.SetValue( "Hello, World !" ); diff --git a/Examples/Cxx/LargeVRDSExplicit.cxx b/Examples/Cxx/LargeVRDSExplicit.cxx index ed225325db..bc85f7b02a 100644 --- a/Examples/Cxx/LargeVRDSExplicit.cxx +++ b/Examples/Cxx/LargeVRDSExplicit.cxx @@ -23,7 +23,7 @@ * gdcmConformanceTests/RTStruct_VRDSAsVRUN.dcm * * This is an advanced example. Its goal is to explain one dark corner of DICOM PS 3.10 - * file format. The idea is that when writting an Attribute in an Explicit Transfer + * file format. The idea is that when writing an Attribute in an Explicit Transfer * Syntax one, cannot always use V:DS for writing a VR:DS attribute since dong so * would imply using a VL:16bits. * This example shows that converting from Implicit to Explicit should preserver VR:UN diff --git a/Examples/Cxx/MrProtocol.cxx b/Examples/Cxx/MrProtocol.cxx index 67bc0c3e1a..b168a7f89e 100644 --- a/Examples/Cxx/MrProtocol.cxx +++ b/Examples/Cxx/MrProtocol.cxx @@ -493,7 +493,7 @@ One can find it also in the protocol: ... */ - // Below is an attemp to play with the CSAHeader dict: + // Below is an attempt to play with the CSAHeader dict: #if 0 const char gspec[] = "sGRADSPEC.flSensitivityX"; it = mymap.find( gspec ); diff --git a/Examples/Cxx/PatchFile.cxx b/Examples/Cxx/PatchFile.cxx index 5e440f31b3..22b087114b 100644 --- a/Examples/Cxx/PatchFile.cxx +++ b/Examples/Cxx/PatchFile.cxx @@ -110,7 +110,7 @@ int main(int argc, char *argv[]) } std::cout << bv->GetLength() << " " << len << std::endl; - std::cout << "Sucess to rewrite image !" << std::endl; + std::cout << "Success to rewrite image !" << std::endl; image.Print( std::cout ); return 0; } diff --git a/Examples/Cxx/PrintLUT.cxx b/Examples/Cxx/PrintLUT.cxx index 4d5a280ec5..1d4e774e1a 100644 --- a/Examples/Cxx/PrintLUT.cxx +++ b/Examples/Cxx/PrintLUT.cxx @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) } const char *filename = argv[1]; - // Instanciate the image reader: + // Instantiate the image reader: gdcm::ImageReader reader; reader.SetFileName( filename ); if( !reader.Read() ) diff --git a/Examples/Cxx/PublicDict.cxx b/Examples/Cxx/PublicDict.cxx index 4fb14e6cbd..32ff8d886c 100644 --- a/Examples/Cxx/PublicDict.cxx +++ b/Examples/Cxx/PublicDict.cxx @@ -29,7 +29,7 @@ int main(int , char *[]) //std::cout << pub << std::endl; - // 3 differents way to access the same information + // 3 different ways to access the same information // 1. From the public dict only: gdcm::Tag patient_name(0x10,0x10); diff --git a/Examples/Cxx/ReadAndDumpDICOMDIR2.cxx b/Examples/Cxx/ReadAndDumpDICOMDIR2.cxx index bc8de1a5cd..0f6fd17383 100644 --- a/Examples/Cxx/ReadAndDumpDICOMDIR2.cxx +++ b/Examples/Cxx/ReadAndDumpDICOMDIR2.cxx @@ -224,7 +224,7 @@ const std::vector>& DICOMDIRReader::loa // VR field first_item_offset += it->GetVR().GetLength(); // VL field - // For Explicit VR: adventitiously VL field lenght = VR field lenght, + // For Explicit VR: adventitiously VL field length = VR field length, // for SQ 4 bytes: // http://dicom.nema.org/medical/dicom/current/output/html/part05.html#table_7.1-1 first_item_offset += it->GetVR().GetLength(); diff --git a/Examples/Cxx/ReadAndPrintAttributes.cxx b/Examples/Cxx/ReadAndPrintAttributes.cxx index 475c3224f6..e2c985e218 100644 --- a/Examples/Cxx/ReadAndPrintAttributes.cxx +++ b/Examples/Cxx/ReadAndPrintAttributes.cxx @@ -34,7 +34,7 @@ int main(int argc, char *argv[]) } const char *filename = argv[1]; - // Instanciate the reader: + // Instantiate the reader: gdcm::Reader reader; reader.SetFileName( filename ); if( !reader.Read() ) diff --git a/Examples/Cxx/pmsct_rgb1.cxx b/Examples/Cxx/pmsct_rgb1.cxx index 22263be03b..6ffa36b061 100644 --- a/Examples/Cxx/pmsct_rgb1.cxx +++ b/Examples/Cxx/pmsct_rgb1.cxx @@ -74,7 +74,7 @@ void delta_decode(const unsigned char *data_in, size_t data_size, size_t ps = plane_size; // The following is highly unoptimized as we have nested if statement in a while loop - // we need to switch from one algorithm to ther other (RGB <-> GRAY) + // we need to switch from one algorithm to the other (RGB <-> GRAY) while (ps) { // next byte: @@ -130,7 +130,7 @@ void delta_decode(const unsigned char *data_in, size_t data_size, } break; case COLORMODE: - // We are swithing from one mode to the other. The stream contains an intermixed + // We are switching from one mode to the other. The stream contains an intermixed // compression of RGB codec and GRAY codec. Each one not knowing of the other // reset old value to 0. if (graymode) diff --git a/Examples/Python/FixCommaBug.py b/Examples/Python/FixCommaBug.py index d3476ca878..9b77d8acd2 100644 --- a/Examples/Python/FixCommaBug.py +++ b/Examples/Python/FixCommaBug.py @@ -73,5 +73,5 @@ print "there is still a comma" sys.exit(1) -print "Sucess!" +print "Success!" sys.exit(0) # success diff --git a/Examples/Python/HelloWorld.py b/Examples/Python/HelloWorld.py index aa60ec3f4d..b80486f0ae 100644 --- a/Examples/Python/HelloWorld.py +++ b/Examples/Python/HelloWorld.py @@ -29,7 +29,7 @@ # Get the filename from the command line filename = sys.argv[1] - # Instanciate a gdcm.Reader + # Instantiate a gdcm.Reader # This is the main class to handle any type of DICOM object # You should check for gdcm.ImageReader for reading specifically DICOM Image file r = gdcm.Reader() diff --git a/Examples/Python/PrivateDict.py b/Examples/Python/PrivateDict.py index f0be4c7e9a..4e9c411f10 100644 --- a/Examples/Python/PrivateDict.py +++ b/Examples/Python/PrivateDict.py @@ -22,7 +22,7 @@ #gdcm.Trace.DebugOn() globInst = gdcm.Global.GetInstance() # Try to load Part3.xml file - # This fils is too big for being accessible directly at runtime. + # This file is too big for being accessible directly at runtime. globInst.LoadResourcesFiles() diff --git a/Examples/Python/ReWriteSCAsMR.py b/Examples/Python/ReWriteSCAsMR.py index 2059941afa..21c834ff16 100644 --- a/Examples/Python/ReWriteSCAsMR.py +++ b/Examples/Python/ReWriteSCAsMR.py @@ -57,7 +57,7 @@ def CheckSecondaryCaptureObjectIsMRImageStorage(r): if( CheckSecondaryCaptureObjectIsMRImageStorage(r) ): # Special handling of the spacing: - # GDCM 1.2.0 would not rewrite correcly DICOM Object and would always set them as 'Secondary Capture Image Storage' + # GDCM 1.2.0 would not rewrite correctly DICOM Object and would always set them as 'Secondary Capture Image Storage' # while we would rather have 'MR Image Storage' gdcm.ImageHelper.SetForcePixelSpacing( True ) mrspacing = gdcm.ImageHelper.GetSpacingValue( r.GetFile() ) diff --git a/Examples/Python/RemovePrivateTags.py b/Examples/Python/RemovePrivateTags.py index 0de39d4fa5..4e007b275b 100644 --- a/Examples/Python/RemovePrivateTags.py +++ b/Examples/Python/RemovePrivateTags.py @@ -27,7 +27,7 @@ file1 = sys.argv[1] file2 = sys.argv[2] - # Instanciate the reader. + # Instantiate the reader. r = gdcm.Reader() r.SetFileName( file1 ) if not r.Read(): diff --git a/Examples/Python/ScanDirectory.py b/Examples/Python/ScanDirectory.py index f8fdad3345..c1bef82abd 100644 --- a/Examples/Python/ScanDirectory.py +++ b/Examples/Python/ScanDirectory.py @@ -40,7 +40,7 @@ def EndFilter(self): # Get rid of any Warning while parsing the DICOM files gdcm.Trace.WarningOff() - # instanciate Scanner: + # instantiate Scanner: sp = gdcm.Scanner.New(); s = sp.__ref__() w = ProgressWatcher(s, 'Watcher') diff --git a/INSTALL.txt b/INSTALL.txt index b87671b3eb..12fedd1078 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -31,6 +31,6 @@ Major options explained: * GDCM_WRAP_PHP: turn it on if you want to be able to access the GDCM API via php (experimental) * GDCM_USE_VTK: turn if on if you want to be able to load DICOM file in VTK context (requires VTK) * GDCM_BUILD_APPLICATIONS: turn it on if you want the build gdcm applications (gdcmdump, gdcmconv, gdcminfo ...) -* GDCM_BUILD_TESTING: Turn it on if you want to be able to exectute GDCM testing suite +* GDCM_BUILD_TESTING: Turn it on if you want to be able to execute GDCM testing suite * GDCM_DOCUMENTATION: turn it on if you want to generate the developer documentation (require doxygen) * GDCM_BUILD_EXAMPLES: turn it on if you want to build simple examples that demonstrates GDCM usage. diff --git a/Source/DataStructureAndEncodingDefinition/gdcmVR.h b/Source/DataStructureAndEncodingDefinition/gdcmVR.h index 83f2935ee2..95bda498d0 100644 --- a/Source/DataStructureAndEncodingDefinition/gdcmVR.h +++ b/Source/DataStructureAndEncodingDefinition/gdcmVR.h @@ -178,9 +178,9 @@ class GDCM_EXPORT VR // For some reason this seems slower on my linux box... is.seekg(2, std::ios::cur ); #else - char dum[2]; - is.read(dum, 2); - if( !(dum[0] == 0 && dum[1] == 0 )) + char dumb[2]; + is.read(dumb, 2); + if( !(dumb[0] == 0 && dumb[1] == 0 )) { // JDDICOM_Sample4.dcm gdcmDebugMacro( "32bits VR contains non zero bytes. Skipped" ); @@ -205,8 +205,8 @@ class GDCM_EXPORT VR // See PS 3.5, Data Element Structure With Explicit VR if( vrfield & VL32 ) { - const char dum[2] = {0, 0}; - os.write(dum,2); + const char dumb[2] = {0, 0}; + os.write(dumb,2); } return os; } diff --git a/Source/InformationObjectDefinition/gdcmIODEntry.h b/Source/InformationObjectDefinition/gdcmIODEntry.h index af208f1017..d63cfababf 100644 --- a/Source/InformationObjectDefinition/gdcmIODEntry.h +++ b/Source/InformationObjectDefinition/gdcmIODEntry.h @@ -51,7 +51,7 @@ Types specified in the Modules in Annex C shall be supported. class GDCM_EXPORT IODEntry { public: - IODEntry(const char *name = "", const char *ref = "", const char *usag = ""):Name(name),Ref(ref),usage(usag) { + IODEntry(const char *name = "", const char *ref = "", const char *inUsage = ""):Name(name),Ref(ref),usage(inUsage) { } friend std::ostream& operator<<(std::ostream& _os, const IODEntry &_val); @@ -64,7 +64,7 @@ class GDCM_EXPORT IODEntry void SetRef(const char *ref) { Ref = ref; } const char *GetRef() const { return Ref.c_str(); } - void SetUsage(const char *usag) { usage = usag; } + void SetUsage(const char *inUsage) { usage = inUsage; } const char *GetUsage() const { return usage.c_str(); } Usage::UsageType GetUsageType() const; diff --git a/Source/MediaStorageAndFileFormat/gdcmStreamImageWriter.cxx b/Source/MediaStorageAndFileFormat/gdcmStreamImageWriter.cxx index b172f8c2ee..2ff2fa2f5a 100644 --- a/Source/MediaStorageAndFileFormat/gdcmStreamImageWriter.cxx +++ b/Source/MediaStorageAndFileFormat/gdcmStreamImageWriter.cxx @@ -150,7 +150,7 @@ int StreamImageWriter::WriteRawHeader(RAWCodec* inCodec, std::ostream* inStream) //Addition by Manoj memcpy(&(tmpBuffer1[4*sizeof(uint16_t)]), &fifthTag, sizeof(uint32_t));// Data Element Length 4 bytes - // Basic OffSet Tabl with No Item Value + // Basic OffSet Table with No Item Value memcpy(&(tmpBuffer1[4*sizeof(uint16_t)+sizeof(uint32_t)]), &sixthTag, sizeof(uint16_t)); //fffe memcpy(&(tmpBuffer1[5*sizeof(uint16_t)+sizeof(uint32_t)]), &seventhTag, sizeof(uint16_t));//e000 memcpy(&(tmpBuffer1[6*sizeof(uint16_t)+sizeof(uint32_t)]), &eightthTag, sizeof(uint32_t));//00000000H diff --git a/Testing/Source/Common/Cxx/TestSmartPointer.cxx b/Testing/Source/Common/Cxx/TestSmartPointer.cxx index e1e2cc0678..4c1f59a5ce 100644 --- a/Testing/Source/Common/Cxx/TestSmartPointer.cxx +++ b/Testing/Source/Common/Cxx/TestSmartPointer.cxx @@ -26,9 +26,9 @@ class Foo : public Object { } }; -class Containter { +class Container { public: - Containter():Instance(nullptr) {} + Container():Instance(nullptr) {} SmartPointer Instance; }; @@ -100,8 +100,8 @@ int TestSmartPointer(int, char *[]) Foo &foo = *p7; foo.foo(); - Containter c1; - Containter c2; + Container c1; + Container c2; c2 = c1; // TODO: diff --git a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReader3.cxx b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReader3.cxx index 893f73f74d..4d9cf7787c 100644 --- a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReader3.cxx +++ b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReader3.cxx @@ -162,7 +162,7 @@ std::istream & DoTheMMapRead(std::istream &is) int TestRead3(const char *subdir, const char * filename) { -/// FIXME Because GDCM is seeging back and forth in the DICOM file +/// FIXME Because GDCM is seeking back and forth in the DICOM file // we cannot just apply mmap on any file, so let's clean them first: // gdcm::Reader r; diff --git a/Utilities/Release/bootstrap.sh b/Utilities/Release/bootstrap.sh index 1de33ae2da..c50733e1d3 100755 --- a/Utilities/Release/bootstrap.sh +++ b/Utilities/Release/bootstrap.sh @@ -20,7 +20,7 @@ cd $HOME/.cache/winetricks/junk # install VS 2005/SP1 # see why: https://code.google.com/p/winetricks/issues/detail?id=18 wget -c http://download.microsoft.com/download/7/7/3/7737290f-98e8-45bf-9075-85cc6ae34bf1/VS80sp1-KB926748-X86-INTL.exe -# now instal SP1 +# now install SP1 #wine VS80sp1-KB926748-X86-INTL.exe fi diff --git a/Utilities/VTK/Applications/gdcm2vtk.cxx b/Utilities/VTK/Applications/gdcm2vtk.cxx index 3ccb59f501..344aec0df9 100644 --- a/Utilities/VTK/Applications/gdcm2vtk.cxx +++ b/Utilities/VTK/Applications/gdcm2vtk.cxx @@ -734,7 +734,7 @@ int main(int argc, char *argv[]) writer->SetCompressionType( vtkGDCMImageWriter::RLE_COMPRESSION ); } - // HACK: call it *after* instanciating vtkGDCMImageWriter + // HACK: call it *after* instantiating vtkGDCMImageWriter if( !gdcm::UIDGenerator::IsValid( study_uid.c_str() ) ) { std::cerr << "Invalid UID for Study UID: " << study_uid << std::endl; diff --git a/Utilities/VTK/CMakeLists.txt b/Utilities/VTK/CMakeLists.txt index 0d1724aeac..2a25a55860 100644 --- a/Utilities/VTK/CMakeLists.txt +++ b/Utilities/VTK/CMakeLists.txt @@ -707,7 +707,7 @@ if(GDCM_WRAP_JAVA) endif() if(EXISTS /usr/lib/jni/libvtkCommonJava.so) # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=533198 - message(STATUS "Implicitely adding debian package layout...") + message(STATUS "Implicitly adding debian package layout...") link_directories("/usr/lib/jni") endif() mark_as_advanced(GDCM_VTK_JAVA_JAR) @@ -777,7 +777,7 @@ if(GDCM_WRAP_JAVA) message(WARNING "Could not find vtk.jar file, VTK_JAVA_JAR is wrong: ${VTK_JAVA_JAR}, please set proper GDCM_VTK_JAVA_JAR: ${GDCM_VTK_JAVA_JAR} replacement var") endif() else() - message(STATUS "GDCM_WRAP_JAVA canot be build without VTK_WRAP_JAVA") + message(STATUS "GDCM_WRAP_JAVA cannot be build without VTK_WRAP_JAVA") endif() endif() @@ -853,7 +853,7 @@ if(GDCM_WRAP_PYTHON) endif() else() - message(STATUS "GDCM_WRAP_PYTHON canot be build without VTK_WRAP_PYTHON") + message(STATUS "GDCM_WRAP_PYTHON cannot be build without VTK_WRAP_PYTHON") endif() endif() diff --git a/Utilities/VTK/Examples/Cxx/gdcmorthoplanes.cxx b/Utilities/VTK/Examples/Cxx/gdcmorthoplanes.cxx index 9bfb2d8c13..358d9f221a 100644 --- a/Utilities/VTK/Examples/Cxx/gdcmorthoplanes.cxx +++ b/Utilities/VTK/Examples/Cxx/gdcmorthoplanes.cxx @@ -366,7 +366,7 @@ int main( int argc, char *argv[] ) ren1->SetViewport(0,0,0.58333,1); ren2->SetViewport(0.58333,0,1,1); - // Set the actors' postions + // Set the actors' positions // renWin->Render(); //iren->SetEventPosition( 175,175); diff --git a/Utilities/VTK/Examples/Cxx/gdcmreslice.cxx b/Utilities/VTK/Examples/Cxx/gdcmreslice.cxx index 91bfc36c58..bb42774320 100644 --- a/Utilities/VTK/Examples/Cxx/gdcmreslice.cxx +++ b/Utilities/VTK/Examples/Cxx/gdcmreslice.cxx @@ -131,7 +131,7 @@ int main( int argc, char *argv[] ) transform->Concatenate(invert); //axes2->SetShaftTypeToCylinder(); axes2->SetUserTransform( transform ); - cube->GetAssembly()->SetUserTransform( transform ); // cant get it to work + cube->GetAssembly()->SetUserTransform( transform ); // can't get it to work vtkPropAssembly* assembly = vtkPropAssembly::New(); assembly->AddPart( axes2 ); diff --git a/Utilities/VTK/Examples/Cxx/gdcmtexture.cxx b/Utilities/VTK/Examples/Cxx/gdcmtexture.cxx index 6eed0383b4..19c84d153e 100644 --- a/Utilities/VTK/Examples/Cxx/gdcmtexture.cxx +++ b/Utilities/VTK/Examples/Cxx/gdcmtexture.cxx @@ -107,8 +107,8 @@ int main( int argc, char *argv[] ) transform->Concatenate(reader->GetDirectionCosines()); //axes2->SetShaftTypeToCylinder(); axes2->SetUserTransform( transform ); - //cube->SetUserTransform( transform ); // cant get it to work - cube->GetAssembly()->SetUserTransform( transform ); // cant get it to work + //cube->SetUserTransform( transform ); // can't get it to work + cube->GetAssembly()->SetUserTransform( transform ); // can't get it to work vtkPropAssembly* assembly = vtkPropAssembly::New(); assembly->AddPart( axes2 ); diff --git a/Utilities/VTK/Examples/Java/AWTMedical3.java b/Utilities/VTK/Examples/Java/AWTMedical3.java index 6911aee7b1..3b02828ad8 100644 --- a/Utilities/VTK/Examples/Java/AWTMedical3.java +++ b/Utilities/VTK/Examples/Java/AWTMedical3.java @@ -185,9 +185,9 @@ public AWTMedical3(File inFile) { // Now we are creating three orthogonal planes passing through the // volume. Each plane uses a different texture map and therefore has - // diferent coloration. + // different coloration. - // Start by creatin a black/white lookup table. + // Start by creating a black/white lookup table. vtkLookupTable bwLut = new vtkLookupTable(); bwLut.SetTableRange(0, 2000); bwLut.SetSaturationRange(0, 0); @@ -222,12 +222,12 @@ public AWTMedical3(File inFile) { // Note also that by specifying the DisplayExtent, the pipeline // requests data of this extent and the vtkImageMapToColors only // processes a slice of data. - vtkImageMapToColors saggitalColors = new vtkImageMapToColors(); - saggitalColors.SetInput(theImageData); - saggitalColors.SetLookupTable(bwLut); - vtkImageActor saggital = new vtkImageActor(); - saggital.SetInput(saggitalColors.GetOutput()); - saggital.SetDisplayExtent(32, 32, 0, 63, 0, 92); + vtkImageMapToColors sagittalColors = new vtkImageMapToColors(); + sagittalColors.SetInput(theImageData); + sagittalColors.SetLookupTable(bwLut); + vtkImageActor sagittal = new vtkImageActor(); + sagittal.SetInput(sagittalColors.GetOutput()); + sagittal.SetDisplayExtent(32, 32, 0, 63, 0, 92); // Create the second (axial); plane of the three planes. We use the same // approach as before except that the extent differs. @@ -260,7 +260,7 @@ public AWTMedical3(File inFile) { // Actors are added to the renderer. An initial camera view is created. // The Dolly() method moves the camera towards the FocalPoint, // thereby enlarging the image. - renWin.GetRenderer().AddActor(saggital); + renWin.GetRenderer().AddActor(sagittal); renWin.GetRenderer().AddActor(axial); renWin.GetRenderer().AddActor(coronal); renWin.GetRenderer().AddActor(outline); diff --git a/Utilities/VTK/Examples/Java/HelloVTKWorld.java b/Utilities/VTK/Examples/Java/HelloVTKWorld.java index 240fd43db0..86d7c68a5e 100644 --- a/Utilities/VTK/Examples/Java/HelloVTKWorld.java +++ b/Utilities/VTK/Examples/Java/HelloVTKWorld.java @@ -11,7 +11,7 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -// We are required to call the package 'vtk' eventhough I (MM) would have prefered +// We are required to call the package 'vtk' even though I (MM) would have preferred // an import statement along the line of: // import vtkgdcm.*; import vtk.*; diff --git a/Utilities/VTK/Examples/Java/ReadSeriesIntoVTK.java b/Utilities/VTK/Examples/Java/ReadSeriesIntoVTK.java index a61c8520c8..68a7cbe656 100644 --- a/Utilities/VTK/Examples/Java/ReadSeriesIntoVTK.java +++ b/Utilities/VTK/Examples/Java/ReadSeriesIntoVTK.java @@ -11,7 +11,7 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -// We are required to call the package 'vtk' eventhough I (MM) would have prefered +// We are required to call the package 'vtk' even though I (MM) would have preferred // an import statement along the line of: // import vtkgdcm.*; import vtk.*; diff --git a/Utilities/VTK/Testing/Cxx/TestvtkGDCMImageWriter1.cxx b/Utilities/VTK/Testing/Cxx/TestvtkGDCMImageWriter1.cxx index 14abf51fef..5db72b8ed6 100644 --- a/Utilities/VTK/Testing/Cxx/TestvtkGDCMImageWriter1.cxx +++ b/Utilities/VTK/Testing/Cxx/TestvtkGDCMImageWriter1.cxx @@ -203,7 +203,7 @@ int TestvtkGDCMImageWrite(const char *filename, bool verbose = false) std::cerr << "Missing md5: " << digest << std::endl; } else if( strcmp(digest, ref) != 0 - // I do not support rewritting 12Bits pack image (illegal anyway) + // I do not support rewriting 12Bits pack image (illegal anyway) && comppf != gdcm::PixelFormat::UINT12 ) { diff --git a/Utilities/VTK/Testing/Python/TestvtkGDCMThreadedImageReader2.py b/Utilities/VTK/Testing/Python/TestvtkGDCMThreadedImageReader2.py index b41b088b7d..b9f2c984aa 100644 --- a/Utilities/VTK/Testing/Python/TestvtkGDCMThreadedImageReader2.py +++ b/Utilities/VTK/Testing/Python/TestvtkGDCMThreadedImageReader2.py @@ -82,7 +82,7 @@ def PrintProgress(object, event): r.SetNumberOfScalarComponents( numberOfScalarComponents ) r.SetDataOrigin( origin ) r.SetDataSpacing( spacing ) - # Useless only for backward compatibily, the real shift/scale will be read from files: + # Useless only for backward compatibility, the real shift/scale will be read from files: #r.SetShift( intercept_slope[0] ) #r.SetScale( intercept_slope[1] ) diff --git a/Utilities/VTK/VTK4/vtkMedicalImageProperties.h b/Utilities/VTK/VTK4/vtkMedicalImageProperties.h index 796edd035a..2eef539539 100644 --- a/Utilities/VTK/VTK4/vtkMedicalImageProperties.h +++ b/Utilities/VTK/VTK4/vtkMedicalImageProperties.h @@ -137,14 +137,14 @@ class VTKGDCM_EXPORT vtkMedicalImageProperties : public vtkObject // Description: // Study Time - // Format: hhmmss.frac (any trailing component(s) can be ommited) + // Format: hhmmss.frac (any trailing component(s) can be omitted) // For ex: DICOM (0008,0030) = 162552.0705 or 230012, or 0012 vtkSetStringMacro(StudyTime); vtkGetStringMacro(StudyTime); // Description: // Acquisition time - // Format: hhmmss.frac (any trailing component(s) can be ommited) + // Format: hhmmss.frac (any trailing component(s) can be omitted) // For ex: DICOM (0008,0032) = 162552.0705 or 230012, or 0012 vtkSetStringMacro(AcquisitionTime); vtkGetStringMacro(AcquisitionTime); @@ -177,7 +177,7 @@ class VTKGDCM_EXPORT vtkMedicalImageProperties : public vtkObject // Description: // Image Time - // Format: hhmmss.frac (any trailing component(s) can be ommited) + // Format: hhmmss.frac (any trailing component(s) can be omitted) // For ex: DICOM (0008,0033) = 162552.0705 or 230012, or 0012 vtkSetStringMacro(ImageTime); vtkGetStringMacro(ImageTime); diff --git a/Utilities/VTK/vtkGDCMImageReader.cxx b/Utilities/VTK/vtkGDCMImageReader.cxx index e561aea0a7..c620343005 100644 --- a/Utilities/VTK/vtkGDCMImageReader.cxx +++ b/Utilities/VTK/vtkGDCMImageReader.cxx @@ -754,7 +754,7 @@ int vtkGDCMImageReader::RequestInformationCompat() gdcm::MediaStorage ms; ms.SetFromFile( reader.GetFile() ); assert( gdcm::MediaStorage::IsImage( ms ) || ms == gdcm::MediaStorage::MRSpectroscopyStorage ); - // There is no point in adding world info to a SC object since noone but GDCM can use this info... + // There is no point in adding world info to a SC object since no one but GDCM can use this info... //if( ms != gdcm::MediaStorage::SecondaryCaptureImageStorage ) const double *spacing = image.GetSpacing(); @@ -815,7 +815,7 @@ int vtkGDCMImageReader::RequestInformationCompat() // We are doing the Y-flip: // translate Image Position (Patient) along the Y-vector of the Image Orientation (Patient): // Step 1: Compute norm of translation vector: - // Because position is in the center of the pixel, we need to substract 1 to the dimY: + // Because position is in the center of the pixel, we need to subtract 1 to the dimY: assert( dims[1] >=1 ); double norm = (dims[1] - 1) * this->DataSpacing[1]; // Step 2: translate: diff --git a/Utilities/VTK/vtkGDCMImageReader.h b/Utilities/VTK/vtkGDCMImageReader.h index a0146b4943..dc77d0c18e 100644 --- a/Utilities/VTK/vtkGDCMImageReader.h +++ b/Utilities/VTK/vtkGDCMImageReader.h @@ -42,7 +42,7 @@ // as specified in the Image Orientation (Patient) tag. When Z-spacing is 0, this means the multi-frame object // contains image which do not represent uniform volume. // .SECTION Warning -// When using vtkGDCMPolyDataReader in conjonction with vtkGDCMImageReader +// When using vtkGDCMPolyDataReader in conjunction with vtkGDCMImageReader // it is *required* that FileLowerLeft is set to ON as coordinate system // would be inconsistent in between the two data structures. // .SECTION Color Space mapping: @@ -177,7 +177,7 @@ class VTKGDCM_EXPORT vtkGDCMImageReader : public vtkMedicalImageReader2 // Description: // Get Overlay/IconImage // Remember to ALWAYS use those methods in your code, as the internal number for the output port - // is not garantee to remain the same, as features are added to the reader + // is not guaranteed to remain the same, as features are added to the reader #if (VTK_MAJOR_VERSION >= 5) || ( VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 5 ) //FIXME: Need to get rid of BTX/ETX if only the Python Wrapper of VTK 4.2 would let me //BTX @@ -215,7 +215,7 @@ class VTKGDCM_EXPORT vtkGDCMImageReader : public vtkMedicalImageReader2 // Description: // Return the 'raw' information stored in the DICOM file: // In case of a series of multiple files, only the first file is considered. The Image Orientation (Patient) - // is garantee to remain the same, and image Image Position (Patient) in other slice can be computed + // is guaranteed to remain the same, and image Image Position (Patient) in other slice can be computed // using the ZSpacing (3rd dimension) // (0020,0032) DS [87.774866\-182.908510\168.629671] # 32, 3 ImagePositionPatient // (0020,0037) DS [0.001479\0.999989\-0.004376\-0.002039\-0.004372\-0.999988] # 58, 6 ImageOrientationPatient diff --git a/Utilities/VTK/vtkGDCMImageReader2.cxx b/Utilities/VTK/vtkGDCMImageReader2.cxx index 80bf550d28..266c1270a7 100644 --- a/Utilities/VTK/vtkGDCMImageReader2.cxx +++ b/Utilities/VTK/vtkGDCMImageReader2.cxx @@ -592,7 +592,7 @@ int vtkGDCMImageReader2::RequestInformationCompat() // We are doing the Y-flip: // translate Image Position (Patient) along the Y-vector of the Image Orientation (Patient): // Step 1: Compute norm of translation vector: - // Because position is in the center of the pixel, we need to substract 1 to the dimY: + // Because position is in the center of the pixel, we need to subtract 1 to the dimY: assert( dims[1] >=1 ); double norm = (dims[1] - 1) * this->DataSpacing[1]; // Step 2: translate: diff --git a/Utilities/VTK/vtkGDCMImageReader2.h b/Utilities/VTK/vtkGDCMImageReader2.h index 148ac04fb2..01f9ea2e2e 100644 --- a/Utilities/VTK/vtkGDCMImageReader2.h +++ b/Utilities/VTK/vtkGDCMImageReader2.h @@ -42,7 +42,7 @@ // as specified in the Image Orientation (Patient) tag. When Z-spacing is 0, this means the multi-frame object // contains image which do not represent uniform volume. // .SECTION Warning -// When using vtkGDCMPolyDataReader in conjonction with vtkGDCMImageReader2 +// When using vtkGDCMPolyDataReader in conjunction with vtkGDCMImageReader2 // it is *required* that FileLowerLeft is set to ON as coordinate system // would be inconsistent in between the two data structures. // .SECTION Color Space mapping: @@ -156,7 +156,7 @@ class VTKGDCM_EXPORT vtkGDCMImageReader2 : public vtkMedicalImageReader2 // Description: // Get Overlay/IconImage // Remember to ALWAYS use those methods in your code, as the internal number for the output port - // is not garantee to remain the same, as features are added to the reader + // is not guaranteed to remain the same, as features are added to the reader vtkAlgorithmOutput* GetOverlayPort(int index); vtkAlgorithmOutput* GetIconImagePort(); vtkImageData* GetOverlay(int i); @@ -189,7 +189,7 @@ class VTKGDCM_EXPORT vtkGDCMImageReader2 : public vtkMedicalImageReader2 // Description: // Return the 'raw' information stored in the DICOM file: // In case of a series of multiple files, only the first file is considered. The Image Orientation (Patient) - // is garantee to remain the same, and image Image Position (Patient) in other slice can be computed + // is guaranteed to remain the same, and image Image Position (Patient) in other slice can be computed // using the ZSpacing (3rd dimension) // (0020,0032) DS [87.774866\-182.908510\168.629671] # 32, 3 ImagePositionPatient // (0020,0037) DS [0.001479\0.999989\-0.004376\-0.002039\-0.004372\-0.999988] # 58, 6 ImageOrientationPatient @@ -204,7 +204,7 @@ class VTKGDCM_EXPORT vtkGDCMImageReader2 : public vtkMedicalImageReader2 // Description: // \DEPRECATED: // Modality LUT - // Value returned by GetShift/GetScale might be inacurate since Shift/Scale could be + // Value returned by GetShift/GetScale might be inaccurate since Shift/Scale could be // varying along the Series read. Therefore user are advices not to use those functions // anymore vtkGetMacro(Shift,double); diff --git a/Utilities/VTK/vtkGDCMImageWriter.cxx b/Utilities/VTK/vtkGDCMImageWriter.cxx index a64f0d4af7..37e1245a58 100644 --- a/Utilities/VTK/vtkGDCMImageWriter.cxx +++ b/Utilities/VTK/vtkGDCMImageWriter.cxx @@ -555,7 +555,7 @@ int vtkGDCMImageWriter::WriteGDCMData(vtkImageData *data, int timeStep) case VTK_FLOAT: if( this->Shift == (int)this->Shift && this->Scale == (int)this->Scale ) { - // I cannot consider that this is a problem, afterall a floating point type image + // I cannot consider that this is a problem, after all a floating point type image // could in fact really be only integer type, only print a warning to inform dummy user vtkWarningMacro( "Image is floating point type, but rescale type is integer type. Rescaling anyway" ); } @@ -569,7 +569,7 @@ int vtkGDCMImageWriter::WriteGDCMData(vtkImageData *data, int timeStep) case VTK_DOUBLE: if( this->Shift == (int)this->Shift && this->Scale == (int)this->Scale ) { - // I cannot consider that this is a problem, afterall a floating point type image + // I cannot consider that this is a problem, after all a floating point type image // could in fact really be only integer type, only print a warning to inform dummy user vtkWarningMacro( "Image is floating point type, but rescale type is integer type. Rescaling anyway" ); } diff --git a/Utilities/VTK/vtkGDCMImageWriter.h b/Utilities/VTK/vtkGDCMImageWriter.h index 7e85ebf8e9..aad3c6d4cd 100644 --- a/Utilities/VTK/vtkGDCMImageWriter.h +++ b/Utilities/VTK/vtkGDCMImageWriter.h @@ -74,7 +74,7 @@ class VTKGDCM_EXPORT vtkGDCMImageWriter : public vtkImageWriter virtual void Write(); // Description: - // Get the entension for this file format. + // Get the extension for this file format. virtual const char* GetFileExtensions() { return ".dcm .DCM"; } diff --git a/Utilities/VTK/vtkGDCMMedicalImageProperties.h b/Utilities/VTK/vtkGDCMMedicalImageProperties.h index 1cc33bd6dd..4fd63146ae 100644 --- a/Utilities/VTK/vtkGDCMMedicalImageProperties.h +++ b/Utilities/VTK/vtkGDCMMedicalImageProperties.h @@ -121,14 +121,14 @@ class VTKGDCM_EXPORT vtkGDCMMedicalImageProperties : public vtkMedicalImagePrope // Description: // Study Time - // Format: hhmmss.frac (any trailing component(s) can be ommited) + // Format: hhmmss.frac (any trailing component(s) can be omitted) // For ex: DICOM (0008,0030) = 162552.0705 or 230012, or 0012 vtkSetStringMacro(StudyTime); vtkGetStringMacro(StudyTime); // Description: // Acquisition time - // Format: hhmmss.frac (any trailing component(s) can be ommited) + // Format: hhmmss.frac (any trailing component(s) can be omitted) // For ex: DICOM (0008,0032) = 162552.0705 or 230012, or 0012 vtkSetStringMacro(AcquisitionTime); vtkGetStringMacro(AcquisitionTime); @@ -161,7 +161,7 @@ class VTKGDCM_EXPORT vtkGDCMMedicalImageProperties : public vtkMedicalImagePrope // Description: // Image Time - // Format: hhmmss.frac (any trailing component(s) can be ommited) + // Format: hhmmss.frac (any trailing component(s) can be omitted) // For ex: DICOM (0008,0033) = 162552.0705 or 230012, or 0012 vtkSetStringMacro(ImageTime); vtkGetStringMacro(ImageTime); diff --git a/Utilities/VTK/vtkGDCMPolyDataReader.cxx b/Utilities/VTK/vtkGDCMPolyDataReader.cxx index b74037f526..98c7ef5b36 100644 --- a/Utilities/VTK/vtkGDCMPolyDataReader.cxx +++ b/Utilities/VTK/vtkGDCMPolyDataReader.cxx @@ -363,7 +363,7 @@ refinstanceuid.GetValue().c_str() ); // get the info object vtkInformation *outInfo1 = outputVector->GetInformationObject(pd); - // get the ouptut + // get the output vtkPolyData *output = vtkPolyData::SafeDownCast( outInfo1->Get(vtkDataObject::DATA_OBJECT())); @@ -652,7 +652,7 @@ int vtkGDCMPolyDataReader::RequestData_HemodynamicWaveformStorage(gdcm::Reader c int pd = 0; vtkInformation *outInfo1 = outputVector->GetInformationObject(pd); - // get the ouptut + // get the output vtkPolyData *output = vtkPolyData::SafeDownCast( outInfo1->Get(vtkDataObject::DATA_OBJECT())); diff --git a/Utilities/VTK/vtkGDCMPolyDataReader.h b/Utilities/VTK/vtkGDCMPolyDataReader.h index aadd7bfd9e..cc2ad42b25 100644 --- a/Utilities/VTK/vtkGDCMPolyDataReader.h +++ b/Utilities/VTK/vtkGDCMPolyDataReader.h @@ -17,7 +17,7 @@ // .SECTION TODO // Need to do the same job for DVH Sequence/DVH Data... // .SECTION Warning -// When using vtkGDCMPolyDataReader in conjonction with vtkGDCMImageReader +// When using vtkGDCMPolyDataReader in conjunction with vtkGDCMImageReader // it is *required* that FileLowerLeft is set to ON as coordinate system // would be inconsistent in between the two data structures. // diff --git a/Utilities/VTK/vtkGDCMThreadedImageReader.cxx b/Utilities/VTK/vtkGDCMThreadedImageReader.cxx index eb75839e25..d50a3fee27 100644 --- a/Utilities/VTK/vtkGDCMThreadedImageReader.cxx +++ b/Utilities/VTK/vtkGDCMThreadedImageReader.cxx @@ -281,7 +281,7 @@ struct threadparams unsigned int nfiles; // number of files the thread will process char *scalarpointer; // start of the image buffer affected to the thread char *overlayscalarpointer; - unsigned long len; // This is not required but useful to check if files are consistant + unsigned long len; // This is not required but useful to check if files are consistent unsigned long overlaylen; unsigned long totalfiles; // total number of files being processed (needed to compute progress) pthread_mutex_t lock; // critial section for updating progress @@ -324,7 +324,7 @@ void *ReadFilesThread(void *voidparams) // BUG: //const double shift = params->reader->GetShift(); //const double scale = params->reader->GetScale(); - // This is NOT safe to assume that shift/scale is constant thoughout the Series, this is better to + // This is NOT safe to assume that shift/scale is constant throughout the Series, this is better to // read the shift/scale from the image const gdcm::Image &image = reader.GetImage(); diff --git a/Utilities/VTK/vtkGDCMThreadedImageReader2.cxx b/Utilities/VTK/vtkGDCMThreadedImageReader2.cxx index 6df2ea2929..2e6a2e932b 100644 --- a/Utilities/VTK/vtkGDCMThreadedImageReader2.cxx +++ b/Utilities/VTK/vtkGDCMThreadedImageReader2.cxx @@ -98,7 +98,7 @@ void vtkGDCMThreadedImageReader2Execute(vtkGDCMThreadedImageReader2 *self, //printf("outExt:%d,%d,%d,%d,%d,%d\n", // outExt[0], outExt[1], outExt[2], outExt[3], outExt[4], outExt[5]); // FIXME: - // The code could be a little tidier, all I am trying to do here is differenciate the + // The code could be a little tidier, all I am trying to do here is differentiate the // case where we have a series of 2D files and the case where we have a single multi-frames // files... vtkIdType maxfiles = self->GetFileNames()->GetNumberOfValues(); @@ -298,7 +298,7 @@ int vtkGDCMThreadedImageReader2::RequestInformation ( // For streaming and threads. Splits output update extent into num pieces. // This method needs to be called num times. Results must not overlap for // consistent starting extent. Subclass can override this method. -// This method returns the number of peices resulting from a successful split. +// This method returns the number of pieces resulting from a successful split. // This can be from 1 to "total". // If 1 is returned, the extent cannot be split. int vtkGDCMThreadedImageReader2::SplitExtent(int splitExt[6], int startExt[6], diff --git a/Utilities/VTK/vtkGDCMThreadedImageReader2.h b/Utilities/VTK/vtkGDCMThreadedImageReader2.h index db17525ffd..93544dae46 100644 --- a/Utilities/VTK/vtkGDCMThreadedImageReader2.h +++ b/Utilities/VTK/vtkGDCMThreadedImageReader2.h @@ -30,7 +30,7 @@ // // .SECTION FIXME: need to implement reading of series of 3D files // -// .SECTION Implementation note: this class is meant to superseed vtkGDCMThreadedImageReader +// .SECTION Implementation note: this class is meant to supersede vtkGDCMThreadedImageReader // because it had support for ProgressEvent support even from python layer. There is a // subtle trick down in the threading mechanism in VTK were the main thread (talking to the // python interpreter) is also part of the execution process (and the N-1 other thread diff --git a/Utilities/VTK/vtkImagePlanarComponentsToComponents.cxx b/Utilities/VTK/vtkImagePlanarComponentsToComponents.cxx index af0e5444e1..dfbea93d06 100644 --- a/Utilities/VTK/vtkImagePlanarComponentsToComponents.cxx +++ b/Utilities/VTK/vtkImagePlanarComponentsToComponents.cxx @@ -75,7 +75,7 @@ void vtkImagePlanarComponentsToComponentsExecute(vtkImagePlanarComponentsToCompo const T *inPtr = (T*)inData->GetScalarPointer(outExt[0],outExt[2],outExt[4]); T *outPtr = static_cast(outData->GetScalarPointer(outExt[0],outExt[2],outExt[4])); - // Loop through ouput pixels + // Loop through output pixels size_t framesize = (maxX+1) * (maxY+1) * 3; for(int z = 0; z <= maxZ; ++z) diff --git a/Utilities/VTK/vtkImageRGBToYBR.cxx b/Utilities/VTK/vtkImageRGBToYBR.cxx index 3b2a400e11..5f8c55182d 100644 --- a/Utilities/VTK/vtkImageRGBToYBR.cxx +++ b/Utilities/VTK/vtkImageRGBToYBR.cxx @@ -60,7 +60,7 @@ void vtkImageRGBToYBRExecute(vtkImageRGBToYBR *self, // find the region to loop over int maxC = inData->GetNumberOfScalarComponents()-1; - // Loop through ouput pixels + // Loop through output pixels while (!outIt.IsAtEnd()) { T* inSI = inIt.BeginSpan(); diff --git a/Utilities/VTK/vtkImageYBRToRGB.cxx b/Utilities/VTK/vtkImageYBRToRGB.cxx index 60aad2c0c4..f691a4c750 100644 --- a/Utilities/VTK/vtkImageYBRToRGB.cxx +++ b/Utilities/VTK/vtkImageYBRToRGB.cxx @@ -60,7 +60,7 @@ void vtkImageYBRToRGBExecute(vtkImageYBRToRGB *self, int maxC = inData->GetNumberOfScalarComponents()-1; int R, G, B; - // Loop through ouput pixels + // Loop through output pixels while (!outIt.IsAtEnd()) { T* inSI = inIt.BeginSpan(); diff --git a/Utilities/VTK/vtkgdcm.py b/Utilities/VTK/vtkgdcm.py index a927072c85..d0c1e2e09b 100644 --- a/Utilities/VTK/vtkgdcm.py +++ b/Utilities/VTK/vtkgdcm.py @@ -54,7 +54,7 @@ else: from vtkgdcmPython import * -# to provide a compatibilty layer with VTK 4.2 and VTK 4.4 where vtkStringArray was not present +# to provide a compatibility layer with VTK 4.2 and VTK 4.4 where vtkStringArray was not present # and VTK 5.x where there is one... try: # if vtkStringArray can be found in vtk let's use it ! diff --git a/Utilities/doxygen/CMakeLists.txt b/Utilities/doxygen/CMakeLists.txt index 754d28c073..c53a877a47 100644 --- a/Utilities/doxygen/CMakeLists.txt +++ b/Utilities/doxygen/CMakeLists.txt @@ -103,7 +103,7 @@ if(GDCM_DOCUMENTATION) find_program(SED_EXECUTABLE sed) find_package(LATEX REQUIRED) mark_as_advanced(PDFOPT_EXECUTABLE SED_EXECUTABLE) - # Let's customize the pdf tags a little usind sed: + # Let's customize the pdf tags a little using sed: # Apparently egrep is also needed... # BAD: there is a circular dependency where refman.tex depend on refman.tex in the sed steps... # hack our way in anyway by simply removing the dep... @@ -163,7 +163,7 @@ if(GDCM_DOCUMENTATION) ) add_dependencies(DoxygenDoc GDCMDoxygenPDF) else() - # make DoxygenDoc depends on the final tarball thus all file are garantee to be generated + # make DoxygenDoc depends on the final tarball thus all file are guarantee to be generated add_custom_target(GDCMDoxygenDoc DEPENDS ${GDCM_DOC_TARBALL} COMMENT "GDCM: Executing GDCMDoxygenDoc" diff --git a/Utilities/doxygen/README.txt.in b/Utilities/doxygen/README.txt.in index 287f9ee1e9..339a1e1457 100644 --- a/Utilities/doxygen/README.txt.in +++ b/Utilities/doxygen/README.txt.in @@ -1,7 +1,7 @@ /** \mainpage GDCM Documentation -This is the developpers documentation. +This is the developers documentation. A PDF version of this doxygen documentation can be found here: diff --git a/Utilities/doxygen/man/gdcmanon.xml b/Utilities/doxygen/man/gdcmanon.xml index 21c972cd7f..3a75a92f14 100644 --- a/Utilities/doxygen/man/gdcmanon.xml +++ b/Utilities/doxygen/man/gdcmanon.xml @@ -231,6 +231,9 @@ In this case one could simply do, as a first step execute the reversible anonymi $ gdcmanon --dumb --remove 400,500 --remove 12,62 --remove 12,63 anonymized_reversible.dcm anonymized_irreversible.dcm +In recent GDCM version those two independent gdcmanon steps can be executed using simply:$ gdcmanon input.dcm anonymized_irreversible.dcm +Or if one want for readability:$ gdcmanon -e input.dcm anonymized_irreversible.dcm + Remarks: As mentioned in DICOM Sup 142, this anonymization is preferred over de-identification since: It is not required that the Encrypted Attributes Data Set be created; indeed, there may be circumstances where the Dataset is expected to be archived long enough that any contemporary encryption technology may be inadequate to provide long term protection against unauthorized recovery of identification diff --git a/Utilities/doxygen/man/gdcmclean.xml b/Utilities/doxygen/man/gdcmclean.xml index 0ae208e6ba..6aaf7da8fb 100644 --- a/Utilities/doxygen/man/gdcmclean.xml +++ b/Utilities/doxygen/man/gdcmclean.xml @@ -141,7 +141,7 @@ file-out DICOM output directory DICOM Path -For ease of use on shell cmmand the syntax allow for the '/' separator in the DICOM Path notation. So the following is valid +For ease of use on shell command the syntax allow for the '/' separator in the DICOM Path notation. So the following is valid "/0040,0100/1/0040,0006" However Private Creator can use all of Value Representation LO definition. So in some case you will be required to use backslash as separator (since illegal in VR:LO): "\\4109,2,Applicare/Centricity Radiology Web/Version 1.0" diff --git a/Utilities/doxygen/man/gdcmconv.xml b/Utilities/doxygen/man/gdcmconv.xml index 673920445c..f10eb9ea50 100644 --- a/Utilities/doxygen/man/gdcmconv.xml +++ b/Utilities/doxygen/man/gdcmconv.xml @@ -324,7 +324,7 @@ When no option other is used, only the dataset is inspected. So encapsulated Pix $ gdcmconv --jpeg gdcmData/simpleImageWithIcon.dcm uncompressed_icon.dcm -In the following example we will explicitly compress the Icon Image Sequence Pixel Data attibute. In that case the same Transfer Syntax is being used for both the main Pixel Data and the Pixel Data from the Icon Image Sequence: +In the following example we will explicitly compress the Icon Image Sequence Pixel Data attribute. In that case the same Transfer Syntax is being used for both the main Pixel Data and the Pixel Data from the Icon Image Sequence: $ gdcmconv --jpeg --compress-icon gdcmData/simpleImageWithIcon.dcm compressed_icon.dcm diff --git a/Utilities/doxygen/vtk/doc_makeall.sh.in b/Utilities/doxygen/vtk/doc_makeall.sh.in index a9f2451b81..fc2d59f44a 100644 --- a/Utilities/doxygen/vtk/doc_makeall.sh.in +++ b/Utilities/doxygen/vtk/doc_makeall.sh.in @@ -215,7 +215,7 @@ echo "Build the full-text index - done" # fi # ---------------------------------------------------------------------------- -# Retrieve the (gziped) VTK 4 tag file and decompress it +# Retrieve the (gzipped) VTK 4 tag file and decompress it if test "x$DOWNLOAD_VTK_TAGFILE" == "xON" ; then if test "x$VTK_TAGFILE" != "x" ; then diff --git a/Utilities/gdcmext/csa.c b/Utilities/gdcmext/csa.c index ad95a6eca4..bbab6b3914 100644 --- a/Utilities/gdcmext/csa.c +++ b/Utilities/gdcmext/csa.c @@ -228,7 +228,7 @@ static bool read_info(struct app *self, struct csa_info *i) { // syngodt (signed) s = fread_mirror(&i->syngodt, sizeof i->syngodt, 1, self); ERROR_RETURN(s, 1); - // numer of items + // number of items s = fread_mirror(&i->nitems, sizeof i->nitems, 1, self); if (self->csa_type == SV10) assert(i->nitems % 6 == 0); ERROR_RETURN(s, 1); diff --git a/Utilities/gdcmjpeg/README.GDCM.txt b/Utilities/gdcmjpeg/README.GDCM.txt index 7e19b0705b..3d0fd3e549 100644 --- a/Utilities/gdcmjpeg/README.GDCM.txt +++ b/Utilities/gdcmjpeg/README.GDCM.txt @@ -80,4 +80,4 @@ patch -p0 < previous-gdcm.patch (5) NOTE for later: -(shoud we disable getenv just as dcmtk ? there is a ijg flag for that NO_ENV or something similar +(should we disable getenv just as dcmtk ? there is a ijg flag for that NO_ENV or something similar diff --git a/Utilities/getopt/CMakeLists.txt b/Utilities/getopt/CMakeLists.txt index ea4878b0ff..4b303d04b5 100644 --- a/Utilities/getopt/CMakeLists.txt +++ b/Utilities/getopt/CMakeLists.txt @@ -39,7 +39,7 @@ set(GETOPT_LIBRARY_PROPERTIES ${GETOPT_LIBRARY_PROPERTIES} ) # Only build this lib static. On most unix system -# we will be using the standart getopt +# we will be using the standard getopt # so this lib will be for the poor Win32 user (those # guys really need help) add_library(${GETOPT_LIBRARY_NAME} ${GETOPT_SRCS}) diff --git a/Wrapping/Csharp/docstrings.i b/Wrapping/Csharp/docstrings.i index a35b5d7838..ba28531149 100644 --- a/Wrapping/Csharp/docstrings.i +++ b/Wrapping/Csharp/docstrings.i @@ -262,7 +262,7 @@ public"; // File: classgdcm_1_1Attribute.xml %typemap("csclassmodifiers") gdcm::Attribute " /** Attribute class This class use template metaprograming tricks to let the user know -when the template instanciation does not match the public dictionary. +when the template instantiation does not match the public dictionary. Typical example that compile is: Attribute<0x0008,0x9007> a = {\"ORIGINAL\",\"PRIMARY\",\"T1\",\"NONE\"}; @@ -802,7 +802,7 @@ gdcm::Bitmap::Clear() */ public"; %csmethodmodifiers gdcm::Bitmap::GetBuffer " /** bool gdcm::Bitmap::GetBuffer(char *buffer) const -Acces the raw data. +Access the raw data. */ public"; @@ -965,7 +965,7 @@ gdcm::Bitmap::~Bitmap() */ public"; // File: classgdcm_1_1ByteBuffer.xml %typemap("csclassmodifiers") gdcm::ByteBuffer " /** ByteBuffer. -Detailled description here looks like a std::streambuf or std::filebuf +Detailed description here looks like a std::streambuf or std::filebuf class with the get and peek pointer C++ includes: gdcmByteBuffer.h */ public class"; @@ -989,7 +989,7 @@ gdcm::ByteBuffer::UpdatePosition() */ public"; // File: classgdcm_1_1ByteSwap.xml %typemap("csclassmodifiers") gdcm::ByteSwap " /** ByteSwap. -Perform machine dependent byte swaping (Little Endian, Big Endian, Bad +Perform machine dependent byte swapping (Little Endian, Big Endian, Bad Little Endian, Bad Big Endian). TODO: bswap_32 / bswap_64 ... C++ includes: gdcmByteSwap.h */ public class"; @@ -1579,7 +1579,7 @@ WARNING: : You need to check for NULL return value SequenceOfItems in those case the return of the function will be NULL, while the Value would be a valid SequenceOfItems, in those case prefer GetValueAsSQ. In which case the code internally trigger an assert to -warn developper. +warn developer. */ public"; @@ -1608,7 +1608,7 @@ SmartPointer gdcm::DataElement::GetValueAsSQ() const Interpret the Value stored in the DataElement. This is more robust (but also more expensive) to call this function rather than the -simpliest form: GetSequenceOfItems() It also return NULL when the +simplest form: GetSequenceOfItems() It also return NULL when the Value is NOT of type SequenceOfItems WARNING: in case GetSequenceOfItems() succeed the function return this value, otherwise it creates a new SequenceOfItems, you should handle that in your case, @@ -2048,7 +2048,7 @@ DictEntry& gdcm::Dict::GetDictEntryByName(const char *name, Tag &tag) const Inefficient way of looking up tag by name. Technically DICOM does not -garantee uniqueness (and Curve / Overlay are there to prove it). But +guarantee uniqueness (and Curve / Overlay are there to prove it). But most of the time name is in fact uniq and can be uniquely link to a tag @@ -2060,7 +2060,7 @@ gdcm::Dict::IsEmpty() const */ public"; // File: classgdcm_1_1DictConverter.xml %typemap("csclassmodifiers") gdcm::DictConverter " /** Class to -convert a .dic file into something else: CXX code : embeded dict into +convert a .dic file into something else: CXX code : embedded dict into shared lib (DICT_DEFAULT) Debug mode (DICT_DEBUG) @@ -2312,7 +2312,7 @@ gdcm::DirectionCosines::~DirectionCosines() */ public"; manipulation directories. This implementation provide a cross platform implementation for -manipulating directores: basically traversing directories and +manipulating directories: basically traversing directories and harvesting files will not take into account unix type hidden file recursive option will @@ -2896,7 +2896,7 @@ Write. %typemap("csclassmodifiers") gdcm::Filename " /** Class to manipulate file name's. -OS independant representation of a filename (to query path, name and +OS independent representation of a filename (to query path, name and extension from a filename) C++ includes: gdcmFilename.h */ public class"; @@ -3241,7 +3241,7 @@ Access the generated DICOM UID's. itk::GDCMImageIO2::itkGetStringMacro(UIDPrefix) Macro to access the DICOM UID prefix. By default this is the ITK root -id. This default can be overriden if the exam is for example part of +id. This default can be overridden if the exam is for example part of an existing study. */ public"; @@ -3329,7 +3329,7 @@ that the IORegion has been set properly. %csmethodmodifiers itk::GDCMImageIO2::WriteImageInformation " /** virtual void itk::GDCMImageIO2::WriteImageInformation() -Writes the spacing and dimentions of the image. Assumes SetFileName +Writes the spacing and dimensions of the image. Assumes SetFileName has been called with a valid file name. */ public"; @@ -3374,7 +3374,7 @@ load time %csmethodmodifiers gdcm::Global::LoadResourcesFiles " /** bool gdcm::Global::LoadResourcesFiles() -Load all internal XML files, ressource path need to have been set +Load all internal XML files, resource path need to have been set before calling this member function (see Append/Prepend members func) WARNING: not thread safe ! @@ -3383,7 +3383,7 @@ WARNING: not thread safe ! %csmethodmodifiers gdcm::Global::Prepend " /** bool gdcm::Global::Prepend(const char *path) -Prepend path at the begining of the path list WARNING: not thread +Prepend path at the beginning of the path list WARNING: not thread safe ! */ public"; @@ -3500,7 +3500,7 @@ gdcm::Image::GetSpacing(unsigned int idx) const */ public"; gdcm::Image::GetSpacing() const Return a 3-tuples specifying the spacing NOTE: 3rd value can be an -aribtrary 1 value when the spacing was not specified (ex. 2D image). +arbitrary 1 value when the spacing was not specified (ex. 2D image). WARNING: when the spacing is not specifier, a default value of 1 will be returned @@ -3597,7 +3597,7 @@ gdcm::ImageApplyLookupTable::~ImageApplyLookupTable() */ public"; %typemap("csclassmodifiers") gdcm::ImageChangePhotometricInterpretation " /** ImageChangePhotometricInterpretation class Class to change the -Photometric Interpetation of an input DICOM. +Photometric Interpretation of an input DICOM. C++ includes: gdcmImageChangePhotometricInterpretation.h */ public class"; @@ -3642,7 +3642,7 @@ gdcm::ImageChangePhotometricInterpretation::~ImageChangePhotometricInterpretatio %typemap("csclassmodifiers") gdcm::ImageChangePlanarConfiguration " /** ImageChangePlanarConfiguration class Class to change the Planar configuration of an input DICOM By default it will change into the -more usual reprensentation: PlanarConfiguration = 0. +more usual representation: PlanarConfiguration = 0. C++ includes: gdcmImageChangePlanarConfiguration.h */ public class"; @@ -4114,7 +4114,7 @@ Usage::UsageType gdcm::IODEntry::GetUsageType() const */ public"; %csmethodmodifiers gdcm::IODEntry::IODEntry " /** gdcm::IODEntry::IODEntry(const char *name=\"\", const char *ref=\"\", -const char *usag=\"\") */ public"; +const char *usage=\"\") */ public"; %csmethodmodifiers gdcm::IODEntry::SetIE " /** void gdcm::IODEntry::SetIE(const char *ie) */ public"; @@ -4126,7 +4126,7 @@ gdcm::IODEntry::SetName(const char *name) */ public"; gdcm::IODEntry::SetRef(const char *ref) */ public"; %csmethodmodifiers gdcm::IODEntry::SetUsage " /** void -gdcm::IODEntry::SetUsage(const char *usag) */ public"; +gdcm::IODEntry::SetUsage(const char *usage) */ public"; // File: classgdcm_1_1IODs.xml @@ -4178,7 +4178,7 @@ duplicate and will FAIL in case of duplicate IPP. WARNING: See special note for SetZSpacingTolerance when computing the ZSpacing from the IPP of each DICOM files (default tolerance for -consistant spacing is: 1e-6mm) +consistent spacing is: 1e-6mm) C++ includes: gdcmIPPSorter.h */ public class"; @@ -4218,7 +4218,7 @@ along the Series gdcm::IPPSorter::SetZSpacingTolerance(double tol) 2. Another reason for failure is that that Z-Spacing is only slightly -changing (eg 1e-3) along the serie, a human can determine that this is +changing (eg 1e-3) along the series, a human can determine that this is ok and change the tolerance from its default value: 1e-6 */ public"; @@ -4228,8 +4228,8 @@ gdcm::IPPSorter::Sort(std::vector< std::string > const &filenames) Main entry point to the sorter. It will execute the filter, option should be set before running this function (SetZSpacingTolerance, ...) -Return value indicate if sorting could be achived. Warning this does -*NOT* imply that spacing is consistant, it only means the file are +Return value indicate if sorting could be achieved. Warning this does +*NOT* imply that spacing is consistent, it only means the file are sorted according to IPP You should check if ZSpacing is 0 or not to deduce if file are actually a 3D volume @@ -4256,7 +4256,7 @@ gdcm::IPPSorter::~IPPSorter() */ public"; Item A component of the value of a Data Element that is of Value Representation Sequence of Items. An Item contains a Data Set . See PS 3.5 7.5.1 Item Encoding Rules Each Item of a Data Element of VR SQ -shall be encoded as a DICOM Standart Data Element with a specific Data +shall be encoded as a DICOM Standard Data Element with a specific Data Element Tag of Value (FFFE,E000). The Item Tag is followed by a 4 byte Item Length field encoded in one of the following two ways Explicit/ Implicit. @@ -5109,7 +5109,7 @@ C++ includes: gdcmObject.h */ public class"; %csmethodmodifiers gdcm::Object::Object " /** gdcm::Object::Object(const Object &) -Special requirement for copy/cstor, assigment operator. +Special requirement for copy/cstor, assignment operator. */ public"; @@ -5178,7 +5178,7 @@ gdcm::Orientation::~Orientation() */ public"; see AreOverlaysInPixelData Todo Is there actually any way to recognize an overlay ? On images with multiple overlay I do not see any way to -differenciate them (other than the group tag). Example: +differentiate them (other than the group tag). Example: C++ includes: gdcmOverlay.h */ public class"; @@ -5402,7 +5402,7 @@ virtual gdcm::ParseException::~ParseException() throw () */ public"; %typemap("csclassmodifiers") gdcm::Parser " /** Parser ala XML_Parser from expat (SAX). -Detailled description here Simple API for DICOM +Detailed description here Simple API for DICOM C++ includes: gdcmParser.h */ public class"; @@ -5623,7 +5623,7 @@ pi=UNKNOW) */ public"; // File: classgdcm_1_1PixelFormat.xml %typemap("csclassmodifiers") gdcm::PixelFormat " /** PixelFormat. -By default the Pixel Type will be instanciated with the following +By default the Pixel Type will be instantiated with the following parameters: SamplesPerPixel : 1 BitsAllocated : 8 @@ -6269,7 +6269,7 @@ This class is a non-validating reader, it will only performs well- formedness check only, and to some extent catch known error (non well- formed document). -Detailled description here +Detailed description here A DataSet DOES NOT contains group 0x0002 @@ -6960,7 +6960,7 @@ public"; // File: classgdcm_1_1SerieHelper.xml %typemap("csclassmodifiers") gdcm::SerieHelper " /** DO NOT USE this class, it is only a temporary solution for ITK migration from GDCM 1.x -to GDCM 2.x It will disapear soon, you've been warned. +to GDCM 2.x It will disappear soon, you've been warned. Instead see gdcm::ImageHelper or gdcm::IPPSorter @@ -7263,7 +7263,7 @@ includes: gdcmStaticAssert.h */ public class"; %typemap("csclassmodifiers") gdcm::String " /** String. TDelimiter template parameter is used to separate multiple String (VM1 ->) TMaxLength is only a hint. Noone actually respect the max length +>) TMaxLength is only a hint. No one actually respect the max length TPadChar is the string padding (0 or space) C++ includes: gdcmString.h */ public class"; @@ -7436,7 +7436,7 @@ gdcmSwapper.h */ public class"; %typemap("csclassmodifiers") gdcm::System " /** Class to do system operation. -OS independant functionalities +OS independent functionalities C++ includes: gdcmSystem.h */ public class"; @@ -7653,7 +7653,7 @@ Read a tag from binary representation. gdcm::Tag::ReadFromCommaSeparatedString(const char *str) Read from a comma separated string. This is a highly user oriented -function, the string should be formated as: 1234,5678 to specify the +function, the string should be formatted as: 1234,5678 to specify the tag (0x1234,0x5678) The notation comes from the DICOM standard, and is handy to use from a command line program @@ -8253,7 +8253,7 @@ gdcm::VR::Write(std::ostream &os) const */ public"; %typemap("csclassmodifiers") gdcm::VR16ExplicitDataElement " /** Class to read/write a DataElement as Explicit Data Element. -This class support 16 bits when finding an unkown VR: For instance: +This class support 16 bits when finding an unknown VR: For instance: Siemens_CT_Sensation64_has_VR_RT.dcm C++ includes: gdcmVR16ExplicitDataElement.h */ public class"; @@ -9074,7 +9074,7 @@ gdcm::Waveform::Waveform() */ public"; (Document Object Model) This class is a non-validating writer, it will only performs well- formedness check only. -Detailled description here To avoid GDCM being yet another broken +Detailed description here To avoid GDCM being yet another broken DICOM lib we try to be user level and avoid writing illegal stuff (odd length, non-zero value for Item start/end length ...) Therefore you cannot (well unless you are really smart) write DICOM with even length @@ -9085,7 +9085,7 @@ Zero value for Item Length (0xfffe, 0xe00d/0xe0dd) Even length for any elements -Alphabetical order for elements (garanteed by design of internals) +Alphabetical order for elements (guaranteed by design of internals) 32bits VR will be rewritten with 00 diff --git a/Wrapping/Java/CMakeLists.txt b/Wrapping/Java/CMakeLists.txt index 82f6dfb90b..108ffcd07d 100644 --- a/Wrapping/Java/CMakeLists.txt +++ b/Wrapping/Java/CMakeLists.txt @@ -89,7 +89,7 @@ add_custom_command( # const as covariant return type COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -source ${GDCM_JAVA_SOURCE_VERSION} -target ${GDCM_JAVA_TARGET_VERSION} "gdcm/*.java" #${javafiles} # 2. now that the *.class have been generated construct the jar file. We can -# only rely on the gdcm.java / gdcm.class to build dependencie, I am pretty +# only rely on the gdcm.java / gdcm.class to build dependencies, I am pretty # sure it will break parallel builds... oh well COMMAND ${Java_JAR_EXECUTABLE} ARGS cf ${GDCM_LIBRARY_DIR}/gdcm.jar gdcm/*.class ${GDCM_JAVA_SRCS} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/java diff --git a/Wrapping/PHP/CMakeLists.txt b/Wrapping/PHP/CMakeLists.txt index 0b3f687649..9ce4f5a140 100644 --- a/Wrapping/PHP/CMakeLists.txt +++ b/Wrapping/PHP/CMakeLists.txt @@ -41,7 +41,7 @@ SWIG_LINK_LIBRARIES(php_gdcm LINK_PRIVATE gdcmMSFF gdcmMEXD) # with something like undefined reference to `zend_error' set_property(TARGET ${SWIG_MODULE_php_gdcm_REAL_NAME} PROPERTY NO_SONAME 1) -# Remove 'lib' prefix :no-op on windows and valid for UNIX based syste +# Remove 'lib' prefix :no-op on windows and valid for UNIX based systems set_target_properties(${SWIG_MODULE_php_gdcm_REAL_NAME} PROPERTIES PREFIX "") # For some reason the php glue module name is odd using swig 1.3.40, it is php_gdcm on windows diff --git a/Wrapping/Python/docstrings.i b/Wrapping/Python/docstrings.i index 060c8231b9..b6f2573cfa 100644 --- a/Wrapping/Python/docstrings.i +++ b/Wrapping/Python/docstrings.i @@ -6032,7 +6032,7 @@ See: DictEntry C++ includes: gdcmIODEntry.h "; %feature("docstring") gdcm::IODEntry::IODEntry "gdcm::IODEntry::IODEntry(const char *name=\"\", const char *ref=\"\", -const char *usag=\"\") "; +const char *usage=\"\") "; %feature("docstring") gdcm::IODEntry::GetIE "const char* gdcm::IODEntry::GetIE() const "; @@ -6059,7 +6059,7 @@ gdcm::IODEntry::SetName(const char *name) "; gdcm::IODEntry::SetRef(const char *ref) "; %feature("docstring") gdcm::IODEntry::SetUsage "void -gdcm::IODEntry::SetUsage(const char *usag) "; +gdcm::IODEntry::SetUsage(const char *usage) "; // File: classgdcm_1_1IODs.xml diff --git a/Wrapping/Python/gdcmPythonFilter.cxx b/Wrapping/Python/gdcmPythonFilter.cxx index f4d3919eaa..f2e0264c19 100644 --- a/Wrapping/Python/gdcmPythonFilter.cxx +++ b/Wrapping/Python/gdcmPythonFilter.cxx @@ -174,7 +174,7 @@ PyObject *DataElementToPyObject(DataElement const &de, VR const &vr) { const ByteValue *bv = de.GetByteValue(); std::string s( bv->GetPointer(), bv->GetLength() ); - s.resize( std::min( s.size(), strlen( s.c_str() ) ) ); // strlen is garantee to be lower or equal to ::size() + s.resize( std::min( s.size(), strlen( s.c_str() ) ) ); // strlen is guaranteed to be lower or equal to ::size() // http://www.python.org/doc/current/ext/buildValue.html // http://mail.python.org/pipermail/python-list/2002-April/137612.html unsigned int count; From 2797217d20d160cbd0caa0ae38959a993958d4d1 Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Fri, 22 Sep 2023 15:56:29 -0400 Subject: [PATCH 3/4] Added codespell config file --- .codespellrc | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .codespellrc diff --git a/.codespellrc b/.codespellrc new file mode 100644 index 0000000000..6771ed04bb --- /dev/null +++ b/.codespellrc @@ -0,0 +1,3 @@ +[codespell] +skip = ./Utilities/gdcmcharls,./Utilities/gdcmopenjpeg,./Utilities/gdcmrle,./Utilities/gdcmexpat,./Utilities/gdcmjpeg,./Utilities/gdcmzlib,./Utilities/pvrg,./Utilities/socketxx +ignore-words-list = convertor,possibile,iif,comando,oly,ofthe,didi,promis,alue,tutoriels,som,tabl,psot,cna,varian,pres,comparaison,serie,ore,ect,mor,setts,unknow,inout,te,nd,te,pinter,fo,ot,siz,ist,shs,invers,studi,wallthickness,vas,fith From b578ec5dbb4a0ebb77264cead75c0346b2bd26ee Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Fri, 22 Sep 2023 15:50:41 -0400 Subject: [PATCH 4/4] Converted file to plain ASCII --- .../Cxx/TestElement3.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestElement3.cxx b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestElement3.cxx index 4fec7f742c..2403534211 100644 --- a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestElement3.cxx +++ b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestElement3.cxx @@ -350,16 +350,16 @@ int main() pn2.Print( std::cout ); std::cout << std::endl; -// Rev. John Robert Quincy Adams, B.A. M.Div. “Adams^John Robert Quincy^^Rev.^B.A. M.Div.” [One family name; three given names; no middle name; one prefix; two suffixes.] +// Rev. John Robert Quincy Adams, B.A. M.Div. "Adams^John Robert Quincy^^Rev.^B.A. M.Div." [One family name; three given names; no middle name; one prefix; two suffixes.] PN pn3 = { "Adams", "John Robert Quincy", "", "Rev.", "B.A. M.Div." }; pn3.Print( std::cout ); std::cout << std::endl; -// Susan Morrison-Jones, Ph.D., Chief Executive Officer “Morrison-Jones^Susan^^^Ph.D., Chief Executive Officer” [Two family names; one given name; no middle name; no prefix; two suffixes.] +// Susan Morrison-Jones, Ph.D., Chief Executive Officer "Morrison-Jones^Susan^^^Ph.D., Chief Executive Officer" [Two family names; one given name; no middle name; no prefix; two suffixes.] PN pn4 = { "Morrison-Jones", "Susan", "", "", "Ph.D., Chief Executive Officer" }; pn4.Print( std::cout ); std::cout << std::endl; -// John Doe “Doe^John” [One family name; one given name; no middle name, prefix, or suffix. Delimiters have been omitted for the three trailing null components.] +// John Doe "Doe^John" [One family name; one given name; no middle name, prefix, or suffix. Delimiters have been omitted for the three trailing null components.] PN pn5 = { "Doe", "John" }; pn5.Print( std::cout ); std::cout << std::endl; @@ -371,7 +371,7 @@ int main() PN pn6 = { "Smith", "Fluffy" }; pn6.Print( std::cout ); std::cout << std::endl; -//ABC Farms^Running on Water [A horse whose responsible organization is named ABC Farms, and whose name is “Running On Water”] +//ABC Farms^Running on Water [A horse whose responsible organization is named ABC Farms, and whose name is "Running On Water"] PN pn7 = { "ABC Farms", "Running on Water" }; pn7.Print( std::cout ); std::cout << std::endl;