[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. b578ec5dbb4a0ebb77264cead75c0346b2
Cross-platform DICOM implementation
Brought to you by:
malat
Menu
▾
▴
[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. b578ec5dbb4a0ebb77264cead75c0346b2bd26ee
|
From: malat <ma...@us...> - 2023-10-30 14:21:26
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grassroots DICOM".
The branch, release has been updated
via b578ec5dbb4a0ebb77264cead75c0346b2bd26ee (commit)
via 2797217d20d160cbd0caa0ae38959a993958d4d1 (commit)
via 5bd685c94699506585932e624ea645035bba8016 (commit)
via 2c7fe209c1f16c1dfb4b50e5c3e4d4656990beb1 (commit)
from 868b8831ab61df3c1aa7963142e98952e18e97b9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://sourceforge.net/p/gdcm/gdcm/ci/b578ec5dbb4a0ebb77264cead75c0346b2bd26ee/
commit b578ec5dbb4a0ebb77264cead75c0346b2bd26ee
Author: Sean McBride <se...@ro...>
Date: Fri Sep 22 15:50:41 2023 -0400
Converted file to plain ASCII
diff --git a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestElement3.cxx b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestElement3.cxx
index 4fec7f742..240353421 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;
https://sourceforge.net/p/gdcm/gdcm/ci/2797217d20d160cbd0caa0ae38959a993958d4d1/
commit 2797217d20d160cbd0caa0ae38959a993958d4d1
Author: Sean McBride <se...@ro...>
Date: Fri Sep 22 15:56:29 2023 -0400
Added codespell config file
diff --git a/.codespellrc b/.codespellrc
new file mode 100644
index 000000000..6771ed04b
--- /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
https://sourceforge.net/p/gdcm/gdcm/ci/5bd685c94699506585932e624ea645035bba8016/
commit 5bd685c94699506585932e624ea645035bba8016
Author: Sean McBride <se...@ro...>
Date: Wed Sep 20 22:25:09 2023 -0400
Fixed various typos / spelling mistakes found by codespell tool
diff --git a/Applications/Cxx/puff.c b/Applications/Cxx/puff.c
index 1433785f9..00a2c4343 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 090eac57a..16160979d 100644
--- a/Examples/Csharp/BasicImageAnonymizer.cs
+++ b/Examples/Csharp/BasicImageAnonymizer.cs
@@ -23,7 +23,7 @@ public class BasicImageAnonymizer
{
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 eacfced2a..051279432 100644
--- a/Examples/Csharp/DecompressImageMultiframe.cs
+++ b/Examples/Csharp/DecompressImageMultiframe.cs
@@ -74,7 +74,7 @@ public class DecompressImageMultiframe
// 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 f0116e119..370637c0d 100644
--- a/Examples/Csharp/ReformatFile.cs
+++ b/Examples/Csharp/ReformatFile.cs
@@ -46,7 +46,7 @@ public class ReformatFile
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 5d5be4d28..3345a3d8e 100644
--- a/Examples/Csharp/StandardizeFiles.cs
+++ b/Examples/Csharp/StandardizeFiles.cs
@@ -35,7 +35,7 @@ public class StandardizeFiles
}
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 7b64c9430..d59c86aa9 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 c7c8e15e0..1931a2097 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 01bd0580c..376b4f851 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 705e15338..1021d0c9a 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 00bae1de6..5d890d7c6 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 45b2d09bd..d9cb6149c 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 ed225325d..bc85f7b02 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 67bc0c3e1..b168a7f89 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 5e440f31b..22b087114 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 4d5a280ec..1d4e774e1 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 4fb14e6cb..32ff8d886 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 bc8de1a5c..0f6fd1738 100644
--- a/Examples/Cxx/ReadAndDumpDICOMDIR2.cxx
+++ b/Examples/Cxx/ReadAndDumpDICOMDIR2.cxx
@@ -224,7 +224,7 @@ const std::vector<std::shared_ptr<DICOMDIRReader::Patient>>& 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 475c3224f..e2c985e21 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 22263be03..6ffa36b06 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 d3476ca87..9b77d8acd 100644
--- a/Examples/Python/FixCommaBug.py
+++ b/Examples/Python/FixCommaBug.py
@@ -73,5 +73,5 @@ if not image_reader.Read():
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 aa60ec3f4..b80486f0a 100644
--- a/Examples/Python/HelloWorld.py
+++ b/Examples/Python/HelloWorld.py
@@ -29,7 +29,7 @@ if __name__ == "__main__":
# 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 f0be4c7e9..4e9c411f1 100644
--- a/Examples/Python/PrivateDict.py
+++ b/Examples/Python/PrivateDict.py
@@ -22,7 +22,7 @@ if __name__ == "__main__":
#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 2059941af..21c834ff1 100644
--- a/Examples/Python/ReWriteSCAsMR.py
+++ b/Examples/Python/ReWriteSCAsMR.py
@@ -57,7 +57,7 @@ if __name__ == "__main__":
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 0de39d4fa..4e007b275 100644
--- a/Examples/Python/RemovePrivateTags.py
+++ b/Examples/Python/RemovePrivateTags.py
@@ -27,7 +27,7 @@ if __name__ == "__main__":
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 f8fdad334..c1bef82ab 100644
--- a/Examples/Python/ScanDirectory.py
+++ b/Examples/Python/ScanDirectory.py
@@ -40,7 +40,7 @@ if __name__ == "__main__":
# 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 b87671b3e..12fedd107 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 83f2935ee..95bda498d 100644
--- a/Source/DataStructureAndEncodingDefinition/gdcmVR.h
+++ b/Source/DataStructureAndEncodingDefinition/gdcmVR.h
@@ -178,9 +178,9 @@ public:
// 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 @@ public:
// 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 af208f101..d63cfabab 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 @@ public:
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 b172f8c2e..2ff2fa2f5 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 e1e2cc067..4c1f59a5c 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<Object> 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 893f73f74..4d9cf7787 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 1de33ae2d..c50733e1d 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 3ccb59f50..344aec0df 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 0d1724aea..2a25a5586 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 9bfb2d8c1..358d9f221 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 91bfc36c5..bb4277432 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 6eed0383b..19c84d153 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 6911aee7b..3b02828ad 100644
--- a/Utilities/VTK/Examples/Java/AWTMedical3.java
+++ b/Utilities/VTK/Examples/Java/AWTMedical3.java
@@ -185,9 +185,9 @@ public class AWTMedical3 extends JComponent implements VtkPanelContainer {
// 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 class AWTMedical3 extends JComponent implements VtkPanelContainer {
// 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 class AWTMedical3 extends JComponent implements VtkPanelContainer {
// 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 240fd43db..86d7c68a5 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 a61c8520c..68a7cbe65 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 14abf51fe..5db72b8ed 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 b41b088b7..b9f2c984a 100644
--- a/Utilities/VTK/Testing/Python/TestvtkGDCMThreadedImageReader2.py
+++ b/Utilities/VTK/Testing/Python/TestvtkGDCMThreadedImageReader2.py
@@ -82,7 +82,7 @@ if __name__ == "__main__":
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 796edd035..2eef53953 100644
--- a/Utilities/VTK/VTK4/vtkMedicalImageProperties.h
+++ b/Utilities/VTK/VTK4/vtkMedicalImageProperties.h
@@ -137,14 +137,14 @@ public:
// 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 @@ public:
// 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 e561aea0a..c62034300 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 a0146b494..dc77d0c18 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 @@ public:
// 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 @@ public:
// 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 80bf550d2..266c1270a 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 148ac04fb..01f9ea2e2 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 @@ public:
// 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 @@ public:
// 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 @@ public:
// 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 a64f0d4af..37e1245a5 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 7e85ebf8e..aad3c6d4c 100644
--- a/Utilities/VTK/vtkGDCMImageWriter.h
+++ b/Utilities/VTK/vtkGDCMImageWriter.h
@@ -74,7 +74,7 @@ public:
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 1cc33bd6d..4fd63146a 100644
--- a/Utilities/VTK/vtkGDCMMedicalImageProperties.h
+++ b/Utilities/VTK/vtkGDCMMedicalImageProperties.h
@@ -121,14 +121,14 @@ public:
// 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 @@ public:
// 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 b74037f52..98c7ef5b3 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 aadd7bfd9..cc2ad42b2 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 eb75839e2..d50a3fee2 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 6df2ea292..2e6a2e932 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 db17525ff..93544dae4 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 af0e5444e..dfbea93d0 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<T*>(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 3b2a400e1..5f8c55182 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 60aad2c0c..f691a4c75 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 a927072c8..d0c1e2e09 100644
--- a/Utilities/VTK/vtkgdcm.py
+++ b/Utilities/VTK/vtkgdcm.py
@@ -54,7 +54,7 @@ if os.name == 'posix':
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 754d28c07..c53a877a4 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 287f9ee1e..339a1e145 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 21c972cd7..3a75a92f1 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
<para><literallayout>$ gdcmanon --dumb --remove 400,500 --remove 12,62 --remove 12,63 anonymized_reversible.dcm anonymized_irreversible.dcm
</literallayout></para>
+<para>In recent GDCM version those two independent gdcmanon steps can be executed using simply:<literallayout>$ gdcmanon input.dcm anonymized_irreversible.dcm</literallayout></para>
+<para>Or if one want for readability:<literallayout>$ gdcmanon -e input.dcm anonymized_irreversible.dcm</literallayout></para>
+
<para><formalpara><title>Remarks: </title>
<para>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</para>
diff --git a/Utilities/doxygen/man/gdcmclean.xml b/Utilities/doxygen/man/gdcmclean.xml
index 0ae208e6b..6aaf7da8f 100644
--- a/Utilities/doxygen/man/gdcmclean.xml
+++ b/Utilities/doxygen/man/gdcmclean.xml
@@ -141,7 +141,7 @@ file-out DICOM output directory
<refsection xml:id="gdcmclean_1caveat">
<title>DICOM Path</title>
-<para>For ease of use on shell cmmand the syntax allow for the '/' separator in the DICOM Path notation. So the following is valid</para>
+<para>For ease of use on shell command the syntax allow for the '/' separator in the DICOM Path notation. So the following is valid</para>
<para><literallayout>"/0040,0100/1/0040,0006"</literallayout></para>
<para>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):</para>
<para><literallayout>"\\4109,2,Applicare/Centricity Radiology Web/Version 1.0"</literallayout></para>
diff --git a/Utilities/doxygen/man/gdcmconv.xml b/Utilities/doxygen/man/gdcmconv.xml
index 673920445..f10eb9ea5 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
<para><literallayout>$ gdcmconv --jpeg gdcmData/simpleImageWithIcon.dcm uncompressed_icon.dcm
</literallayout></para>
-<para>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:</para>
+<para>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:</para>
<para><literallayout>$ gdcmconv --jpeg --compress-icon gdcmData/simpleImageWithIcon.dcm compressed_icon.dcm
</literallayout></para>
diff --git a/Utilities/doxygen/vtk/doc_makeall.sh.in b/Utilities/doxygen/vtk/doc_makeall.sh.in
index a9f2451b8..fc2d59f44 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 ad95a6eca..bbab6b391 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 7e19b0705..3d0fd3e54 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 ea4878b0f..4b303d04b 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 a35b5d783..ba2853114 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...
[truncated message content] |
