Merge branch 'master' of https://github.com/micmacIGN/micmac

micmacIGN · Apr 16, 2020 · 9cfb1ba · 9cfb1ba
2 parents 0bf104f + cca7164
commit 9cfb1ba
Show file tree

Hide file tree

Showing 29 changed files with 1,624 additions and 345 deletions.
diff --git a/MMVII/include/MMVII_DeclareAllCmd.h b/MMVII/include/MMVII_DeclareAllCmd.h
@@ -17,6 +17,7 @@ extern cSpecMMVII_Appli  TheSpecEditSet;
 extern cSpecMMVII_Appli  TheSpecEditRel;
 extern cSpecMMVII_Appli  TheSpecWalkman;
 extern cSpecMMVII_Appli  TheSpecDaisy;
+extern cSpecMMVII_Appli  TheSpecCatVideo;
 extern cSpecMMVII_Appli  TheSpec_TestEigen;
 extern cSpecMMVII_Appli  TheSpec_ComputeParamIndexBinaire;
 extern cSpecMMVII_Appli  TheSpecTestRecall;

diff --git a/MMVII/include/MMVII_Error.h b/MMVII/include/MMVII_Error.h
@@ -83,10 +83,10 @@ void MMVII_RestoreDefaultHandle();
 { MMVVI_Error("Internal Error",aMes,__FILE__,__LINE__);}
 
 void MMVII_UsersErrror(const eTyUEr &,const std::string & aMes);
-#define MMVII_INTERNAL_ASSERT_user(aRef,aMes)\
- if (The_MMVII_DebugLevel>=The_MMVII_DebugLevel_UserError ) \
+#define MMVII_INTERNAL_ASSERT_User(aTest,aRef,aMes)\
+ if ((The_MMVII_DebugLevel>=The_MMVII_DebugLevel_UserError) && (!(aTest))) \
 {  MMVII_UsersErrror(aRef,aMes);}
-
+void MMVII_UnclasseUsEr(const std::string & aMes);
 
 
 #define MMVII_INTERNAL_ASSERT_always(aTest,aMes)\