Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
- Date: $Date: 2007/09/07 15:44:32 $
- Version: $Revision: 1.57 $
+ Date: $Date: 2008/02/13 11:42:13 $
+ Version: $Revision: 1.63 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
/**
* \brief Simple predicate that checks whether the given argument
- * corresponds to the Value Representation of a \ref DataEntry .
+ * corresponds to the Value Representation of a DataEntry .
* @param tested value representation to check for.
*/
bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
tested == "CS" ||
tested == "DA" ||
tested == "DS" ||
+ tested == "DT" ||
tested == "FL" ||
tested == "FD" ||
tested == "IS" ||
if( tested == "OW" )
return 2;
// Float string
- if( tested == "OF" )
+ if( tested == "OF" || tested == "OL")
return 4;
return 1;
}
// VS6 need a single implementation in the dll
#if defined(_MSC_VER) && (_MSC_VER == 1200)
/// \brief checks is a supposed-to-be VR is a 'legal' one.
-bool VR::IsValidVR(VRKey const &tested)
+bool VR::IsValidVR(VRKey const &key)
{
-// return vr.find(key) != vr.end();
-
-// "RT" is an undocumented VR, found in some Siemens images.
-// We added it here to be able to read these images.
-// Dict/gdcmVR.dic has to be updated, too.
+ return vr.find(key) != vr.end();
+#ifdef USECOMPLETELYUNTESTEDCODE
+ // to avoid to search in a std::map of std::string,
+ // since each std::string is 2 characters longs, we check the array
+ // (29 char comparisons in the worst case!)
+
+ // "RT" is an undocumented VR, found in some Siemens images.
+ // We added it here to be able to read these images.
+ // Dict/gdcmVR.dic, Document has to be updated, too.
static const char VRvalues[] =
- "AEASCSDADSFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQRT";
+ "AEASATCSDADSDTFLFDISLOLTOBOWOLOFPNSHSLSQSSSTTMUIULUNUSUTRT";
//int nbVal = strlen(VRvalues)/2; // save CPU time.
- int nbVal = 27;
-
+ int nbVal = 29;
+
const char *pt = VRvalues;
for (int i=0;i<nbVal;i++)
{
- if(tested[0] == *pt++) {
- if(tested[1] == *pt++)
+ if(key[0] == *pt++) {
+ if(key[1] == *pt++) {
return true;
+ }
}
else {
pt++;
}
}
return false;
+#endif
}
#endif