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

2018-10-15 20:15:42 +00:00
parent 5dd46b54c1 24ced3d657
commit edacd91a27
48 changed files with 2987 additions and 2509 deletions
@@ -559,7 +559,7 @@ int main(int argc, char** argv)
            {
                Rect r = extract3DBox(frame, shownFrame, selectedObjFrame,
                                      cameraMatrix, rvec, tvec, box, 4, true);
-                if( r.area() )
+                if( !r.empty() )
                {
                    const int maxFrameIdx = 10000;
                    char path[1000];