PyPatchMatch 2.0.0rc1__tar.gz → 2.0.0rc2__tar.gz

{pypatchmatch-2.0.0rc1 → pypatchmatch-2.0.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPatchMatch
-Version: 2.0.0rc1
+Version: 2.0.0rc2
 Summary: This library implements the PatchMatch based inpainting algorithm.
 Keywords: inpainting,patchmatch,image-processing,opencv
 Author-Email: The InvokeAI Project <lincoln.stein@gmail.com>, Jiayuan Mao <maojiayuan@gmail.com>, Kyle Schouviller <kyle0654@hotmail.com>, Matthias Wild <mauwii@outlook.de>, Younesse ANDAM <younesse.andam@gmail.com>

{pypatchmatch-2.0.0rc1 → pypatchmatch-2.0.0rc2}/patchmatch/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.0.0rc1'
-__version_tuple__ = version_tuple = (2, 0, 0, 'rc1')
+__version__ = version = '2.0.0rc2'
+__version_tuple__ = version_tuple = (2, 0, 0, 'rc2')
 
-__commit_id__ = commit_id = 'g75098309c'
+__commit_id__ = commit_id = 'geb61e5d37'

{pypatchmatch-2.0.0rc1 → pypatchmatch-2.0.0rc2}/patchmatch/csrc/inpaint.cpp

@@ -128,13 +128,19 @@ cv::Mat Inpainting::run(bool verbose, bool verbose_visualize, unsigned int rando
     // Only the holes are filled. The votes of overlapping patches also change the known
     // pixels near the holes, and the pyramid leaves globally masked pixels black, which
     // are neither filled nor used as a source. Keep the input values of both.
+    // A plain loop instead of OpenCV matrix expressions: those pull OpenCV's whole
+    // expression module into the statically linked library, 40 % more on disk.
     cv::Mat result = target.image();
-    if (result.empty()) // OpenCV rejects empty operands in matrix expressions
-        return result;
-    cv::Mat keep = m_initial.mask() == 0;
-    if (!m_initial.global_mask().empty())
-        keep |= m_initial.global_mask() != 0;
-    m_initial.image().copyTo(result, keep);
+    for (int y = 0; y < result.rows; ++y)
+    {
+        for (int x = 0; x < result.cols; ++x)
+        {
+            if (m_initial.is_masked(y, x) && !m_initial.is_globally_masked(y, x))
+                continue;
+            const unsigned char *input = m_initial.get_image(y, x);
+            std::copy(input, input + 3, result.ptr<unsigned char>(y, x));
+        }
+    }
     return result;
 }