Revert "Merge pull request #1951 from Komzpa/drop_circles"

This reverts commit 76bfb712f9e1b10506f1f9854b125d5da8989799, reversing
changes made to a3663831dc4300feb99e1d1e99acc59341412a95.

1 files changed, 16 insertions, 0 deletions

diff --git a/indexer/drawing_rules.cpp b/indexer/drawing_rules.cpp
index 978d4a4c90..4eea7e4dd9 100644
--- a/indexer/drawing_rules.cpp
+++ b/indexer/drawing_rules.cpp
@@ -69,6 +69,11 @@ CaptionDefProto const * BaseRule::GetCaption(int) const
   return 0;
 }
 
+CircleRuleProto const * BaseRule::GetCircle() const
+{
+  return 0;
+}
+
 RulesHolder::~RulesHolder()
 {
   Clean();
@@ -204,6 +209,14 @@ namespace
     typedef CaptionT<CaptionRuleProto> Caption;
     typedef CaptionT<PathTextRuleProto> PathText;
 
+    class Circle : public BaseRule
+    {
+      CircleRuleProto m_circle;
+    public:
+      Circle(CircleRuleProto const & r) : m_circle(r) {}
+
+      virtual CircleRuleProto const * GetCircle() const { return &m_circle; }
+    };
   }
 
   class DoSetIndex
@@ -312,6 +325,9 @@ namespace
           if (de.has_caption())
             AddRule<Caption>(p, de.scale(), caption, de.caption());
 
+          if (de.has_circle())
+            AddRule<Circle>(p, de.scale(), circle, de.circle());
+
           if (de.has_path_text())
             AddRule<PathText>(p, de.scale(), pathtext, de.path_text());
         }