Merge pull request #567 from dakotabenjamin/03RC-bugfixes

03 rc bugfixes

scripts/opensfm.py

@@ -148,8 +148,8 @@ class ODMOpenSfMCell(ecto.Cell):
             else:
                 log.ODM_WARNING('Found a valid CMVS file in: %s' % tree.pmvs_visdat)
 
-            if args.time:
-                system.benchmark(start_time, tree.benchmarking, 'OpenSfM')
+        if args.time:
+            system.benchmark(start_time, tree.benchmarking, 'OpenSfM')
 
         log.ODM_INFO('Running ODM OpenSfM Cell - Finished')
         return ecto.OK if args.end_with != 'opensfm' else ecto.QUIT

scripts/resize.py

@@ -24,7 +24,7 @@ def resize(src_dir, target_dir, resize_to, rerun_cell, photo):
         # compute new size
         max_side = max(img.shape[0], img.shape[1])
         if max_side <= resize_to:
-            log.ODM_WARNING('Resize Parameter is greater than the largest side of the image')
+            log.ODM_WARNING('Resize parameter is greater than or equal to the largest side of the image')
         ratio = float(resize_to) / float(max_side)
         img_r = cv2.resize(img, None, fx=ratio, fy=ratio)
         # write image with opencv