From 52051b5d16852990a4850c45541e3e88a660b305 Mon Sep 17 00:00:00 2001 From: malaterre Date: Wed, 14 Jul 2004 14:08:05 +0000 Subject: [PATCH] FIX: Could not compile with warnings flags on --- Testing/TestAllEntryVerify.cxx | 5 +++++ Testing/TestAllReadCompareDicom.cxx | 2 ++ Testing/TestReadWriteReadCompare.cxx | 3 ++- src/gdcmDocument.cxx | 5 +++-- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Testing/TestAllEntryVerify.cxx b/Testing/TestAllEntryVerify.cxx index 978ee44d..222d2f35 100644 --- a/Testing/TestAllEntryVerify.cxx +++ b/Testing/TestAllEntryVerify.cxx @@ -129,6 +129,8 @@ bool ReferenceFileParser::AddKeyValuePairToMap( string& key, string& value ) if ( CurrentMapEntryValuesPtr->count(key) != 0 ) return false; (*CurrentMapEntryValuesPtr)[key] = value; + + return true; //?? } void ReferenceFileParser::Print() @@ -203,6 +205,7 @@ bool ReferenceFileParser::Check() cout << Indent << " OK" << endl; } cout << Indent << endl; + return true; //??? } istream& ReferenceFileParser::eatwhite( istream& is ) @@ -429,6 +432,7 @@ bool ReferenceFileParser::Open( string& referenceFileName ) } from.close(); + return true; //?? } void ReferenceFileParser::CleanUpLine( string& line ) @@ -577,6 +581,7 @@ bool ReferenceFileParser::SecondPassReferenceFile() ParseRegularLine( line ); } + return true; //?? } int TestAllEntryVerify(int argc, char* argv[]) diff --git a/Testing/TestAllReadCompareDicom.cxx b/Testing/TestAllReadCompareDicom.cxx index 46d51a6c..e2474b95 100644 --- a/Testing/TestAllReadCompareDicom.cxx +++ b/Testing/TestAllReadCompareDicom.cxx @@ -97,6 +97,7 @@ int TestAllReadCompareDicom(int argc, char* argv[]) ////// Step 3a: int testedDataSize = tested->GetImageDataSize(); + (void)testedDataSize; void* testedImageData = tested->GetImageData(); // Kludge tested->WriteDcmExplVR( referenceFileName ); std::cerr << " Creating reference baseline file :" << std::endl @@ -146,6 +147,7 @@ int TestAllReadCompareDicom(int argc, char* argv[]) if (int res = memcmp(testedImageData, referenceImageData, testedDataSize) != 0 ) { + (void)res; std::cout << " Pixel differ (as expanded in memory)." << std::endl; delete tested; diff --git a/Testing/TestReadWriteReadCompare.cxx b/Testing/TestReadWriteReadCompare.cxx index 939ab869..d46bf274 100644 --- a/Testing/TestReadWriteReadCompare.cxx +++ b/Testing/TestReadWriteReadCompare.cxx @@ -104,8 +104,9 @@ int TestReadWriteReadCompare(int argc, char* argv[]) return 1; } - if (int res=memcmp(imageData, imageDataWritten, dataSize) !=0) + if (int res = memcmp(imageData, imageDataWritten, dataSize) !=0) { + (void)res; std::cout << std::endl << " Pixel differ (as expanded in memory)." << std::endl; delete (char*)imageData; diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 40b240a5..c0cff42f 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2004/07/06 09:50:52 $ - Version: $Revision: 1.47 $ + Date: $Date: 2004/07/14 14:08:05 $ + Version: $Revision: 1.48 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -2491,6 +2491,7 @@ bool gdcmDocument::ReadTag(uint16_t TestGroup, uint16_t TestElement) uint32_t gdcmDocument::ReadTagLength(uint16_t TestGroup, uint16_t TestElement) { long PositionOnEntry = ftell(fp); + (void)PositionOnEntry; if ( !ReadTag(TestGroup, TestElement) ) { -- 2.45.1