commit 8901b2824aafa1f4296967cc54b0f5a94a358f72
author Brian Silverman <bsilver16384@gmail.com> Sun Feb 16 20:55:08 2020 -0800
committer Gerrit Code Review <gerrit@robotics.mvla.net> Sun Feb 16 20:55:08 2020 -0800
tree 4014f3d52f7344f16e17f876ae2853ce479df0a6
parent a5e1174efc7b6959dca577fbbe23d42870c60ce9
parent 950bffac0548994aa24e64031168052870c6bec5

Merge "Switch to upscaling 640x480 input images"

y2020/vision/sift/BUILD

diff --git a/y2020/vision/sift/BUILD b/y2020/vision/sift/BUILD
index 5b99411..b4610d7 100644
--- a/y2020/vision/sift/BUILD
+++ b/y2020/vision/sift/BUILD
@@ -76,7 +76,7 @@
     # all the redundant versions for other sizes, and maybe stop doing the one
     # we don't actually use.
     [
-        "1.2489997148513794",
+        "1.2489995956420898",
         "1p24",
         "11",
     ],
@@ -90,23 +90,23 @@
 sizes = [
     [
         1280,
-        720,
+        960,
     ],
     [
         640,
-        360,
+        480,
     ],
     [
         320,
-        180,
+        240,
     ],
     [
         160,
-        90,
+        120,
     ],
     [
         80,
-        45,
+        60,
     ],
 ]
 

y2020/vision/sift/sift971.cc

diff --git a/y2020/vision/sift/sift971.cc b/y2020/vision/sift/sift971.cc
index 4fbf181..93d71e4 100644
--- a/y2020/vision/sift/sift971.cc
+++ b/y2020/vision/sift/sift971.cc
@@ -1164,7 +1164,7 @@
                                     std::vector<KeyPoint> &keypoints,
                                     OutputArray _descriptors,
                                     bool useProvidedKeypoints) {
-  int firstOctave = 0, actualNOctaves = 0, actualNLayers = 0;
+  int firstOctave = -1, actualNOctaves = 0, actualNLayers = 0;
   Mat image = _image.getMat(), mask = _mask.getMat();
 
   if (image.empty() || image.depth() != CV_8U)