Revert "drawing ellipses antialiased with Cairo"

This reverts commit 7ce445025e10bf4eb0c4066907e588039c09f1ad.

4 files changed, 1 insertions, 20 deletions

diff --git a/libtemplate/template.c b/libtemplate/template.c
index e6141f2..ef7d677 100644
--- a/libtemplate/template.c
+++ b/libtemplate/template.c
@@ -250,8 +250,6 @@ void cTemplate::CachePixmapImages(cTemplatePixmap *pix) {
     while(func = pix->GetNextFunction()) {
         if (func->GetType() == ftDrawImage) {
             CacheImage(func);
-        } else if (func->GetType() == ftDrawEllipse) {
-            CacheEllipse(func);
         }
     }
 }
@@ -281,12 +279,3 @@ void cTemplate::CacheImage(cTemplateFunction *func) {
             break;
     }
 }
-
-void cTemplate::CacheEllipse(cTemplateFunction *func) {
-    int id = func->GetId();
-    int w = func->GetNumericParameter(ptWidth);
-    int h = func->GetNumericParameter(ptHeight);
-    tColor clr = func->GetColorParameter(ptColor);
-    int quadrant = func->GetNumericParameter(ptQuadrant);
-    imgCache->CacheEllipse(id, w, h, clr, quadrant);
-}
diff --git a/libtemplate/template.h b/libtemplate/template.h
index e0a8066..2c1cfb2 100644
--- a/libtemplate/template.h
+++ b/libtemplate/template.h
@@ -34,7 +34,6 @@ private:
     eViewType viewType;
     void CachePixmapImages(cTemplatePixmap *pix);
     void CacheImage(cTemplateFunction *func);
-    void CacheEllipse(cTemplateFunction *func);
 protected:
     cGlobals *globals;
     cTemplateView *rootView;
diff --git a/libtemplate/templatefunction.c b/libtemplate/templatefunction.c
index 1ddf297..8465961 100644
--- a/libtemplate/templatefunction.c
+++ b/libtemplate/templatefunction.c
@@ -6,10 +6,7 @@ using namespace std;
 

 // --- cTemplateFunction -------------------------------------------------------------

 

-int cTemplateFunction::nextId = 0;

-

-cTemplateFunction::cTemplateFunction(eFuncType type) {

-    id = nextId++;

+cTemplateFunction::cTemplateFunction(eFuncType type) { 

     this->type = type;

     debug = false;

     containerX = 0; 

diff --git a/libtemplate/templatefunction.h b/libtemplate/templatefunction.h
index 59d6002..f7af25c 100644
--- a/libtemplate/templatefunction.h
+++ b/libtemplate/templatefunction.h
@@ -102,10 +102,7 @@ enum eOverflowType {
 };
 
 class cTemplateFunction {
-private:
-    static int nextId;
 protected:
-    int id;
     eFuncType type;
     bool debug;
     int containerX;                                                       //X of parent container
@@ -188,7 +185,6 @@ public:
     //Parse parameters with dynamically set Tokens
     bool ParseParameters(void);
     //Getter Functions
-    int GetId(void) { return id; };
     eFuncType GetType(void) { return type; };
     bool DoDebug(void) { return debug; };
     string GetParameter(eParamType type);