orthanc: OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp comparison

DbOptimizer plugin

comparison

equal deleted inserted replaced

-:c68265bf1f94
+:1b76853e1797
 boost::lexical_cast<std::string>(minor) + "." +
 boost::lexical_cast<std::string>(revision) +
 " is required)");
 }
+bool CheckMinimalVersion(const char* version,
-bool CheckMinimalOrthancVersion(unsigned int major,
+unsigned int major,
 unsigned int minor,
 unsigned int revision)
 {
-if (!HasGlobalContext())
+if (!strcmp(version, "mainline"))
-{
-LogError("Bad Orthanc context in the plugin");
-return false;
-}
-if (!strcmp(GetGlobalContext()->orthancVersion, "mainline"))
 {
 // Assume compatibility with the mainline
 return true;
 }
-// Parse the version of the Orthanc core
+// Parse the version
 int aa, bb, cc;
 if (
 #ifdef _MSC_VER
 sscanf_s
 #else
 sscanf
 #endif
-(GetGlobalContext()->orthancVersion, "%4d.%4d.%4d", &aa, &bb, &cc) != 3 ||
+(version, "%4d.%4d.%4d", &aa, &bb, &cc) != 3 ||
 aa < 0 ||
 bb < 0 ||
 cc < 0)
 {
 return false;
 if (a < major)
 {
 return false;
 }
 // Check the minor version number
 assert(a == major);
 if (b > minor)
 {
 }
 else
 {
 return false;
 }
+}
+bool CheckMinimalOrthancVersion(unsigned int major,
+unsigned int minor,
+unsigned int revision)
+{
+if (!HasGlobalContext())
+{
+LogError("Bad Orthanc context in the plugin");
+return false;
+}
+return CheckMinimalVersion(GetGlobalContext()->orthancVersion,
+major, minor, revision);
 }
 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 5, 0)
 const char* AutodetectMimeType(const std::string& path)

Mercurial > hg > orthanc