From fefc9b7857bfe001051ec94a59256f6c7b684277 Mon Sep 17 00:00:00 2001 From: jpr Date: Sun, 6 Feb 2005 14:43:27 +0000 Subject: [PATCH] Typo --- src/gdcmDictSet.h | 6 +++--- src/gdcmDirList.cxx | 12 ++++++------ src/gdcmDocEntry.cxx | 12 ++++++------ src/gdcmElementSet.cxx | 8 ++++---- src/gdcmJPEGFragment.h | 10 +++++----- src/gdcmJPEGFragmentsInfo.h | 11 ++++++----- src/gdcmRLEFramesInfo.h | 10 ++++++---- src/gdcmSerieHelper.h | 6 +++--- src/gdcmValEntry.cxx | 8 ++++---- 9 files changed, 43 insertions(+), 40 deletions(-) diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h index 95a3fef5..d92a75c5 100644 --- a/src/gdcmDictSet.h +++ b/src/gdcmDictSet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictSet.h,v $ Language: C++ - Date: $Date: 2005/02/02 15:07:41 $ - Version: $Revision: 1.41 $ + Date: $Date: 2005/02/06 14:43:27 $ + Version: $Revision: 1.42 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -47,7 +47,7 @@ public: // Probabely useless ! //EntryNamesList *GetPubDictEntryNames(); - //EntryNamesByCatMap* GetPubDictEntryNamesByCategory(); + //EntryNamesByCatMap *GetPubDictEntryNamesByCategory(); Dict *LoadDictFromFile( std::string const &fileName, DictKey const &name ); diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index dbe3c051..d7566265 100644 --- a/src/gdcmDirList.cxx +++ b/src/gdcmDirList.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDirList.cxx,v $ Language: C++ - Date: $Date: 2005/02/04 16:51:36 $ - Version: $Revision: 1.44 $ + Date: $Date: 2005/02/06 14:43:27 $ + Version: $Revision: 1.45 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -91,7 +91,7 @@ int DirList::Explore(std::string const &dirpath, bool recursive) HANDLE hFile = FindFirstFile((dirName+"*").c_str(), &fileData); for(BOOL b = (hFile != INVALID_HANDLE_VALUE); b; - b = FindNextFile(hFile,&fileData)) + b = FindNextFile(hFile, &fileData)) { fileName = fileData.cFileName; if( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) @@ -121,9 +121,9 @@ int DirList::Explore(std::string const &dirpath, bool recursive) } // According to POSIX, the dirent structure contains a field char d_name[] - // of unspecified size, with at most NAME_MAX characters preceding the - // terminating null character. Use of other fields will harm the porta- - // bility of your programs. + // of unspecified size, with at most NAME_MAX characters preceding the + // terminating null character. Use of other fields will harm the porta- + // bility of your programs. struct stat buf; dirent *d = 0; diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index 474d5681..32c5f285 100644 --- a/src/gdcmDocEntry.cxx +++ b/src/gdcmDocEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntry.cxx,v $ Language: C++ - Date: $Date: 2005/02/02 16:18:48 $ - Version: $Revision: 1.52 $ + Date: $Date: 2005/02/06 14:43:27 $ + Version: $Revision: 1.53 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -62,7 +62,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) uint16_t group = GetGroup(); VRKey vr = GetVR(); uint16_t el = GetElement(); - uint32_t lgr = GetLength(); + uint32_t lgth = GetLength(); if ( group == 0xfffe && el == 0x0000 ) { @@ -95,7 +95,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) } uint16_t z = 0; - uint16_t shortLgr = lgr; + uint16_t shortLgr = lgth; if (vr == GDCM_UNKNOWN) { @@ -121,7 +121,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) } else { - binary_write(*fp, lgr); + binary_write(*fp, lgth); } } else @@ -138,7 +138,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) } else { - binary_write(*fp, lgr); + binary_write(*fp, lgth); } } } diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index 9b8becba..dd168d1e 100644 --- a/src/gdcmElementSet.cxx +++ b/src/gdcmElementSet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmElementSet.cxx,v $ Language: C++ - Date: $Date: 2005/02/05 01:37:08 $ - Version: $Revision: 1.56 $ + Date: $Date: 2005/02/06 14:43:27 $ + Version: $Revision: 1.57 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -31,7 +31,7 @@ namespace gdcm */ //BOZ depthLevel is not usefull anymore ElementSet::ElementSet(int depthLevel) - : DocEntrySet() + : DocEntrySet() { (void)depthLevel; } @@ -235,7 +235,7 @@ void ElementSet::Print(std::ostream &os, std::string const & ) { for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i) { - DocEntry* entry = i->second; + DocEntry *entry = i->second; entry->SetPrintLevel(PrintLevel); entry->Print(os); diff --git a/src/gdcmJPEGFragment.h b/src/gdcmJPEGFragment.h index 72de1f2b..70f3312b 100644 --- a/src/gdcmJPEGFragment.h +++ b/src/gdcmJPEGFragment.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmJPEGFragment.h,v $ Language: C++ - Date: $Date: 2005/02/04 16:51:36 $ - Version: $Revision: 1.16 $ + Date: $Date: 2005/02/06 14:43:27 $ + Version: $Revision: 1.17 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -48,9 +48,9 @@ public: uint8_t *buffer, int nBits, int &statesuspension); - bool ReadJPEGFile8 (std::ifstream* fp, void *image_buffer, int &statesuspension ); - bool ReadJPEGFile12 (std::ifstream* fp, void *image_buffer, int &statesuspension ); - bool ReadJPEGFile16 (std::ifstream* fp, void *image_buffer, int &statesuspension ); + bool ReadJPEGFile8 (std::ifstream *fp, void *image_buffer, int &statesuspension ); + bool ReadJPEGFile12 (std::ifstream *fp, void *image_buffer, int &statesuspension ); + bool ReadJPEGFile16 (std::ifstream *fp, void *image_buffer, int &statesuspension ); void SetLength(uint32_t length) { Length = length; }; uint32_t GetLength() { return Length; }; diff --git a/src/gdcmJPEGFragmentsInfo.h b/src/gdcmJPEGFragmentsInfo.h index 9b4b0fdd..879a4cc1 100644 --- a/src/gdcmJPEGFragmentsInfo.h +++ b/src/gdcmJPEGFragmentsInfo.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmJPEGFragmentsInfo.h,v $ Language: C++ - Date: $Date: 2005/01/31 05:24:21 $ - Version: $Revision: 1.19 $ + Date: $Date: 2005/02/06 14:43:28 $ + Version: $Revision: 1.20 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -42,9 +42,10 @@ class GDCM_EXPORT JPEGFragmentsInfo public: JPEGFragmentsInfo(); ~JPEGFragmentsInfo(); - void Print( std::ostream &os = std::cout, std::string const & indent = "" ); + void Print( std::ostream &os = std::cout, std::string const &indent = "" ); - void DecompressFromFile(std::ifstream *fp, uint8_t *buffer, int nBits, int numBytes, int length); + void DecompressFromFile(std::ifstream *fp, uint8_t *buffer, int nBits, + int numBytes, int length); void AddFragment(JPEGFragment *fragment); JPEGFragment *GetFirstFragment(); @@ -57,7 +58,7 @@ private: //Some mathieu hack: int StateSuspension; void *SampBuffer; - char* pimage; + char *pimage; JPEGFragmentsList Fragments; JPEGFragmentsList::iterator ItFragments; }; diff --git a/src/gdcmRLEFramesInfo.h b/src/gdcmRLEFramesInfo.h index f4dc2787..c9036b6c 100644 --- a/src/gdcmRLEFramesInfo.h +++ b/src/gdcmRLEFramesInfo.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmRLEFramesInfo.h,v $ Language: C++ - Date: $Date: 2005/01/31 06:17:22 $ - Version: $Revision: 1.17 $ + Date: $Date: 2005/02/06 14:43:28 $ + Version: $Revision: 1.18 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -45,8 +45,10 @@ class GDCM_EXPORT RLEFramesInfo public: ~RLEFramesInfo(); void Print( std::ostream &os = std::cout, std::string indent = "" ); - bool DecompressRLEFile( std::ifstream *fp, uint8_t *subRaw, int xSize, int ySize, int zSize, int bitsAllocated ); - bool ConvertRLE16BitsFromRLE8Bits( uint8_t* subRaw, int xSize, int ySize, int NumberOfFrames ); + bool DecompressRLEFile( std::ifstream *fp, uint8_t *subRaw, int xSize, + int ySize, int zSize, int bitsAllocated ); + bool ConvertRLE16BitsFromRLE8Bits( uint8_t *subRaw, int xSize, int ySize, + int NumberOfFrames ); void AddFrame(RLEFrame *frame); diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h index deb2ac71..9376c17e 100644 --- a/src/gdcmSerieHelper.h +++ b/src/gdcmSerieHelper.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSerieHelper.h,v $ Language: C++ - Date: $Date: 2005/02/05 02:43:06 $ - Version: $Revision: 1.5 $ + Date: $Date: 2005/02/06 14:43:28 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -46,7 +46,7 @@ public: SerieHelper(); ~SerieHelper(); - void Print(std::ostream &os = std::cout, std::string const & indent = "" ); + void Print(std::ostream &os = std::cout, std::string const &indent = "" ); /// \todo should return bool or throw error ? void AddFileName(std::string const &filename); diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx index 4fddd883..16302d55 100644 --- a/src/gdcmValEntry.cxx +++ b/src/gdcmValEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmValEntry.cxx,v $ Language: C++ - Date: $Date: 2005/02/02 16:18:49 $ - Version: $Revision: 1.56 $ + Date: $Date: 2005/02/06 14:43:28 $ + Version: $Revision: 1.57 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -75,7 +75,7 @@ void ValEntry::WriteContent(std::ofstream *fp, FileType filetype) } const VRKey &vr = GetVR(); - unsigned int lgr = GetLength(); + unsigned int lgth = GetLength(); if (vr == "US" || vr == "SS") { // some 'Short integer' fields may be multivaluated @@ -110,7 +110,7 @@ void ValEntry::WriteContent(std::ofstream *fp, FileType filetype) return; } - gdcmAssertMacro( lgr == GetValue().length() ); + gdcmAssertMacro( lgth == GetValue().length() ); binary_write(*fp, GetValue()); } -- 2.45.1