update opencv 3.4.15 and 4.5.3

Author: nihui

.github/workflows/release.yml

@@ -1,7 +1,20 @@
-diff -Nuarp opencv-3.4.13/modules/core/include/opencv2/core/bindings_utils.hpp opencv-3.4.13.nortti/modules/core/include/opencv2/core/bindings_utils.hpp
---- opencv-3.4.13/modules/core/include/opencv2/core/bindings_utils.hpp	2020-12-20 14:15:48.000000000 +0800
-+++ opencv-3.4.13.nortti/modules/core/include/opencv2/core/bindings_utils.hpp	2021-01-08 22:50:19.036833738 +0800
-@@ -76,14 +76,6 @@ CV_WRAP static inline
+diff -Nuarp opencv-3.4.15/modules/core/include/opencv2/core/bindings_utils.hpp opencv-3.4.15.nortti/modules/core/include/opencv2/core/bindings_utils.hpp
+--- opencv-3.4.15/modules/core/include/opencv2/core/bindings_utils.hpp	2021-07-04 14:10:12.000000000 +0800
++++ opencv-3.4.15.nortti/modules/core/include/opencv2/core/bindings_utils.hpp	2021-07-11 15:37:28.622075271 +0800
+@@ -117,12 +117,6 @@ String dumpRange(const Range& argument)
+ }
+ 
+ CV_WRAP static inline
+-void testRaiseGeneralException()
+-{
+-    throw std::runtime_error("exception text");
+-}
+-
+-CV_WRAP static inline
+ AsyncArray testAsyncArray(InputArray argument)
+ {
+     AsyncPromise p;
+@@ -134,14 +128,6 @@ CV_WRAP static inline
  AsyncArray testAsyncException()
  {
      AsyncPromise p;
@@ -16,9 +29,9 @@ diff -Nuarp opencv-3.4.13/modules/core/include/opencv2/core/bindings_utils.hpp o
      return p.getArrayResult();
  }
 
-diff -Nuarp opencv-3.4.13/modules/core/src/async.cpp opencv-3.4.13.nortti/modules/core/src/async.cpp
---- opencv-3.4.13/modules/core/src/async.cpp	2020-12-20 14:15:48.000000000 +0800
-+++ opencv-3.4.13.nortti/modules/core/src/async.cpp	2021-01-08 22:54:48.716898652 +0800
+diff -Nuarp opencv-3.4.15/modules/core/src/async.cpp opencv-3.4.15.nortti/modules/core/src/async.cpp
+--- opencv-3.4.15/modules/core/src/async.cpp	2021-07-04 14:10:12.000000000 +0800
++++ opencv-3.4.15.nortti/modules/core/src/async.cpp	2021-07-11 15:35:42.202735096 +0800
 @@ -118,7 +118,6 @@ struct AsyncArray::Impl
              if (has_exception)
              {
@@ -27,9 +40,9 @@ diff -Nuarp opencv-3.4.13/modules/core/src/async.cpp opencv-3.4.13.nortti/module
              }
              CV_Error(Error::StsInternal, "AsyncArray: invalid state of 'has_result = true'");
          }
-diff -Nuarp opencv-3.4.13/modules/core/src/bindings_utils.cpp opencv-3.4.13.nortti/modules/core/src/bindings_utils.cpp
---- opencv-3.4.13/modules/core/src/bindings_utils.cpp	2020-12-20 14:15:48.000000000 +0800
-+++ opencv-3.4.13.nortti/modules/core/src/bindings_utils.cpp	2021-01-08 22:50:46.216437138 +0800
+diff -Nuarp opencv-3.4.15/modules/core/src/bindings_utils.cpp opencv-3.4.15.nortti/modules/core/src/bindings_utils.cpp
+--- opencv-3.4.15/modules/core/src/bindings_utils.cpp	2021-07-04 14:10:12.000000000 +0800
++++ opencv-3.4.15.nortti/modules/core/src/bindings_utils.cpp	2021-07-11 15:35:42.202735096 +0800
 @@ -14,7 +14,7 @@ String dumpInputArray(InputArray argumen
          return "InputArray: noArray()";
      std::ostringstream ss;
@@ -110,9 +123,9 @@ diff -Nuarp opencv-3.4.13/modules/core/src/bindings_utils.cpp opencv-3.4.13.nort
      return ss.str();
  }
 
-diff -Nuarp opencv-3.4.13/modules/core/src/command_line_parser.cpp opencv-3.4.13.nortti/modules/core/src/command_line_parser.cpp
---- opencv-3.4.13/modules/core/src/command_line_parser.cpp	2020-12-20 14:15:48.000000000 +0800
-+++ opencv-3.4.13.nortti/modules/core/src/command_line_parser.cpp	2021-01-08 22:56:00.173855959 +0800
+diff -Nuarp opencv-3.4.15/modules/core/src/command_line_parser.cpp opencv-3.4.15.nortti/modules/core/src/command_line_parser.cpp
+--- opencv-3.4.15/modules/core/src/command_line_parser.cpp	2021-07-04 14:10:12.000000000 +0800
++++ opencv-3.4.15.nortti/modules/core/src/command_line_parser.cpp	2021-07-11 15:35:42.202735096 +0800
 @@ -124,7 +124,6 @@ static void from_str(const String& str,
 
  void CommandLineParser::getByName(const String& name, bool space_delete, int type, void* dst) const
@@ -209,9 +222,9 @@ diff -Nuarp opencv-3.4.13/modules/core/src/command_line_parser.cpp opencv-3.4.13
      }
 
      return vec;
-diff -Nuarp opencv-3.4.13/modules/core/src/glob.cpp opencv-3.4.13.nortti/modules/core/src/glob.cpp
---- opencv-3.4.13/modules/core/src/glob.cpp	2020-12-20 14:15:48.000000000 +0800
-+++ opencv-3.4.13.nortti/modules/core/src/glob.cpp	2021-01-08 22:53:21.441172176 +0800
+diff -Nuarp opencv-3.4.15/modules/core/src/glob.cpp opencv-3.4.15.nortti/modules/core/src/glob.cpp
+--- opencv-3.4.15/modules/core/src/glob.cpp	2021-07-04 14:10:12.000000000 +0800
++++ opencv-3.4.15.nortti/modules/core/src/glob.cpp	2021-07-11 15:35:42.202735096 +0800
 @@ -231,7 +231,6 @@ static void glob_rec(const cv::String& d
      if ((dir = opendir (directory.c_str())) != 0)
      {
@@ -232,9 +245,9 @@ diff -Nuarp opencv-3.4.13/modules/core/src/glob.cpp opencv-3.4.13.nortti/modules
          closedir(dir);
      }
      else
-diff -Nuarp opencv-3.4.13/modules/core/src/matrix.cpp opencv-3.4.13.nortti/modules/core/src/matrix.cpp
---- opencv-3.4.13/modules/core/src/matrix.cpp	2020-12-20 14:15:48.000000000 +0800
-+++ opencv-3.4.13.nortti/modules/core/src/matrix.cpp	2021-01-08 22:52:24.700000125 +0800
+diff -Nuarp opencv-3.4.15/modules/core/src/matrix.cpp opencv-3.4.15.nortti/modules/core/src/matrix.cpp
+--- opencv-3.4.15/modules/core/src/matrix.cpp	2021-07-04 14:10:12.000000000 +0800
++++ opencv-3.4.15.nortti/modules/core/src/matrix.cpp	2021-07-11 15:35:42.203735090 +0800
 @@ -640,18 +640,10 @@ void Mat::create(int d, const int* _size
  #endif
          if(!a)
@@ -274,9 +287,9 @@ diff -Nuarp opencv-3.4.13/modules/core/src/matrix.cpp opencv-3.4.13.nortti/modul
 
      updateContinuityFlag();
 
-diff -Nuarp opencv-3.4.13/modules/core/src/parallel.cpp opencv-3.4.13.nortti/modules/core/src/parallel.cpp
---- opencv-3.4.13/modules/core/src/parallel.cpp	2020-12-20 14:15:48.000000000 +0800
-+++ opencv-3.4.13.nortti/modules/core/src/parallel.cpp	2021-01-08 22:56:50.149126755 +0800
+diff -Nuarp opencv-3.4.15/modules/core/src/parallel.cpp opencv-3.4.15.nortti/modules/core/src/parallel.cpp
+--- opencv-3.4.15/modules/core/src/parallel.cpp	2021-07-04 14:10:12.000000000 +0800
++++ opencv-3.4.15.nortti/modules/core/src/parallel.cpp	2021-07-11 15:35:42.203735090 +0800
 @@ -321,29 +321,9 @@ namespace {
              CV_TRACE_ARG_VALUE(range_end, "range.end", (int64)r.end);
  #endif
@@ -324,9 +337,9 @@ diff -Nuarp opencv-3.4.13/modules/core/src/parallel.cpp opencv-3.4.13.nortti/mod
      }
      else // nested parallel_for_() calls are not parallelized
  #endif // CV_PARALLEL_FRAMEWORK
-diff -Nuarp opencv-3.4.13/modules/core/src/persistence_c.cpp opencv-3.4.13.nortti/modules/core/src/persistence_c.cpp
---- opencv-3.4.13/modules/core/src/persistence_c.cpp	2020-12-20 14:15:48.000000000 +0800
-+++ opencv-3.4.13.nortti/modules/core/src/persistence_c.cpp	2021-01-08 22:51:49.412515029 +0800
+diff -Nuarp opencv-3.4.15/modules/core/src/persistence_c.cpp opencv-3.4.15.nortti/modules/core/src/persistence_c.cpp
+--- opencv-3.4.15/modules/core/src/persistence_c.cpp	2021-07-04 14:10:12.000000000 +0800
++++ opencv-3.4.15.nortti/modules/core/src/persistence_c.cpp	2021-07-11 15:35:42.203735090 +0800
 @@ -456,17 +456,10 @@ cvOpenFileStorage(const char* query, CvM
      CV_Assert(fs);
      memset( fs, 0, sizeof(*fs));
@@ -345,9 +358,9 @@ diff -Nuarp opencv-3.4.13/modules/core/src/persistence_c.cpp opencv-3.4.13.nortt
  }
 
  /* closes file storage and deallocates buffers */
-diff -Nuarp opencv-3.4.13/modules/core/src/persistence_types.cpp opencv-3.4.13.nortti/modules/core/src/persistence_types.cpp
---- opencv-3.4.13/modules/core/src/persistence_types.cpp	2020-12-20 14:15:48.000000000 +0800
-+++ opencv-3.4.13.nortti/modules/core/src/persistence_types.cpp	2021-01-08 22:56:15.202636666 +0800
+diff -Nuarp opencv-3.4.15/modules/core/src/persistence_types.cpp opencv-3.4.15.nortti/modules/core/src/persistence_types.cpp
+--- opencv-3.4.15/modules/core/src/persistence_types.cpp	2021-07-04 14:10:12.000000000 +0800
++++ opencv-3.4.15.nortti/modules/core/src/persistence_types.cpp	2021-07-11 15:35:42.203735090 +0800
 @@ -756,13 +756,9 @@ static void* icvReadSeq( CvFileStorage*
              flags |= CV_SEQ_FLAG_HOLE;
          if( !strstr(flags_str, "untyped") )
@@ -362,10 +375,10 @@ diff -Nuarp opencv-3.4.13/modules/core/src/persistence_types.cpp opencv-3.4.13.n
          }
      }
 
-diff -Nuarp opencv-3.4.13/modules/core/src/system.cpp opencv-3.4.13.nortti/modules/core/src/system.cpp
---- opencv-3.4.13/modules/core/src/system.cpp	2020-12-20 14:15:48.000000000 +0800
-+++ opencv-3.4.13.nortti/modules/core/src/system.cpp	2021-01-08 22:55:38.692169448 +0800
-@@ -1122,8 +1122,6 @@ void error( const Exception& exc )
+diff -Nuarp opencv-3.4.15/modules/core/src/system.cpp opencv-3.4.15.nortti/modules/core/src/system.cpp
+--- opencv-3.4.15/modules/core/src/system.cpp	2021-07-04 14:10:12.000000000 +0800
++++ opencv-3.4.15.nortti/modules/core/src/system.cpp	2021-07-11 15:35:42.203735090 +0800
+@@ -1136,8 +1136,6 @@ void error( const Exception& exc )
          static volatile int* p = 0;
          *p = 0;
      }
@@ -374,7 +387,7 @@ diff -Nuarp opencv-3.4.13/modules/core/src/system.cpp opencv-3.4.13.nortti/modul
  }
 
  void error(int _code, const String& _err, const char* _func, const char* _file, int _line)
-@@ -1947,7 +1945,7 @@ inline bool parseOption(const std::strin
+@@ -1991,7 +1989,7 @@ inline bool parseOption(const std::strin
      {
          return false;
      }
@@ -383,7 +396,7 @@ diff -Nuarp opencv-3.4.13/modules/core/src/system.cpp opencv-3.4.13.nortti/modul
  }
 
  template<>
-@@ -1972,7 +1970,7 @@ inline size_t parseOption(const std::str
+@@ -2016,7 +2014,7 @@ inline size_t parseOption(const std::str
          return v * 1024 * 1024;
      else if (suffixStr == "KB" || suffixStr == "Kb" || suffixStr == "kb")
          return v * 1024;
@@ -392,7 +405,7 @@ diff -Nuarp opencv-3.4.13/modules/core/src/system.cpp opencv-3.4.13.nortti/modul
  }
 
  template<>
-@@ -2015,16 +2013,11 @@ static inline const char * envRead(const
+@@ -2059,16 +2057,11 @@ static inline const char * envRead(const
  template<typename T>
  inline T read(const std::string & k, const T & defaultValue)
  {
@@ -409,9 +422,9 @@ diff -Nuarp opencv-3.4.13/modules/core/src/system.cpp opencv-3.4.13.nortti/modul
      return defaultValue;
  }
 
-diff -Nuarp opencv-3.4.13/modules/core/src/umatrix.cpp opencv-3.4.13.nortti/modules/core/src/umatrix.cpp
---- opencv-3.4.13/modules/core/src/umatrix.cpp	2020-12-20 14:15:48.000000000 +0800
-+++ opencv-3.4.13.nortti/modules/core/src/umatrix.cpp	2021-01-08 22:55:10.729577450 +0800
+diff -Nuarp opencv-3.4.15/modules/core/src/umatrix.cpp opencv-3.4.15.nortti/modules/core/src/umatrix.cpp
+--- opencv-3.4.15/modules/core/src/umatrix.cpp	2021-07-04 14:10:12.000000000 +0800
++++ opencv-3.4.15.nortti/modules/core/src/umatrix.cpp	2021-07-11 15:35:42.204735083 +0800
 @@ -516,14 +516,9 @@ UMat Mat::getUMat(int accessFlags, UMatU
          new_u->originalUMatData = u;
      }
@@ -445,9 +458,9 @@ diff -Nuarp opencv-3.4.13/modules/core/src/umatrix.cpp opencv-3.4.13.nortti/modu
          CV_Assert( step[dims-1] == (size_t)CV_ELEM_SIZE(flags) );
      }
 
-diff -Nuarp opencv-3.4.13/modules/core/src/utils/filesystem.cpp opencv-3.4.13.nortti/modules/core/src/utils/filesystem.cpp
---- opencv-3.4.13/modules/core/src/utils/filesystem.cpp	2020-12-20 14:15:48.000000000 +0800
-+++ opencv-3.4.13.nortti/modules/core/src/utils/filesystem.cpp	2021-01-08 22:51:06.030148041 +0800
+diff -Nuarp opencv-3.4.15/modules/core/src/utils/filesystem.cpp opencv-3.4.15.nortti/modules/core/src/utils/filesystem.cpp
+--- opencv-3.4.15/modules/core/src/utils/filesystem.cpp	2021-07-04 14:10:12.000000000 +0800
++++ opencv-3.4.15.nortti/modules/core/src/utils/filesystem.cpp	2021-07-11 15:35:42.204735083 +0800
 @@ -492,14 +492,9 @@ cv::String getCacheDirectory(const char*
                      && !utils::fs::isDirectory(default_cache_path))
                  {
@@ -463,18 +476,18 @@ diff -Nuarp opencv-3.4.13/modules/core/src/utils/filesystem.cpp opencv-3.4.13.no
                      if (!existedCacheDirs.empty())
                      {
                          CV_LOG_WARNING(NULL, "Creating new OpenCV cache directory: " << default_cache_path);
-diff -Nuarp opencv-3.4.13/modules/imgproc/src/contours.cpp opencv-3.4.13.nortti/modules/imgproc/src/contours.cpp
---- opencv-3.4.13/modules/imgproc/src/contours.cpp	2020-12-20 14:15:48.000000000 +0800
-+++ opencv-3.4.13.nortti/modules/imgproc/src/contours.cpp	2021-01-08 22:57:55.235177043 +0800
-@@ -1735,7 +1735,6 @@ cvFindContours_Impl( void*  img,  CvMemS
+diff -Nuarp opencv-3.4.15/modules/imgproc/src/contours.cpp opencv-3.4.15.nortti/modules/imgproc/src/contours.cpp
+--- opencv-3.4.15/modules/imgproc/src/contours.cpp	2021-07-04 14:10:12.000000000 +0800
++++ opencv-3.4.15.nortti/modules/imgproc/src/contours.cpp	2021-07-11 15:35:42.204735083 +0800
+@@ -1761,7 +1761,6 @@ cvFindContours_Impl( void*  img,  CvMemS
      }
      else
      {
 -        try
          {
              scanner = cvStartFindContours_Impl( img, storage, cntHeaderSize, mode, method, offset,
                                              needFillBorder);
-@@ -1747,12 +1746,6 @@ cvFindContours_Impl( void*  img,  CvMemS
+@@ -1773,12 +1772,6 @@ cvFindContours_Impl( void*  img,  CvMemS
              }
              while( contour != 0 );
          }

opencv-3.4.13-no-zlib.patch

@@ -0,0 +1,12 @@
+diff -Nuarp opencv-3.4.15.orig/modules/core/src/persistence.hpp opencv-3.4.15/modules/core/src/persistence.hpp
+--- opencv-3.4.15.orig/modules/core/src/persistence.hpp	2020-12-20 14:15:48.000000000 +0800
++++ opencv-3.4.15/modules/core/src/persistence.hpp	2021-02-24 23:55:08.440237914 +0800
+@@ -12,7 +12,7 @@
+ #include <string>
+ #include <iterator>
+ 
+-#define USE_ZLIB 1
++#define USE_ZLIB 0
+ #if USE_ZLIB
+ #  ifndef _LFS64_LARGEFILE
+ #    define _LFS64_LARGEFILE 0

opencv-3.4.13-no-rtti.patch opencv-3.4.15-no-rtti.patchopencv-3.4.13-no-rtti.patch renamed to opencv-3.4.15-no-rtti.patch

@@ -1,7 +1,7 @@
-diff -Nuarp opencv-3.4.13/modules/core/include/opencv2/core/cvdef.h opencv-3.4.13.unsafe_xadd/modules/core/include/opencv2/core/cvdef.h
---- opencv-3.4.13/modules/core/include/opencv2/core/cvdef.h	2020-12-20 14:15:48.000000000 +0800
-+++ opencv-3.4.13.unsafe_xadd/modules/core/include/opencv2/core/cvdef.h	2021-05-11 15:45:01.573056217 +0800
-@@ -528,33 +528,7 @@ Cv64suf;
+diff -Nuarp opencv-3.4.15/modules/core/include/opencv2/core/cvdef.h opencv-3.4.15.unsafe_xadd/modules/core/include/opencv2/core/cvdef.h
+--- opencv-3.4.15/modules/core/include/opencv2/core/cvdef.h	2021-07-04 14:10:12.000000000 +0800
++++ opencv-3.4.15.unsafe_xadd/modules/core/include/opencv2/core/cvdef.h	2021-07-11 14:54:19.949471070 +0800
+@@ -532,33 +532,7 @@ Cv64suf;
  *          exchange-add operation for atomic operations on reference counters            *
  \****************************************************************************************/
 
@@ -27,7 +27,7 @@ diff -Nuarp opencv-3.4.13/modules/core/include/opencv2/core/cvdef.h opencv-3.4.1
 -#  define CV_XADD(addr, delta) (int)_InterlockedExchangeAdd((long volatile*)addr, delta)
 -#else
 -  #ifdef OPENCV_FORCE_UNSAFE_XADD
--    CV_INLINE CV_XADD(int* addr, int delta) { int tmp = *addr; *addr += delta; return tmp; }
+-    CV_INLINE int CV_XADD(int* addr, int delta) { int tmp = *addr; *addr += delta; return tmp; }
 -  #else
 -    #error "OpenCV: can't define safe CV_XADD macro for current platform (unsupported). Define CV_XADD macro through custom port header (see OPENCV_INCLUDE_PORT_FILE)"
 -  #endif