* long overdue update to AGG 2.4
* removed the useless parts of AGG (which are only needed for the interactive examples) * make sure to jam -a libagg.a to solve any linking issues git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17838 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
//----------------------------------------------------------------------------
|
||||
// Anti-Grain Geometry - Version 2.2
|
||||
// Copyright (C) 2002-2004 Maxim Shemanarev (http://www.antigrain.com)
|
||||
// Anti-Grain Geometry - Version 2.4
|
||||
// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
|
||||
//
|
||||
// Permission to copy, use, modify, sell and distribute this software
|
||||
// is granted provided this copyright notice appears in all copies.
|
||||
@@ -17,7 +17,6 @@
|
||||
#define AGG_CONV_ADAPTOR_VCGEN_INCLUDED
|
||||
|
||||
#include "agg_basics.h"
|
||||
#include "agg_vertex_iterator.h"
|
||||
|
||||
namespace agg
|
||||
{
|
||||
@@ -30,11 +29,6 @@ namespace agg
|
||||
|
||||
void rewind(unsigned) {}
|
||||
unsigned vertex(double*, double*) { return path_cmd_stop; }
|
||||
|
||||
typedef null_markers source_type;
|
||||
typedef vertex_iterator<source_type> iterator;
|
||||
iterator begin(unsigned id) { return iterator(*this, id); }
|
||||
iterator end() { return iterator(path_cmd_stop); }
|
||||
};
|
||||
|
||||
|
||||
@@ -55,8 +49,7 @@ namespace agg
|
||||
m_source(&source),
|
||||
m_status(initial)
|
||||
{}
|
||||
|
||||
void set_source(VertexSource& source) { m_source = &source; }
|
||||
void attach(VertexSource& source) { m_source = &source; }
|
||||
|
||||
Generator& generator() { return m_generator; }
|
||||
const Generator& generator() const { return m_generator; }
|
||||
@@ -64,19 +57,14 @@ namespace agg
|
||||
Markers& markers() { return m_markers; }
|
||||
const Markers& markers() const { return m_markers; }
|
||||
|
||||
void rewind(unsigned id)
|
||||
void rewind(unsigned path_id)
|
||||
{
|
||||
m_source->rewind(id);
|
||||
m_source->rewind(path_id);
|
||||
m_status = initial;
|
||||
}
|
||||
|
||||
unsigned vertex(double* x, double* y);
|
||||
|
||||
typedef conv_adaptor_vcgen<VertexSource, Generator, Markers> source_type;
|
||||
typedef vertex_iterator<source_type> iterator;
|
||||
iterator begin(unsigned id) { return iterator(*this, id); }
|
||||
iterator end() { return iterator(path_cmd_stop); }
|
||||
|
||||
private:
|
||||
// Prohibit copying
|
||||
conv_adaptor_vcgen(const conv_adaptor_vcgen<VertexSource, Generator, Markers>&);
|
||||
|
||||
Reference in New Issue
Block a user