commit ef47dbfca15a688c5434238a09f2c4fc937a3f9e
author Parker Schuh <parker.schuh+gerrit_code_review@gmail.com> Sat Mar 04 16:59:30 2017 -0800
committer Parker Schuh <parker.schuh+gerrit_code_review@gmail.com> Sat Mar 04 16:59:30 2017 -0800
tree 897dbd9ec4955e4fa8aaffded666eeaff86372d7
parent 971588aa8abf7287eaf2bb521dddc14eae2dd7a7

Renamed debug_viewer to debug_window to avoid confusion between year specific debug_viewer and debug_window.

Change-Id: I0bbd015f12abf3ffaabfd1181ff87f894a301495

aos/vision/blob/BUILD

diff --git a/aos/vision/blob/BUILD b/aos/vision/blob/BUILD
index cf728c5..7d57f50 100644
--- a/aos/vision/blob/BUILD
+++ b/aos/vision/blob/BUILD
@@ -100,6 +100,7 @@
   srcs = ['move_scale.cc'],
   deps = [
     ':range_image',
+    '//aos/vision/image:image_types',
   ],
 )
 
@@ -136,7 +137,7 @@
   hdrs = ['stream_view.h'],
   deps = [
     ':range_image',
-    '//aos/vision/debug:debug_viewer',
+    '//aos/vision/debug:debug_window',
     '//aos/vision/image:image_types',
   ],
 )

aos/vision/blob/move_scale.h

diff --git a/aos/vision/blob/move_scale.h b/aos/vision/blob/move_scale.h
index e45e14d..061da5c 100644
--- a/aos/vision/blob/move_scale.h
+++ b/aos/vision/blob/move_scale.h
@@ -5,18 +5,11 @@
 #include <vector>
 
 #include "aos/vision/blob/range_image.h"
+#include "aos/vision/image/image_types.h"
 
 namespace aos {
 namespace vision {
 
-// Bounding box for a RangeImage.
-struct ImageBBox {
-  int minx = std::numeric_limits<int>::max();
-  int maxx = std::numeric_limits<int>::min();
-  int miny = std::numeric_limits<int>::max();
-  int maxy = std::numeric_limits<int>::min();
-};
-
 // Sums img into bbox. bbox is constructed empty and grows with each call
 // to GetBBox.
 void GetBBox(const RangeImage &img, ImageBBox *bbox);

aos/vision/blob/stream_view.h

diff --git a/aos/vision/blob/stream_view.h b/aos/vision/blob/stream_view.h
index a6a661a..4cee7b4 100644
--- a/aos/vision/blob/stream_view.h
+++ b/aos/vision/blob/stream_view.h
@@ -2,7 +2,7 @@
 #define _AOS_VISION_BLOB_STREAM_VIEW_H_
 
 #include "aos/vision/blob/range_image.h"
-#include "aos/vision/debug/debug_viewer.h"
+#include "aos/vision/debug/debug_window.h"
 #include "aos/vision/image/image_types.h"
 
 #include <memory>
@@ -10,10 +10,10 @@
 namespace aos {
 namespace vision {
 
-class BlobStreamViewer : public DebugViewer {
+class BlobStreamViewer : public DebugWindow {
  public:
-  BlobStreamViewer() : DebugViewer(false) {}
-  explicit BlobStreamViewer(bool flip) : DebugViewer(flip) {}
+  BlobStreamViewer() : DebugWindow(false) {}
+  explicit BlobStreamViewer(bool flip) : DebugWindow(flip) {}
 
   void Submit(ImageFormat fmt, const BlobList &blob_list) {
     SetFormatAndClear(fmt);
@@ -77,7 +77,7 @@
   }
 
   // Backwards compatible.
-  DebugViewer *view() { return this; }
+  DebugWindow *view() { return this; }
 
   ImagePtr img() { return image_.get(); }