Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2026-07-29 15:23:05 +04:00 · 2018-11-10 20:10:57 +00:00
parent c7d04c6c5c 56eebb926d
commit 1913482cf5
90 changed files with 6261 additions and 6657 deletions
@@ -523,7 +523,7 @@ int main(int argc, char *argv[])
            imshow(winName, result);
            imshow("Original", img);
        }
-        catch (Exception& e)
+        catch (const Exception& e)
        {
            cout << "Feature: " << *itDesc << "\n";
            cout << e.msg << endl;