Merge remote-tracking branch 'upstream/master'

2012-05-10 22:06:43 -06:00 · 2012-05-10 22:06:43 -06:00 · f3ca3addbf
parent dce7f17fe7 92f069e209
commit f3ca3addbf
2 changed files with 14 additions and 4 deletions
--- a/library/xml
+++ b/library/xml
@ -1 +1 @@
-Subproject commit 5707a6aa0c035348c8769058ed77b320f9b1436c
+Subproject commit 970bb0ae9530e9c0522cb0ca8fe357815d72fab1
--- 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 @@ public:
    };
    ~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: