Merge pull request #22293 from mshabunin:fix-buffer-area-uas

2 years ago · 6ce2f1316f
parent 294348939b f729202272
commit 6ce2f1316f
2 changed files with 1 additions and 9 deletions
--- a/modules/core/src/buffer_area.cpp
+++ b/modules/core/src/buffer_area.cpp
@ -29,8 +29,7 @@ public:
    }
    void cleanup() const
    {
-        CV_Assert(ptr && *ptr);
-        *ptr = 0;
+        CV_DbgAssert(ptr);
        if (raw_mem)
            fastFree(raw_mem);
    }
--- a/modules/core/test/test_utils.cpp
+++ b/modules/core/test/test_utils.cpp
@ -403,9 +403,6 @@ TEST_P(BufferArea, basic)
            EXPECT_EQ((double)0, dbl_ptr[i]);
        }
    }
-    EXPECT_TRUE(int_ptr == NULL);
-    EXPECT_TRUE(uchar_ptr == NULL);
-    EXPECT_TRUE(dbl_ptr == NULL);
 }

 TEST_P(BufferArea, align)
@ -442,10 +439,6 @@ TEST_P(BufferArea, align)
            }
        }
    }
-    for (size_t i = 0; i < CNT; ++i)
-    {
-        EXPECT_TRUE(buffers[i] == NULL);
-    }
 }

 TEST_P(BufferArea, default_align)