Skip to content
Permalink
Browse files

Fixes for UTFGrid merge into master, tests added (#4765)

  • Loading branch information
tbonfort committed Sep 25, 2013
1 parent f0a45de commit e208e844e828e6a89195ba93c23b0390cc3b331a
Showing with 1,904 additions and 2,116 deletions.
  1. +0 −6 CMakeLists.txt
  2. +0 −1 mapagg.cpp
  3. +5 −38 mapagg.h
  4. +0 −153 mapaggcommon.h
  5. +1,892 −1,897 maplexer.c
  6. +1 −1 mapoutput.c
  7. +5 −19 maputfgrid.cpp
  8. +1 −1 msautotest
@@ -130,7 +130,6 @@ option(WITH_SDE_PLUGIN "include ArcSDE support as a plugin (must specify SDE_INC
option(WITH_SDE "include ArcSDE support. Add -DSDE_VERSION=91 to use 9.1 arcSDE version" OFF)
option(WITH_EXEMPI "include xmp output metadata support" OFF)
option(WITH_XMLMAPFILE "include native xml mapfile support (requires libxslt/libexslt)" OFF)
option(WITH_AGG_ALIASED "turn off antialising on AGG" OFF)

option(BUILD_STATIC "Also build a static version of mapserver" OFF)
option(LINK_STATIC_LIBMAPSERVER "Link to static version of libmapserver (also for mapscripts)" OFF)
@@ -342,10 +341,6 @@ if(WITH_ICONV)
endif(ICONV_FOUND)
endif (WITH_ICONV)

if(WITH_AGG_ALIASED)
set (AGG_ALIASED_ENABLED 1)
endif(WITH_AGG_ALIASED)

if(WITH_GENERIC_NINT)
set(USE_GENERIC_MS_NINT 1)
endif(WITH_GENERIC_NINT)
@@ -867,7 +862,6 @@ status_optional_feature("WCS SERVER" "${USE_WCS_SVR}")
status_optional_feature("SOS SERVER" "${USE_SOS_SVR}")
status_optional_feature("WMS CLIENT" "${USE_WMS_LYR}")
status_optional_feature("WFS CLIENT" "${USE_WFS_LYR}")
status_optional_feature("AGG ALISING" "${AGG_ALIASED_ENABLED}")
status_optional_feature("ICONV" "${USE_ICONV}")
status_optional_feature("Thread-safety support" "${USE_THREAD}")
status_optional_feature("KML output" "${USE_KML}")
@@ -30,7 +30,6 @@
#include "mapserver.h"
#include "fontcache.h"
#include "mapagg.h"
#include "mapaggcommon.h"
#include <assert.h>
#include "renderers/agg/include/agg_color_rgba.h"
#include "renderers/agg/include/agg_pixfmt_rgba.h"
@@ -4,6 +4,7 @@
* Project: MapServer
* Purpose: AGG template library types.
* Author: John Novak (jnovak@novacell.com)
* Author: Thomas Bonfort (tbonfort@terriscope.fr)
*
******************************************************************************
* Copyright (c) 1996-2007 Regents of the University of Minnesota.
@@ -27,7 +28,7 @@
* DEALINGS IN THE SOFTWARE.
******************************************************************************/

#include "renderers/agg/include/agg_rendering_buffer.h"
#include "renderers/agg/include/agg_path_storage.h"

/*
* interface to a shapeObj representing lines, providing the functions
@@ -75,31 +76,14 @@ class line_adaptor

return vertex(x,y); /*this will return the first point of the next line*/
}
private:
protected:
shapeObj *s;
lineObj *m_line, /*current line pointer*/
*m_lend; /*points to after the last line*/
pointObj *m_point, /*current point*/
*m_pend; /*points to after last point of current line*/
};

class offset_line_adaptor: public line_adaptor
{
public:
offset_line_adaptor(shapeObj *shape, double ox, double oy):line_adaptor(shape),ox(ox),oy(oy) {
}

unsigned vertex(double* x, double* y) {
unsigned ret = line_adaptor::vertex(x,y);
*x+=ox;
*y+=oy;
return ret;
}
private:
double ox,oy;
};



class polygon_adaptor
{
@@ -154,7 +138,7 @@ class polygon_adaptor
* of the shape. return the command to stop processing this shape*/
return mapserver::path_cmd_stop;
}
private:
protected:
shapeObj *s;
double ox,oy;
lineObj *m_line, /*pointer to current line*/
@@ -164,21 +148,4 @@ class polygon_adaptor
bool m_stop; /*should next call return stop command*/
};

class offset_polygon_adaptor: public polygon_adaptor
{
public:
offset_polygon_adaptor(shapeObj *shape, double ox, double oy):polygon_adaptor(shape),ox(ox),oy(oy) {
}

unsigned vertex(double* x, double* y) {
unsigned ret = polygon_adaptor::vertex(x,y);
*x+=ox;
*y+=oy;
return ret;
}
private:
double ox,oy;
};



mapserver::path_storage imageVectorSymbol(symbolObj *);

This file was deleted.

0 comments on commit e208e84

Please sign in to comment.
You can’t perform that action at this time.