Merge pull request #14805 from alalek:fix_valgrind_issues

6 years ago · cf9bddcb89
parent 4623e6220f 3af1b6ecdc
commit cf9bddcb89
2 changed files with 10 additions and 0 deletions
--- a/modules/videoio/src/cap_images.cpp
+++ b/modules/videoio/src/cap_images.cpp
@ -437,6 +437,7 @@ Ptr<IVideoWriter> create_Images_writer(const std::string &filename, int, double,
    {
        if( writer->open( filename.c_str() ))
            return makePtr<LegacyWriter>(writer);
+        delete writer;
    }
    catch (...)
    {
--- a/platforms/scripts/valgrind.supp
+++ b/platforms/scripts/valgrind.supp
@ -226,3 +226,12 @@
   fun:_ZN20CvVideoWriter_FFMPEG10writeFrameEPKhiiiii
   fun:cvWriteFrame_FFMPEG
 }
+
+{
+   OpenCV-test-gapi-thread-tls
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:calloc
+   fun:allocate_dtv
+   fun:_dl_allocate_tls
+}