From e2597ef3153d850c3f5e9f0b4a58e86141c56693 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Tue, 14 Aug 2012 16:11:17 +0200
Subject: [PATCH] change the color_ts in a better class anc rename VectorType
in Vector
---
parserSVG/Base.cpp | 8 ++++----
parserSVG/Base.h | 5 +++--
parserSVG/Group.h | 4 ++--
parserSVG/Path.cpp | 4 ++--
parserSVG/Path.h | 2 +-
parserSVG/Polygon.h | 4 ++--
parserSVG/Polyline.h | 4 ++--
parserSVG/Renderer.cpp | 2 +-
parserSVG/Renderer.h | 5 +++--
parserSVG/parserSVG.h | 4 ++--
10 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/parserSVG/Base.cpp b/parserSVG/Base.cpp
index 2339e86..ec9221e 100644
--- a/parserSVG/Base.cpp
+++ b/parserSVG/Base.cpp
@@ -407,9 +407,9 @@ bool strnCmpNoCase(const char * input1, const char * input2, int32_t maxLen)
* @param[in] inputData Data C String with the xml definition
* @return the parsed color
*/
-color_ts svg::Base::ParseColor(const char *inputData)
+etk::Color svg::Base::ParseColor(const char *inputData)
{
- color_ts localColor = etk::color::color_White;;
+ etk::Color localColor = etk::color::white;
size_t len = strlen(inputData);
@@ -423,7 +423,7 @@ color_ts svg::Base::ParseColor(const char *inputData)
}
SVG_ERROR(" pb in parsing the color : \"" << inputData << "\" ==> url(XXX) is not supported now ...");
} else {
- localColor = etk::color::Parse(inputData);
+ localColor = inputData;
}
SVG_VERBOSE("Parse color : \"" << inputData << "\" ==> " << localColor);
return localColor;
@@ -455,7 +455,7 @@ const char * svg::Base::SpacingDist(int32_t spacing)
/*
-void svg::Base::AggCheckChange(agg::path_storage& path, etk::VectorType<agg::rgba8> &colors, etk::VectorType<uint32_t> &pathIdx, PaintState &curentPaintProp)
+void svg::Base::AggCheckChange(agg::path_storage& path, etk::Vector<agg::rgba8> &colors, etk::Vector<uint32_t> &pathIdx, PaintState &curentPaintProp)
{
if (curentPaintProp != m_paint) {
SVG_INFO("add path color = " << m_paint.fill);
diff --git a/parserSVG/Base.h b/parserSVG/Base.h
index b0dbd5b..896ea67 100644
--- a/parserSVG/Base.h
+++ b/parserSVG/Base.h
@@ -26,7 +26,8 @@
#define __SVG_BASE_H__
#include <etk/Types.h>
-#include <etk/VectorType.h>
+#include <etk/Vector.h>
+#include <etk/Color.h>
#include <tinyXML/tinyxml.h>
#include <parserSVG/Renderer.h>
@@ -63,7 +64,7 @@ namespace svg
void ParsePosition(const TiXmlNode *node, Vector2D<float> &pos, Vector2D<float> &size);
float ParseLength(const char *dataInput);
void ParsePaintAttr(const TiXmlNode *node);
- color_ts ParseColor(const char *inputData);
+ etk::Color ParseColor(const char *inputData);
};
};
diff --git a/parserSVG/Group.h b/parserSVG/Group.h
index e7c619c..3eed91d 100644
--- a/parserSVG/Group.h
+++ b/parserSVG/Group.h
@@ -26,14 +26,14 @@
#define __SVG_GROUP_H__
#include <parserSVG/Base.h>
-#include <etk/VectorType.h>
+#include <etk/Vector.h>
namespace svg
{
class Group : public svg::Base
{
private:
- etk::VectorType<svg::Base *> m_subElementList; //!< group sub elements ...
+ etk::Vector<svg::Base *> m_subElementList; //!< group sub elements ...
public:
Group(PaintState parentPaintState);
~Group(void);
diff --git a/parserSVG/Path.cpp b/parserSVG/Path.cpp
index 321c867..eebecd3 100644
--- a/parserSVG/Path.cpp
+++ b/parserSVG/Path.cpp
@@ -42,7 +42,7 @@ svg::Path::~Path(void)
// return the next char position ... (after 'X' or NULL)
-const char * extractCmd(const char * input, char& cmd, etk::VectorType<float>& outputList)
+const char * extractCmd(const char * input, char& cmd, etk::Vector<float>& outputList)
{
if (*input == '\0') {
return NULL;
@@ -95,7 +95,7 @@ bool svg::Path::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D
SVG_VERBOSE("Parse Path : \"" << elementXML << "\"");
char command;
- etk::VectorType<float> listDot;
+ etk::Vector<float> listDot;
for( const char *sss=extractCmd(elementXML, command, listDot);
NULL != sss;
diff --git a/parserSVG/Path.h b/parserSVG/Path.h
index 75c0e73..440fe07 100644
--- a/parserSVG/Path.h
+++ b/parserSVG/Path.h
@@ -52,7 +52,7 @@ namespace svg
class Path : public svg::Base
{
private:
- etk::VectorType<pathBasic_ts> m_listElement;
+ etk::Vector<pathBasic_ts> m_listElement;
public:
Path(PaintState parentPaintState);
~Path(void);
diff --git a/parserSVG/Polygon.h b/parserSVG/Polygon.h
index bac6dec..f2019cb 100644
--- a/parserSVG/Polygon.h
+++ b/parserSVG/Polygon.h
@@ -26,7 +26,7 @@
#define __SVG_POLYGON_H__
#include <parserSVG/Base.h>
-#include <etk/VectorType.h>
+#include <etk/Vector.h>
namespace svg
{
@@ -37,7 +37,7 @@ namespace svg
class Polygon : public svg::Base
{
private:
- etk::VectorType<Vector2D<float> > m_listPoint; //!< list of all point of the polygone
+ etk::Vector<Vector2D<float> > m_listPoint; //!< list of all point of the polygone
PolygonMode_te m_diplayMode; //!< polygone specific display mode
public:
Polygon(PaintState parentPaintState);
diff --git a/parserSVG/Polyline.h b/parserSVG/Polyline.h
index 772c7b2..ff0c0cb 100644
--- a/parserSVG/Polyline.h
+++ b/parserSVG/Polyline.h
@@ -26,14 +26,14 @@
#define __SVG_POLYLINE_H__
#include <parserSVG/Base.h>
-#include <etk/VectorType.h>
+#include <etk/Vector.h>
namespace svg
{
class Polyline : public svg::Base
{
private:
- etk::VectorType<Vector2D<float> > m_listPoint; //!< list of all point of the polyline
+ etk::Vector<Vector2D<float> > m_listPoint; //!< list of all point of the polyline
public:
Polyline(PaintState parentPaintState);
~Polyline(void);
diff --git a/parserSVG/Renderer.cpp b/parserSVG/Renderer.cpp
index 7c9bf58..43267db 100644
--- a/parserSVG/Renderer.cpp
+++ b/parserSVG/Renderer.cpp
@@ -96,7 +96,7 @@ void svg::Renderer::WritePpm(etk::UString fileName)
if (NULL == m_buffer) {
return;
}
- FILE* fd = fopen(fileName.Utf8Data(), "wb");
+ FILE* fd = fopen(fileName.c_str(), "wb");
if(NULL != fd) {
int32_t sizeX = m_size.x;
int32_t sizeY = m_size.y;
diff --git a/parserSVG/Renderer.h b/parserSVG/Renderer.h
index 4479dcc..07c6d04 100644
--- a/parserSVG/Renderer.h
+++ b/parserSVG/Renderer.h
@@ -26,6 +26,7 @@
#define __SVG_RENDERER_H__
#include <etk/UString.h>
+#include <etk/Color.h>
#include <agg/agg_basics.h>
#include <agg/agg_rendering_buffer.h>
@@ -53,8 +54,8 @@ namespace svg
class PaintState {
public:
- color_ts fill;
- color_ts stroke;
+ etk::Color fill;
+ etk::Color stroke;
float strokeWidth;
bool flagEvenOdd;
lineCap_te lineCap;
diff --git a/parserSVG/parserSVG.h b/parserSVG/parserSVG.h
index bf07a53..ff03402 100644
--- a/parserSVG/parserSVG.h
+++ b/parserSVG/parserSVG.h
@@ -26,7 +26,7 @@
#define __SVG_PARSER_H__
#include <etk/File.h>
-#include <etk/VectorType.h>
+#include <etk/Vector.h>
#include <parserSVG/Base.h>
namespace svg
@@ -38,7 +38,7 @@ namespace svg
bool m_loadOK;
etk::UString m_version;
etk::UString m_title;
- etk::VectorType<svg::Base *> m_subElementList;
+ etk::Vector<svg::Base *> m_subElementList;
Vector2D<float> m_size;
svg::Renderer* m_renderedElement;