Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
- Date: $Date: 2006/08/18 16:03:46 $
- Version: $Revision: 1.52 $
+ Date: $Date: 2007/09/25 15:21:57 $
+ Version: $Revision: 1.62 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iostream>
#include <string.h>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/// \brief auto generated function, to fill up the 'Value Representation'
}
from.close();
}
- char *VRvalues = "AEASCSDADSFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQ";
}
/**
/**
* \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)
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();
-
- int nbVal=26;
- char *pt = VRvalues;
+ 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[] =
+ "AEASATCSDADSDTFLFDISLOLTOBOWOLOFPNSHSLSQSSSTTMUIULUNUSUTRT";
+
+ //int nbVal = strlen(VRvalues)/2; // save CPU time.
+ int nbVal = 29;
+
+ const char *pt = VRvalues;
for (int i=0;i<nbVal;i++)
{
- if(tested[0] == *pt++)
- if(tested[1] == *pt++)
- return true;
+ if(key[0] == *pt++) {
+ if(key[1] == *pt++) {
+ return true;
+ }
+ }
+ else {
+ pt++;
+ }
}
return false;
+#endif
}
#endif