diff base/BaseTypes.h @ 1530:bf32b26d1dad zoom

Fix (bodgily) things broken in the merge

--- a/base/BaseTypes.h	Tue Sep 18 15:06:58 2018 +0100
+++ b/base/BaseTypes.h	Tue Sep 18 16:03:29 2018 +0100
@@ -67,6 +67,8 @@
     Zone zone;
     int level;
 
+    ZoomLevel(Zone z, int l) : zone(z), level(l) { }
+    
     bool operator<(const ZoomLevel &other) const {
         if (zone == FramesPerPixel) {
             if (other.zone == zone) {
@@ -83,6 +85,10 @@
         }
     }
 
+    bool operator==(const ZoomLevel &other) const {
+        return (zone == other.zone && level == other.level);
+    }
+    
     ZoomLevel incremented() const {
         if (zone == FramesPerPixel) {
             return { zone, level + 1 };