Merge pull request #2680 from adrians:remove_cv_err

modules/core/include/opencv2/core/core_c.h

@@ -1764,16 +1764,10 @@ CVAPI(int) cvGuiBoxReport( int status, const char* func_name, const char* err_ms
 #define OPENCV_ERROR(status,func,context)                           \
 cvError((status),(func),(context),__FILE__,__LINE__)
 
-#define OPENCV_ERRCHK(func,context)                                 \
-{if (cvGetErrStatus() >= 0)                         \
-{OPENCV_ERROR(CV_StsBackTrace,(func),(context));}}
-
 #define OPENCV_ASSERT(expr,func,context)                            \
 {if (! (expr))                                      \
 {OPENCV_ERROR(CV_StsInternal,(func),(context));}}
 
-#define OPENCV_RSTERR() (cvSetErrStatus(CV_StsOk))
-
 #define OPENCV_CALL( Func )                                         \
 {                                                                   \
 Func;                                                           \
@@ -1800,10 +1794,6 @@ static char cvFuncName[] = Name
     __CV_EXIT__;                                                   \
 }
 
-/* Simplified form of CV_ERROR */
-#define CV_ERROR_FROM_CODE( code )   \
-    CV_ERROR( code, "" )
-
 /*
  CV_CHECK macro checks error status after CV (or IPL)
  function call. If error detected, control will be transferred to the exit