Merge remote-tracking branch 'upstream/master'

GrimDerp · May 11, 2012 · f3ca3ad · f3ca3ad
2 parents dce7f17 + 92f069e
commit f3ca3ad
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/library/xml b/library/xml
diff --git a/plugins/Brushes.h b/plugins/Brushes.h
@@ -1,4 +1,9 @@
 #pragma once
+#include <llimits.h>
+#include <sstream>
+#include <string>
+#include <stack>
+#include <set>
 
 typedef vector <df::coord> coord_vec;
 class Brush
@@ -60,10 +65,15 @@ class RectangleBrush : public Brush
     };
     ~RectangleBrush(){};
     std::string str() const {
-        if (x_ == 1 && y_ == 1 && z_ == 1) {
+        if (x_ == 1 && y_ == 1 && z_ == 1)
+        {
             return "point";
-        } else {
-            return "rectangle";
+        }
+        else
+        {
+            std::ostringstream ss;
+            ss << "rect: " << x_ << "/" << y_ << "/" << z_ << std::endl;
+            return ss.str();
         }
     }
 private: