- another bunch of coding style fixes in includes
This commit is contained in:
kunitoki
parent
919f5ccab5
commit
eb13c8c6be
128 changed files with 508 additions and 538 deletions
|
|
@ -19,15 +19,16 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id$
|
||||
|
||||
#ifndef MAPNIK_AGG_PATTERN_SOURCE_HPP
|
||||
#define MAPNIK_AGG_PATTERN_SOURCE_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/image_data.hpp>
|
||||
|
||||
// boost
|
||||
#include <boost/utility.hpp>
|
||||
|
||||
// agg
|
||||
#include "agg_color_rgba.h"
|
||||
|
||||
|
|
@ -61,4 +62,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif //MAPNIK_AGG_PATTERN_SOURCE_HPP
|
||||
#endif // MAPNIK_AGG_PATTERN_SOURCE_HPP
|
||||
|
|
|
|||
|
|
@ -19,12 +19,14 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id$
|
||||
|
||||
#ifndef MAPNIK_AGG_RASTERIZER_HPP
|
||||
#define MAPNIK_AGG_RASTERIZER_HPP
|
||||
|
||||
// boost
|
||||
#include <boost/utility.hpp>
|
||||
|
||||
// agg
|
||||
#include "agg_rasterizer_scanline_aa.h"
|
||||
|
||||
namespace mapnik {
|
||||
|
|
@ -33,4 +35,4 @@ struct rasterizer : agg::rasterizer_scanline_aa<>, boost::noncopyable {};
|
|||
|
||||
}
|
||||
|
||||
#endif //MAPNIK_AGG_RASTERIZER_HPP
|
||||
#endif // MAPNIK_AGG_RASTERIZER_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef AGG_RENDERER_HPP
|
||||
#define AGG_RENDERER_HPP
|
||||
#ifndef MAPNIK_AGG_RENDERER_HPP
|
||||
#define MAPNIK_AGG_RENDERER_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/config.hpp>
|
||||
|
|
@ -134,4 +132,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif //AGG_RENDERER_HPP
|
||||
#endif // MAPNIK_AGG_RENDERER_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef ARROW_HPP
|
||||
#define ARROW_HPP
|
||||
#ifndef MAPNIK_ARROW_HPP
|
||||
#define MAPNIK_ARROW_HPP
|
||||
|
||||
#include <mapnik/box2d.hpp>
|
||||
|
||||
|
|
@ -44,4 +42,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif // ARROW_HPP
|
||||
#endif // MAPNIK_ARROW_HPP
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef MAPNIK_ATTRIBUTE_HPP
|
||||
#define MAPNIK_ATTRIBUTE_HPP
|
||||
|
||||
|
|
|
|||
|
|
@ -20,20 +20,20 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef ATTRIBUTE_COLLECTOR_HPP
|
||||
#define ATTRIBUTE_COLLECTOR_HPP
|
||||
#ifndef MAPNIK_ATTRIBUTE_COLLECTOR_HPP
|
||||
#define MAPNIK_ATTRIBUTE_COLLECTOR_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/feature_layer_desc.hpp>
|
||||
#include <mapnik/rule.hpp>
|
||||
#include <mapnik/path_expression_grammar.hpp>
|
||||
#include <mapnik/parse_path.hpp>
|
||||
|
||||
// boost
|
||||
#include <boost/utility.hpp>
|
||||
#include <boost/variant.hpp>
|
||||
#include <boost/concept_check.hpp>
|
||||
|
||||
// stl
|
||||
#include <set>
|
||||
#include <iostream>
|
||||
|
|
@ -271,4 +271,4 @@ private:
|
|||
|
||||
} // namespace mapnik
|
||||
|
||||
#endif //ATTRIBUTE_COLLECTOR_HPP
|
||||
#endif // MAPNIK_ATTRIBUTE_COLLECTOR_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef ATTRIBUTE_DESCRIPTOR
|
||||
#define ATTRIBUTE_DESCRIPTOR
|
||||
#ifndef MAPNIK_ATTRIBUTE_DESCRIPTOR_HPP
|
||||
#define MAPNIK_ATTRIBUTE_DESCRIPTOR_HPP
|
||||
|
||||
#include <string>
|
||||
|
||||
|
|
@ -118,4 +116,4 @@ operator << (std::basic_ostream<charT,traits>& out,
|
|||
|
||||
}
|
||||
|
||||
#endif // ATTRIBUTE_DESCRIPTOR_HPP
|
||||
#endif // MAPNIK_ATTRIBUTE_DESCRIPTOR_HPP
|
||||
|
|
|
|||
|
|
@ -20,16 +20,16 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: box2d.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef MAPNIK_BOX2D_HPP
|
||||
#define MAPNIK_BOX2D_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/config.hpp>
|
||||
#include <mapnik/coord.hpp>
|
||||
|
||||
// boost
|
||||
#include <boost/operators.hpp>
|
||||
|
||||
// stl
|
||||
#include <iomanip>
|
||||
|
||||
|
|
|
|||
|
|
@ -20,14 +20,10 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#if defined(HAVE_CAIRO)
|
||||
|
||||
#ifndef CAIRO_RENDERER_HPP
|
||||
#define CAIRO_RENDERER_HPP
|
||||
|
||||
|
||||
#ifndef MAPNIK_CAIRO_RENDERER_HPP
|
||||
#define MAPNIK_CAIRO_RENDERER_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/config.hpp>
|
||||
|
|
@ -152,6 +148,6 @@ public:
|
|||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif // MAPNIK_CAIRO_RENDERER_HPP
|
||||
|
||||
#endif //CAIRO_RENDERER_HPP
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: color.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef COLOR_HPP
|
||||
#define COLOR_HPP
|
||||
#ifndef MAPNIK_COLOR_HPP
|
||||
#define MAPNIK_COLOR_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/config.hpp>
|
||||
|
|
@ -32,6 +30,7 @@
|
|||
//boost
|
||||
#include <boost/cstdint.hpp>
|
||||
#include <boost/operators.hpp>
|
||||
|
||||
// stl
|
||||
#include <sstream>
|
||||
|
||||
|
|
@ -141,4 +140,4 @@ public:
|
|||
|
||||
}
|
||||
|
||||
#endif //COLOR_HPP
|
||||
#endif // MAPNIK_COLOR_HPP
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef MAPNIK_COLOR_FACTORY_HPP
|
||||
#define MAPNIK_COLOR_FACTORY_HPP
|
||||
|
||||
|
|
@ -120,4 +118,4 @@ public:
|
|||
|
||||
#endif
|
||||
|
||||
#endif //MAPNIK_COLOR_FACTORY_HPP
|
||||
#endif // MAPNIK_COLOR_FACTORY_HPP
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef CONFIG_HPP
|
||||
#define CONFIG_HPP
|
||||
#ifndef MAPNIK_CONFIG_HPP
|
||||
#define MAPNIK_CONFIG_HPP
|
||||
|
||||
// Windows DLL support
|
||||
|
||||
|
|
@ -47,4 +47,5 @@
|
|||
#endif
|
||||
|
||||
#define PROJ_ENVELOPE_POINTS 20
|
||||
#endif // CONFIG_HPP
|
||||
|
||||
#endif // MAPNIK_CONFIG_HPP
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef MAPNIK_CONFIG_ERROR_INCLUDED
|
||||
#define MAPNIK_CONFIG_ERROR_INCLUDED
|
||||
#ifndef MAPNIK_CONFIG_ERROR_HPP
|
||||
#define MAPNIK_CONFIG_ERROR_HPP
|
||||
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
|
@ -54,4 +54,4 @@ protected:
|
|||
};
|
||||
}
|
||||
|
||||
#endif // MAPNIK_CONFIG_ERROR_INCLUDED
|
||||
#endif // MAPNIK_CONFIG_ERROR_HPP
|
||||
|
|
|
|||
|
|
@ -20,12 +20,13 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: coord.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef COORD_HPP
|
||||
#define COORD_HPP
|
||||
#ifndef MAPNIK_COORD_HPP
|
||||
#define MAPNIK_COORD_HPP
|
||||
|
||||
// boost
|
||||
#include <boost/operators.hpp>
|
||||
|
||||
// stl
|
||||
#include <iomanip>
|
||||
#include <sstream>
|
||||
|
||||
|
|
@ -187,4 +188,4 @@ operator << (std::basic_ostream<charT,traits>& out,
|
|||
}
|
||||
}
|
||||
|
||||
#endif // COORD_HPP
|
||||
#endif // MAPNIK_COORD_HPP
|
||||
|
|
|
|||
|
|
@ -20,13 +20,12 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: coord_array.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef COORD_ARRAY_HPP
|
||||
#define COORD_ARRAY_HPP
|
||||
#ifndef MAPNIK_COORD_ARRAY_HPP
|
||||
#define MAPNIK_COORD_ARRAY_HPP
|
||||
|
||||
//mapnik
|
||||
#include <mapnik/coord.hpp>
|
||||
|
||||
// stl
|
||||
#include <cassert>
|
||||
|
||||
|
|
@ -89,4 +88,4 @@ private:
|
|||
}
|
||||
|
||||
|
||||
#endif //COORD_ARRAY_HPP
|
||||
#endif // MAPNIK_COORD_ARRAY_HPP
|
||||
|
|
|
|||
|
|
@ -20,22 +20,23 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef MAPNIK_CSS_COLOR_GRAMMAR_HPP
|
||||
#define MAPNIK_CSS_COLOR_GRAMMAR_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/color.hpp>
|
||||
|
||||
// spirit2
|
||||
#include <boost/config/warning_disable.hpp>
|
||||
#include <boost/spirit/include/qi.hpp>
|
||||
#include <boost/spirit/include/qi_action.hpp>
|
||||
|
||||
// phoenix
|
||||
#include <boost/spirit/include/phoenix_core.hpp>
|
||||
#include <boost/spirit/include/phoenix_operator.hpp>
|
||||
#include <boost/spirit/include/phoenix_fusion.hpp>
|
||||
#include <boost/spirit/include/phoenix_function.hpp>
|
||||
|
||||
// fusion
|
||||
#include <boost/fusion/include/adapt_struct.hpp>
|
||||
#include <boost/fusion/include/adapt_adt.hpp>
|
||||
|
|
@ -387,4 +388,4 @@ struct css_color_grammar : qi::grammar<Iterator, color(), ascii_space_type>
|
|||
|
||||
}
|
||||
|
||||
#endif //MAPNIK_CSS_COLOR_GRAMMAR_HPP
|
||||
#endif // MAPNIK_CSS_COLOR_GRAMMAR_HPP
|
||||
|
|
|
|||
|
|
@ -20,22 +20,23 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef MAPNIK_CSS_COLOR_GRAMMAR_HPP
|
||||
#define MAPNIK_CSS_COLOR_GRAMMAR_HPP
|
||||
#ifndef MAPNIK_CSS_COLOR_GRAMMAR_DEPRECATED_HPP
|
||||
#define MAPNIK_CSS_COLOR_GRAMMAR_DEPRECATED_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/color.hpp>
|
||||
|
||||
// spirit2
|
||||
#include <boost/config/warning_disable.hpp>
|
||||
#include <boost/spirit/include/qi.hpp>
|
||||
#include <boost/spirit/include/qi_action.hpp>
|
||||
|
||||
// phoenix
|
||||
#include <boost/spirit/include/phoenix_core.hpp>
|
||||
#include <boost/spirit/include/phoenix_operator.hpp>
|
||||
#include <boost/spirit/include/phoenix_fusion.hpp>
|
||||
#include <boost/spirit/include/phoenix_function.hpp>
|
||||
|
||||
// fusion
|
||||
#include <boost/fusion/include/adapt_struct.hpp>
|
||||
|
||||
|
|
@ -45,7 +46,6 @@
|
|||
// stl
|
||||
#include <string>
|
||||
|
||||
|
||||
//BOOST_FUSION_ADAPT_CLASS(
|
||||
// mapnik::color,
|
||||
// (unsigned, unsigned, obj.red(), obj.set_red(val))
|
||||
|
|
@ -417,4 +417,4 @@ struct css_color_grammar : qi::grammar<Iterator, css(), ascii_space_type>
|
|||
|
||||
}
|
||||
|
||||
#endif //MAPNIK_CSS_COLOR_GRAMMAR_HPP
|
||||
#endif // MAPNIK_CSS_COLOR_GRAMMAR_DEPRECATED_HPP
|
||||
|
|
|
|||
|
|
@ -19,10 +19,9 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id$
|
||||
|
||||
#ifndef CTRANS_HPP
|
||||
#define CTRANS_HPP
|
||||
#ifndef MAPNIK_CTRANS_HPP
|
||||
#define MAPNIK_CTRANS_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/box2d.hpp>
|
||||
|
|
@ -518,4 +517,4 @@ public:
|
|||
};
|
||||
}
|
||||
|
||||
#endif //CTRANS_HPP
|
||||
#endif // MAPNIK_CTRANS_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,9 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: datasource.hpp 43 2005-04-22 18:52:47Z pavlenko $
|
||||
#ifndef MAPNIK_DATASOURCE_HPP
|
||||
#define MAPNIK_DATASOURCE_HPP
|
||||
|
||||
#ifndef DATASOURCE_HPP
|
||||
#define DATASOURCE_HPP
|
||||
// mapnik
|
||||
#include <mapnik/config.hpp>
|
||||
#include <mapnik/ctrans.hpp>
|
||||
|
|
@ -31,9 +30,11 @@
|
|||
#include <mapnik/feature.hpp>
|
||||
#include <mapnik/query.hpp>
|
||||
#include <mapnik/feature_layer_desc.hpp>
|
||||
|
||||
// boost
|
||||
#include <boost/utility.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
|
||||
// stl
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
|
@ -142,6 +143,7 @@ typedef boost::shared_ptr<datasource> datasource_ptr;
|
|||
delete ds; \
|
||||
} \
|
||||
//
|
||||
|
||||
}
|
||||
|
||||
#endif //DATASOURCE_HPP
|
||||
#endif // MAPNIK_DATASOURCE_HPP
|
||||
|
|
|
|||
|
|
@ -20,18 +20,18 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: datasource_cache.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef DATASOURCE_CACHE_HPP
|
||||
#define DATASOURCE_CACHE_HPP
|
||||
#ifndef MAPNIK_DATASOURCE_CACHE_HPP
|
||||
#define MAPNIK_DATASOURCE_CACHE_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/utils.hpp>
|
||||
#include <mapnik/params.hpp>
|
||||
#include <mapnik/plugin.hpp>
|
||||
#include <mapnik/datasource.hpp>
|
||||
|
||||
// boost
|
||||
#include <boost/shared_ptr.hpp>
|
||||
|
||||
// stl
|
||||
#include <map>
|
||||
|
||||
|
|
@ -57,4 +57,4 @@ public:
|
|||
};
|
||||
}
|
||||
|
||||
#endif //DATASOURCE_CACHE_HPP
|
||||
#endif // MAPNIK_DATASOURCE_CACHE_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef DISTANCE_HPP
|
||||
#define DISTANCE_HPP
|
||||
#ifndef MAPNIK_DISTANCE_HPP
|
||||
#define MAPNIK_DISTANCE_HPP
|
||||
|
||||
#include <mapnik/coord.hpp>
|
||||
|
||||
|
|
@ -52,4 +50,4 @@ public:
|
|||
*/
|
||||
}
|
||||
|
||||
#endif // GEO_UTILS_HPP
|
||||
#endif // MAPNIK_DISTANCE_HPP
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef MAPNIK_ELLIPSOID_HPP
|
||||
#define MAPNIK_ELLIPSOID_HPP
|
||||
|
||||
|
|
|
|||
|
|
@ -20,11 +20,13 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef MAPNIK_ENUMERATION_INCLUDED
|
||||
#define MAPNIK_ENUMERATION_INCLUDED
|
||||
#ifndef MAPNIK_ENUMERATION_HPP
|
||||
#define MAPNIK_ENUMERATION_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/config.hpp>
|
||||
|
||||
// stl
|
||||
#include <vector>
|
||||
#include <bitset>
|
||||
#include <iostream>
|
||||
|
|
@ -325,4 +327,4 @@ operator>>(std::istream & is, mapnik::enumeration<ENUM, THE_MAX> & e)
|
|||
template <> std::string name ::our_name_ = #name; \
|
||||
template <> bool name ::our_verified_flag_( name ::verify(__FILE__, __LINE__));
|
||||
|
||||
#endif // MAPNIK_ENUMERATION_INCLUDED
|
||||
#endif // MAPNIK_ENUMERATION_HPP
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef MAPNIK_EXPRESSION_EVALUATOR_HPP
|
||||
#define MAPNIK_EXPRESSION_EVALUATOR_HPP
|
||||
|
||||
|
|
@ -104,4 +102,4 @@ struct evaluate : boost::static_visitor<T1>
|
|||
|
||||
}
|
||||
|
||||
#endif //MAPNIK_EXPRESSION_EVALUATOR_HPP
|
||||
#endif // MAPNIK_EXPRESSION_EVALUATOR_HPP
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef MAPNIK_EXPRESSIONS_GRAMMAR_HPP
|
||||
#define MAPNIK_EXPRESSIONS_GRAMMAR_HPP
|
||||
|
||||
|
|
@ -34,12 +32,15 @@
|
|||
#include <boost/variant.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/concept_check.hpp>
|
||||
//spirit2
|
||||
|
||||
// spirit2
|
||||
#include <boost/spirit/include/qi.hpp>
|
||||
#include <boost/spirit/include/qi_action.hpp>
|
||||
//fusion
|
||||
|
||||
// fusion
|
||||
#include <boost/fusion/include/adapt_struct.hpp>
|
||||
//phoenix
|
||||
|
||||
// phoenix
|
||||
#include <boost/spirit/include/phoenix_core.hpp>
|
||||
#include <boost/spirit/include/phoenix_object.hpp>
|
||||
#include <boost/spirit/include/phoenix_operator.hpp>
|
||||
|
|
|
|||
|
|
@ -20,12 +20,13 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef MAPNIK_EXPRESSION_NODE_HPP
|
||||
#define MAPNIK_EXPRESSION_NODE_HPP
|
||||
#ifndef MAPNIK_EXPRESSION_NODE_HPP
|
||||
#define MAPNIK_EXPRESSION_NODE_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/value.hpp>
|
||||
#include <mapnik/attribute.hpp>
|
||||
|
||||
// boost
|
||||
#include <boost/variant.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
|
|
|
|||
|
|
@ -20,14 +20,13 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef MAPNIK_EXPRESSION_STRING_HPP
|
||||
#define MAPNIK_EXPRESSION_STRING_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/config.hpp>
|
||||
#include <mapnik/expression_node.hpp>
|
||||
|
||||
// stl
|
||||
#include <string>
|
||||
|
||||
|
|
|
|||
|
|
@ -20,13 +20,12 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: factory.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef FACTORY_HPP
|
||||
#define FACTORY_HPP
|
||||
#ifndef MAPNIK_FACTORY_HPP
|
||||
#define MAPNIK_FACTORY_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/utils.hpp>
|
||||
|
||||
// stl
|
||||
#include <stdexcept>
|
||||
#include <map>
|
||||
|
|
@ -89,4 +88,4 @@ public:
|
|||
};
|
||||
}
|
||||
|
||||
#endif //FACTORY_HPP
|
||||
#endif // MAPNIK_FACTORY_HPP
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef FASTMATH_HPP
|
||||
#define FASTMATH_HPP
|
||||
#ifndef MAPNIK_FASTMATH_HPP
|
||||
#define MAPNIK_FASTMATH_HPP
|
||||
|
||||
/* Timings:
|
||||
* fast_sin(not inlined) 8.95s
|
||||
|
|
@ -109,4 +109,4 @@ static inline double fast_atan2(double y, double x)
|
|||
return result;
|
||||
}
|
||||
|
||||
#endif // FASTMATH_HPP
|
||||
#endif // MAPNIK_FASTMATH_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,9 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: feature.hpp 40 2005-04-13 20:20:46Z pavlenko $
|
||||
#ifndef MAPNIK_FEATURE_HPP
|
||||
#define MAPNIK_FEATURE_HPP
|
||||
|
||||
#ifndef FEATURE_HPP
|
||||
#define FEATURE_HPP
|
||||
// mapnik
|
||||
#include <mapnik/value.hpp>
|
||||
#include <mapnik/geometry.hpp>
|
||||
|
|
@ -36,9 +35,9 @@
|
|||
#else
|
||||
#include <boost/property_map.hpp>
|
||||
#endif
|
||||
|
||||
#include <boost/utility.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
|
||||
// stl
|
||||
#include <map>
|
||||
|
||||
|
|
@ -181,4 +180,4 @@ inline std::ostream& operator<< (std::ostream & out,Feature const& f)
|
|||
}
|
||||
}
|
||||
|
||||
#endif //FEATURE_HPP
|
||||
#endif // MAPNIK_FEATURE_HPP
|
||||
|
|
|
|||
|
|
@ -20,12 +20,13 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef FEATURE_FACTORY_HPP
|
||||
#define FEATURE_FACTORY_HPP
|
||||
#ifndef MAPNIK_FEATURE_FACTORY_HPP
|
||||
#define MAPNIK_FEATURE_FACTORY_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/feature.hpp>
|
||||
|
||||
// boost
|
||||
#include <boost/make_shared.hpp>
|
||||
//#include <boost/pool/pool_alloc.hpp>
|
||||
|
||||
|
|
@ -39,8 +40,7 @@ struct feature_factory
|
|||
//return boost::allocate_shared<Feature>(boost::fast_pool_allocator<Feature>(),fid);
|
||||
return boost::make_shared<Feature>(fid);
|
||||
}
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
#endif //FEATURE_FACTORY_HPP
|
||||
#endif // MAPNIK_FEATURE_FACTORY_HPP
|
||||
|
|
|
|||
|
|
@ -20,14 +20,13 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef FEATURE_LAYER_DESC_HPP
|
||||
#define FEATURE_LAYER_DESC_HPP
|
||||
#ifndef MAPNIK_FEATURE_LAYER_DESC_HPP
|
||||
#define MAPNIK_FEATURE_LAYER_DESC_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/attribute_descriptor.hpp>
|
||||
|
||||
// stl
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <iostream>
|
||||
|
|
@ -106,4 +105,4 @@ operator << (std::basic_ostream<charT,traits>& out,
|
|||
}
|
||||
}
|
||||
|
||||
#endif //FEATURE_LAYER_DESC_HPP
|
||||
#endif // MAPNIK_FEATURE_LAYER_DESC_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef FEATURE_STYLE_PROCESSOR_HPP
|
||||
#define FEATURE_STYLE_PROCESSOR_HPP
|
||||
#ifndef MAPNIK_FEATURE_STYLE_PROCESSOR_HPP
|
||||
#define MAPNIK_FEATURE_STYLE_PROCESSOR_HPP
|
||||
|
||||
#include <set>
|
||||
#include <string>
|
||||
|
|
@ -74,4 +72,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif //FEATURE_STYLE_PROCESSOR_HPP
|
||||
#endif // MAPNIK_FEATURE_STYLE_PROCESSOR_HPP
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
#ifndef MAPNIK_FEATURE_TYPE_STYLE_HPP
|
||||
#define MAPNIK_FEATURE_TYPE_STYLE_HPP
|
||||
|
||||
#ifndef FEATURE_TYPE_STYLE_HPP
|
||||
#define FEATURE_TYPE_STYLE_HPP
|
||||
// mapnik
|
||||
#include <mapnik/rule.hpp>
|
||||
#include <mapnik/feature.hpp>
|
||||
#include <mapnik/enumeration.hpp>
|
||||
|
||||
// stl
|
||||
#include <vector>
|
||||
|
||||
|
|
@ -69,4 +69,4 @@ public:
|
|||
};
|
||||
}
|
||||
|
||||
#endif //FEATURE_TYPE_STYLE_HPP
|
||||
#endif // MAPNIK_FEATURE_TYPE_STYLE_HPP
|
||||
|
|
|
|||
|
|
@ -20,17 +20,16 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef FILL_HPP
|
||||
#define FILL_HPP
|
||||
#ifndef MAPNIK_FILL_HPP
|
||||
#define MAPNIK_FILL_HPP
|
||||
|
||||
namespace mapnik
|
||||
{
|
||||
|
||||
class fill
|
||||
{
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //FILL_HPP
|
||||
#endif // MAPNIK_FILL_HPP
|
||||
|
|
|
|||
|
|
@ -20,14 +20,13 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef MAPNIK_FILTER_FACTORY_HPP
|
||||
#define MAPNIK_FILTER_FACTORY_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/config.hpp>
|
||||
#include <mapnik/expression_node.hpp>
|
||||
|
||||
// stl
|
||||
#include <string>
|
||||
|
||||
|
|
@ -41,4 +40,4 @@ MAPNIK_DECL expression_ptr parse_expression (std::string const& wkt);
|
|||
|
||||
}
|
||||
|
||||
#endif //MAPNIK_FILTER_FACTORY_HPP
|
||||
#endif // MAPNIK_FILTER_FACTORY_HPP
|
||||
|
|
|
|||
|
|
@ -20,11 +20,10 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef MAPNIK_FILTER_FEATURESET_HPP
|
||||
#define MAPNIK_FILTER_FEATURESET_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/datasource.hpp>
|
||||
|
||||
namespace mapnik {
|
||||
|
|
@ -54,4 +53,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif //MAPNIK_FILTER_FEATURESET_HPP
|
||||
#endif // MAPNIK_FILTER_FEATURESET_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,9 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
#ifndef MAPNIK_FONT_ENGINE_FREETYPE_HPP
|
||||
#define MAPNIK_FONT_ENGINE_FREETYPE_HPP
|
||||
|
||||
#ifndef FONT_ENGINE_FREETYPE_HPP
|
||||
#define FONT_ENGINE_FREETYPE_HPP
|
||||
// mapnik
|
||||
#include <mapnik/color.hpp>
|
||||
#include <mapnik/utils.hpp>
|
||||
|
|
@ -50,7 +49,6 @@ extern "C"
|
|||
#include <boost/thread/mutex.hpp>
|
||||
#endif
|
||||
|
||||
|
||||
// stl
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
|
@ -602,4 +600,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif // FONT_ENGINE_FREETYPE_HPP
|
||||
#endif // MAPNIK_FONT_ENGINE_FREETYPE_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef FONT_SET_HPP
|
||||
#define FONT_SET_HPP
|
||||
#ifndef MAPNIK_FONT_SET_HPP
|
||||
#define MAPNIK_FONT_SET_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/config.hpp>
|
||||
|
|
@ -52,4 +50,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif //FONT_SET_HPP
|
||||
#endif // MAPNIK_FONT_SET_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: gamma.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef GAMMA_HPP
|
||||
#define GAMMA_HPP
|
||||
#ifndef MAPNIK_GAMMA_HPP
|
||||
#define MAPNIK_GAMMA_HPP
|
||||
|
||||
#include <cmath>
|
||||
|
||||
|
|
@ -50,4 +48,4 @@ struct MAPNIK_DECL gamma
|
|||
};
|
||||
}
|
||||
|
||||
#endif //GAMMA_HPP
|
||||
#endif // MAPNIK_GAMMA_HPP
|
||||
|
|
|
|||
|
|
@ -20,15 +20,16 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: geom_util.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
#ifndef MAPNIK_GEOM_UTIL_HPP
|
||||
#define MAPNIK_GEOM_UTIL_HPP
|
||||
|
||||
#ifndef GEOM_UTIL_HPP
|
||||
#define GEOM_UTIL_HPP
|
||||
// mapnik
|
||||
#include <mapnik/box2d.hpp>
|
||||
#include <mapnik/vertex.hpp>
|
||||
|
||||
// boost
|
||||
#include <boost/tuple/tuple.hpp>
|
||||
|
||||
// stl
|
||||
#include <cmath>
|
||||
|
||||
|
|
@ -217,4 +218,4 @@ struct filter_at_point
|
|||
};
|
||||
}
|
||||
|
||||
#endif //GEOM_UTIL_HPP
|
||||
#endif // MAPNIK_GEOM_UTIL_HPP
|
||||
|
|
|
|||
|
|
@ -20,15 +20,14 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: geometry.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef GEOMETRY_HPP
|
||||
#define GEOMETRY_HPP
|
||||
#ifndef MAPNIK_GEOMETRY_HPP
|
||||
#define MAPNIK_GEOMETRY_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/vertex_vector.hpp>
|
||||
#include <mapnik/ctrans.hpp>
|
||||
#include <mapnik/geom_util.hpp>
|
||||
|
||||
// boost
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/utility.hpp>
|
||||
|
|
@ -392,4 +391,4 @@ typedef boost::ptr_vector<geometry_type> geometry_containter;
|
|||
|
||||
}
|
||||
|
||||
#endif //GEOMETRY_HPP
|
||||
#endif // MAPNIK_GEOMETRY_HPP
|
||||
|
|
|
|||
|
|
@ -20,14 +20,13 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef GLOBAL_HPP
|
||||
#define GLOBAL_HPP
|
||||
#ifndef MAPNIK_GLOBAL_HPP
|
||||
#define MAPNIK_GLOBAL_HPP
|
||||
|
||||
// boost
|
||||
#include <boost/cstdint.hpp>
|
||||
#include <boost/detail/endian.hpp>
|
||||
|
||||
// stl
|
||||
#include <cstring>
|
||||
|
||||
|
|
@ -183,4 +182,4 @@ inline double round (double val)
|
|||
|
||||
|
||||
|
||||
#endif //GLOBAL_HPP
|
||||
#endif // MAPNIK_GLOBAL_HPP
|
||||
|
|
|
|||
|
|
@ -1,5 +1,27 @@
|
|||
#ifndef GLYPH_SYMBOLIZER_HPP
|
||||
#define GLYPH_SYMBOLIZER_HPP
|
||||
/*****************************************************************************
|
||||
*
|
||||
* This file is part of Mapnik (c++ mapping toolkit)
|
||||
*
|
||||
* Copyright (C) 2011 Artem Pavlenko
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef MAPNIK_GLYPH_SYMBOLIZER_HPP
|
||||
#define MAPNIK_GLYPH_SYMBOLIZER_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/enumeration.hpp>
|
||||
|
|
@ -190,4 +212,4 @@ private:
|
|||
|
||||
} // end mapnik namespace
|
||||
|
||||
#endif
|
||||
#endif // MAPNIK_GLYPH_SYMBOLIZER_HPP
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id$
|
||||
|
||||
#ifndef GRADIENT_HPP
|
||||
#define GRADIENT_HPP
|
||||
#ifndef MAPNIK_GRADIENT_HPP
|
||||
#define MAPNIK_GRADIENT_HPP
|
||||
|
||||
// agg
|
||||
#include <agg_trans_affine.h>
|
||||
|
||||
// mapnik
|
||||
|
|
@ -104,4 +104,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif //GRADIENT_HPP
|
||||
#endif // MAPNIK_GRADIENT_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: graphics.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef GRAPHICS_HPP
|
||||
#define GRAPHICS_HPP
|
||||
#ifndef MAPNIK_GRAPHICS_HPP
|
||||
#define MAPNIK_GRAPHICS_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/color.hpp>
|
||||
|
|
@ -520,4 +518,5 @@ public:
|
|||
}
|
||||
};
|
||||
}
|
||||
#endif //GRAPHICS_HPP
|
||||
|
||||
#endif // MAPNIK_GRAPHICS_HPP
|
||||
|
|
|
|||
|
|
@ -19,10 +19,9 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id$
|
||||
|
||||
#ifndef _HEXTREE_HPP_
|
||||
#define _HEXTREE_HPP_
|
||||
#ifndef MAPNIK_HEXTREE_HPP
|
||||
#define MAPNIK_HEXTREE_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/global.hpp>
|
||||
|
|
@ -455,4 +454,4 @@ private:
|
|||
};
|
||||
} // namespace mapnik
|
||||
|
||||
#endif // _HEXTREE_HPP_
|
||||
#endif // MAPNIK_HEXTREE_HPP
|
||||
|
|
|
|||
|
|
@ -20,11 +20,10 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef HIT_TEST_FILTER_HPP
|
||||
#define HIT_TEST_FILTER_HPP
|
||||
#ifndef MAPNIK_HIT_TEST_FILTER_HPP
|
||||
#define MAPNIK_HIT_TEST_FILTER_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/feature.hpp>
|
||||
|
||||
namespace mapnik {
|
||||
|
|
@ -54,4 +53,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif // HIT_TEST_FILTER_HPP
|
||||
#endif // MAPNIK_HIT_TEST_FILTER_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef IMAGE_COMPOSITING_HPP
|
||||
#define IMAGE_COMPOSITING_HPP
|
||||
#ifndef MAPNIK_IMAGE_COMPOSITING_HPP
|
||||
#define MAPNIK_IMAGE_COMPOSITING_HPP
|
||||
|
||||
// agg
|
||||
#include "agg_rendering_buffer.h"
|
||||
|
|
@ -186,4 +184,4 @@ void composite(T1 & im, T2 & im2, composite_mode_e mode)
|
|||
|
||||
}
|
||||
|
||||
#endif // IMAGE_COMPOSITING_HPP
|
||||
#endif // MAPNIK_IMAGE_COMPOSITING_HPP
|
||||
|
|
|
|||
|
|
@ -20,12 +20,13 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: image_data.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef IMAGE_DATA_HPP
|
||||
#define IMAGE_DATA_HPP
|
||||
#ifndef MAPNIK_IMAGE_DATA_HPP
|
||||
#define MAPNIK_IMAGE_DATA_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/global.hpp>
|
||||
|
||||
// stl
|
||||
#include <cassert>
|
||||
#include <cstring>
|
||||
|
||||
|
|
@ -139,4 +140,4 @@ typedef ImageData<unsigned> image_data_32;
|
|||
typedef ImageData<byte> image_data_8;
|
||||
}
|
||||
|
||||
#endif //IMAGE_DATA_HPP
|
||||
#endif // MAPNIK_IMAGE_DATA_HPP
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: image_reader.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
#ifndef MAPNIK_IMAGE_READER_HPP
|
||||
#define MAPNIK_IMAGE_READER_HPP
|
||||
|
||||
#ifndef IMAGE_READER_HPP
|
||||
#define IMAGE_READER_HPP
|
||||
// mapnik
|
||||
#include <mapnik/image_data.hpp>
|
||||
#include <mapnik/config.hpp>
|
||||
|
||||
// stl
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
|
|
@ -63,4 +63,4 @@ MAPNIK_DECL image_reader* get_image_reader(const std::string& file);
|
|||
|
||||
}
|
||||
|
||||
#endif //IMAGE_READER_HPP
|
||||
#endif // MAPNIK_IMAGE_READER_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: image_util.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef IMAGE_UTIL_HPP
|
||||
#define IMAGE_UTIL_HPP
|
||||
#ifndef MAPNIK_IMAGE_UTIL_HPP
|
||||
#define MAPNIK_IMAGE_UTIL_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/config.hpp>
|
||||
|
|
@ -298,4 +296,4 @@ template MAPNIK_DECL std::string save_to_string<image_view<image_data_32> > (ima
|
|||
|
||||
}
|
||||
|
||||
#endif //IMAGE_UTIL_HPP
|
||||
#endif // MAPNIK_IMAGE_UTIL_HPP
|
||||
|
|
|
|||
|
|
@ -20,11 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef IMAGE_VIEW_HPP
|
||||
#define IMAGE_VIEW_HPP
|
||||
|
||||
#ifndef MAPNIK_IMAGE_VIEW_HPP
|
||||
#define MAPNIK_IMAGE_VIEW_HPP
|
||||
|
||||
namespace mapnik {
|
||||
|
||||
|
|
@ -107,5 +104,5 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif // IMAGE_VIEW_HPP
|
||||
#endif // MAPNIK_IMAGE_VIEW_HPP
|
||||
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef MAPNIK_JPEG_IO_HPP
|
||||
#define MAPNIK_JPEG_IO_HPP
|
||||
|
||||
|
|
|
|||
|
|
@ -20,13 +20,12 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef LABEL_COLLISION_DETECTOR_HPP
|
||||
#define LABEL_COLLISION_DETECTOR_HPP
|
||||
#ifndef MAPNIK_LABEL_COLLISION_DETECTOR_HPP
|
||||
#define MAPNIK_LABEL_COLLISION_DETECTOR_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/quad_tree.hpp>
|
||||
|
||||
// stl
|
||||
#include <vector>
|
||||
#include <unicode/unistr.h>
|
||||
|
|
@ -233,4 +232,4 @@ public:
|
|||
};
|
||||
}
|
||||
|
||||
#endif // LABEL_COLLISION_DETECTOR_HPP
|
||||
#endif // MAPNIK_LABEL_COLLISION_DETECTOR_HPP
|
||||
|
|
|
|||
|
|
@ -19,10 +19,9 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id$
|
||||
|
||||
#ifndef LABEL_PLACEMENT_HPP
|
||||
#define LABEL_PLACEMENT_HPP
|
||||
#ifndef MAPNIK_LABEL_PLACEMENT_HPP
|
||||
#define MAPNIK_LABEL_PLACEMENT_HPP
|
||||
|
||||
namespace mapnik
|
||||
{
|
||||
|
|
@ -51,4 +50,4 @@ public:
|
|||
};
|
||||
}
|
||||
|
||||
#endif //LABEL_PLACEMENT_HPP
|
||||
#endif // MAPNIK_LABEL_PLACEMENT_HPP
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id: layer.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef LAYER_HPP
|
||||
#define LAYER_HPP
|
||||
#ifndef MAPNIK_LAYER_HPP
|
||||
#define MAPNIK_LAYER_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/feature.hpp>
|
||||
#include <mapnik/datasource.hpp>
|
||||
|
|
@ -217,4 +217,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif //LAYER_HPP
|
||||
#endif // MAPNIK_LAYER_HPP
|
||||
|
|
|
|||
|
|
@ -20,11 +20,13 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef LIBXML2_LOADER_INCLUDED
|
||||
#define LIBXML2_LOADER_INCLUDED
|
||||
#ifndef MAPNIK_LIBXML2_LOADER_HPP
|
||||
#define MAPNIK_LIBXML2_LOADER_HPP
|
||||
|
||||
// boost
|
||||
#include <boost/property_tree/ptree.hpp>
|
||||
|
||||
// stl
|
||||
#include <string>
|
||||
|
||||
namespace mapnik
|
||||
|
|
@ -33,4 +35,4 @@ void read_xml2( std::string const & filename, boost::property_tree::ptree & pt);
|
|||
void read_xml2_string( std::string const & str, boost::property_tree::ptree & pt, std::string const & base_path="");
|
||||
}
|
||||
|
||||
#endif // LIBXML2_LOADER_INCLUDED
|
||||
#endif // MAPNIK_LIBXML2_LOADER_HPP
|
||||
|
|
|
|||
|
|
@ -19,10 +19,9 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id: polygon_symbolizer.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef LINE_PATTERN_SYMBOLIZER_HPP
|
||||
#define LINE_PATTERN_SYMBOLIZER_HPP
|
||||
#ifndef MAPNIK_LINE_PATTERN_SYMBOLIZER_HPP
|
||||
#define MAPNIK_LINE_PATTERN_SYMBOLIZER_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/symbolizer.hpp>
|
||||
|
|
@ -38,4 +37,4 @@ struct MAPNIK_DECL line_pattern_symbolizer :
|
|||
};
|
||||
}
|
||||
|
||||
#endif // LINE_PATTERN_SYMBOLIZER_HPP
|
||||
#endif // MAPNIK_LINE_PATTERN_SYMBOLIZER_HPP
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id: line_symbolizer.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef LINE_SYMBOLIZER_HPP
|
||||
#define LINE_SYMBOLIZER_HPP
|
||||
#ifndef MAPNIK_LINE_SYMBOLIZER_HPP
|
||||
#define MAPNIK_LINE_SYMBOLIZER_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/stroke.hpp>
|
||||
#include <mapnik/symbolizer.hpp>
|
||||
#include <mapnik/enumeration.hpp>
|
||||
|
|
@ -82,4 +82,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif //LINE_SYMBOLIZER_HPP
|
||||
#endif // MAPNIK_LINE_SYMBOLIZER_HPP
|
||||
|
|
|
|||
|
|
@ -19,16 +19,18 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
// $Id$
|
||||
|
||||
#ifndef MAP_LOADER_HPP
|
||||
#define MAP_LOADER_HPP
|
||||
#ifndef MAPNIK_LOAD_MAP_HPP
|
||||
#define MAPNIK_LOAD_MAP_HPP
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/map.hpp>
|
||||
|
||||
// stl
|
||||
#include <string>
|
||||
|
||||
namespace mapnik
|
||||
|
|
@ -37,4 +39,4 @@ MAPNIK_DECL void load_map(Map & map, std::string const& filename, bool strict =
|
|||
MAPNIK_DECL void load_map_string(Map & map, std::string const& str, bool strict = false, std::string const& base_path="");
|
||||
}
|
||||
|
||||
#endif // LOAD_MAP_HPP
|
||||
#endif // MAPNIK_LOAD_MAP_HPP
|
||||
|
|
|
|||
|
|
@ -19,10 +19,9 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id: map.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef MAP_HPP
|
||||
#define MAP_HPP
|
||||
#ifndef MAPNIK_MAP_HPP
|
||||
#define MAPNIK_MAP_HPP
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
|
|
@ -461,4 +460,4 @@ private:
|
|||
DEFINE_ENUM(aspect_fix_mode_e,Map::aspect_fix_mode);
|
||||
}
|
||||
|
||||
#endif //MAP_HPP
|
||||
#endif // MAPNIK_MAP_HPP
|
||||
|
|
|
|||
|
|
@ -20,21 +20,19 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef MEMORY_REGION_CACHE_HPP
|
||||
#define MEMORY_REGION_CACHE_HPP
|
||||
#ifndef MAPNIK_MAPPED_MEMORY_CACHE_HPP
|
||||
#define MAPNIK_MAPPED_MEMORY_CACHE_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/config.hpp>
|
||||
#include <mapnik/utils.hpp>
|
||||
|
||||
// boost
|
||||
#include <boost/utility.hpp>
|
||||
#include <boost/unordered_map.hpp>
|
||||
#include <boost/interprocess/mapped_region.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/optional.hpp>
|
||||
|
||||
#ifdef MAPNIK_THREADSAFE
|
||||
#include <boost/thread/mutex.hpp>
|
||||
#endif
|
||||
|
|
@ -61,5 +59,5 @@ struct MAPNIK_DECL mapped_memory_cache :
|
|||
|
||||
}
|
||||
|
||||
#endif // MAPNIK_MARKER_CACHE_HPP
|
||||
#endif // MAPNIK_MAPPED_MEMORY_CACHE_HPP
|
||||
|
||||
|
|
|
|||
|
|
@ -20,18 +20,19 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: image_data.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef MARKER_HPP
|
||||
#define MARKER_HPP
|
||||
#ifndef MAPNIK_MARKER_HPP
|
||||
#define MAPNIK_MARKER_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/global.hpp>
|
||||
#include <mapnik/image_data.hpp>
|
||||
#include <mapnik/svg/svg_path_attributes.hpp>
|
||||
#include <mapnik/svg/svg_storage.hpp>
|
||||
#include <mapnik/svg/svg_path_adapter.hpp>
|
||||
|
||||
// agg
|
||||
#include "agg_path_storage.h"
|
||||
|
||||
// boost
|
||||
#include <boost/utility.hpp>
|
||||
#include <boost/unordered_map.hpp>
|
||||
|
|
@ -39,6 +40,7 @@
|
|||
#include <boost/optional.hpp>
|
||||
#include <boost/make_shared.hpp>
|
||||
|
||||
// stl
|
||||
#include <cassert>
|
||||
#include <cstring>
|
||||
|
||||
|
|
@ -125,4 +127,4 @@ private:
|
|||
|
||||
}
|
||||
|
||||
#endif //MARKER_HPP
|
||||
#endif // MAPNIK_MARKER_HPP
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef MAPNIK_MARKER_CACHE_HPP
|
||||
#define MAPNIK_MARKER_CACHE_HPP
|
||||
|
||||
|
|
@ -32,8 +30,10 @@
|
|||
#include <mapnik/svg/svg_path_attributes.hpp>
|
||||
#include <mapnik/svg/svg_storage.hpp>
|
||||
#include <mapnik/svg/svg_path_adapter.hpp>
|
||||
|
||||
// agg
|
||||
#include "agg_path_storage.h"
|
||||
|
||||
// boost
|
||||
#include <boost/utility.hpp>
|
||||
#include <boost/unordered_map.hpp>
|
||||
|
|
|
|||
|
|
@ -20,13 +20,19 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef MARKERS_PLACEMENT_HPP
|
||||
#define MARKERS_PLACEMENT_HPP
|
||||
#ifndef MAPNIK_MARKERS_PLACEMENT_HPP
|
||||
#define MAPNIK_MARKERS_PLACEMENT_HPP
|
||||
|
||||
// agg
|
||||
#include "agg_basics.h"
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/box2d.hpp>
|
||||
|
||||
// boost
|
||||
#include <boost/utility.hpp>
|
||||
|
||||
// stl
|
||||
#include <cmath>
|
||||
|
||||
namespace mapnik {
|
||||
|
|
@ -242,5 +248,7 @@ template <typename Locator, typename Detector> box2d<double> markers_placement<L
|
|||
|
||||
return box2d<double>(x1_, y1_, x2_, y2_);
|
||||
}
|
||||
} /* end namespace */
|
||||
#endif // MARKERS_PLACEMENT_HPP
|
||||
|
||||
}
|
||||
|
||||
#endif // MAPNIK_MARKERS_PLACEMENT_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef MARKERS_SYMBOLIZER_HPP
|
||||
#define MARKERS_SYMBOLIZER_HPP
|
||||
#ifndef MAPNIK_MARKERS_SYMBOLIZER_HPP
|
||||
#define MAPNIK_MARKERS_SYMBOLIZER_HPP
|
||||
|
||||
//mapnik
|
||||
#include <mapnik/symbolizer.hpp>
|
||||
|
|
@ -92,4 +90,4 @@ private:
|
|||
|
||||
}
|
||||
|
||||
#endif // MARKERS_SYMBOLIZER_HPP
|
||||
#endif // MAPNIK_MARKERS_SYMBOLIZER_HPP
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id: memory.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef MEMORY_HPP
|
||||
#define MEMORY_HPP
|
||||
#ifndef MAPNIK_MEMORY_HPP
|
||||
#define MAPNIK_MEMORY_HPP
|
||||
|
||||
// stl
|
||||
#include <iostream>
|
||||
#include <cassert>
|
||||
|
||||
|
|
@ -85,4 +85,4 @@ public:
|
|||
};
|
||||
|
||||
}
|
||||
#endif //MEMORY_HPP
|
||||
#endif // MAPNIK_MEMORY_HPP
|
||||
|
|
|
|||
|
|
@ -20,13 +20,14 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef MEMORY_DATASOURCE_HPP
|
||||
#define MEMORY_DATASOURCE_HPP
|
||||
#ifndef MAPNIK_MEMORY_DATASOURCE_HPP
|
||||
#define MAPNIK_MEMORY_DATASOURCE_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/datasource.hpp>
|
||||
#include <mapnik/feature_layer_desc.hpp>
|
||||
|
||||
// stl
|
||||
#include <vector>
|
||||
|
||||
namespace mapnik {
|
||||
|
|
@ -65,4 +66,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif // MEMORY_DATASOURCE_HPP
|
||||
#endif // MAPNIK_MEMORY_DATASOURCE_HPP
|
||||
|
|
|
|||
|
|
@ -20,11 +20,13 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
#ifndef MEMORY_FEATURESET_HPP
|
||||
#define MEMORY_FEATURESET_HPP
|
||||
#ifndef MAPNIK_MEMORY_FEATURESET_HPP
|
||||
#define MAPNIK_MEMORY_FEATURESET_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/memory_datasource.hpp>
|
||||
|
||||
// boost
|
||||
#include <boost/utility.hpp>
|
||||
|
||||
namespace mapnik {
|
||||
|
|
@ -73,4 +75,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif // MEMORY_FEATURESET_HPP
|
||||
#endif // MAPNIK_MEMORY_FEATURESET_HPP
|
||||
|
|
|
|||
|
|
@ -20,21 +20,21 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef MAPNIK_METAWRITER_HPP
|
||||
#define MAPNIK_METAWRITER_HPP
|
||||
|
||||
#ifndef METAWRITER_HPP
|
||||
#define METAWRITER_HPP
|
||||
|
||||
// Mapnik
|
||||
// mapnik
|
||||
#include <mapnik/box2d.hpp>
|
||||
#include <mapnik/feature.hpp>
|
||||
#include <mapnik/font_engine_freetype.hpp>
|
||||
|
||||
// Boost
|
||||
// boost
|
||||
#include <boost/utility.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/optional.hpp>
|
||||
#include <boost/concept_check.hpp>
|
||||
// STL
|
||||
|
||||
// stl
|
||||
#include <set>
|
||||
#include <string>
|
||||
|
||||
|
|
@ -139,4 +139,4 @@ typedef std::pair<metawriter_ptr, metawriter_properties> metawriter_with_propert
|
|||
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif // MAPNIK_METAWRITER_HPP
|
||||
|
|
|
|||
|
|
@ -20,9 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
|
||||
#ifndef METAWRITER_FACTORY_HPP
|
||||
#define METAWRITER_FACTORY_HPP
|
||||
#ifndef MAPNIK_METAWRITER_FACTORY_HPP
|
||||
#define MAPNIK_METAWRITER_FACTORY_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/metawriter.hpp>
|
||||
|
|
@ -51,5 +50,5 @@ void metawriter_save(
|
|||
|
||||
}
|
||||
|
||||
#endif /* METAWRITER_FACTORY_HPP */
|
||||
#endif // MAPNIK_METAWRITER_FACTORY_HPP
|
||||
|
||||
|
|
|
|||
|
|
@ -20,9 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
|
||||
#ifndef METAWRITER_INMEM_HPP
|
||||
#define METAWRITER_INMEM_HPP
|
||||
#ifndef MAPNIK_METAWRITER_INMEM_HPP
|
||||
#define MAPNIK_METAWRITER_INMEM_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/config.hpp>
|
||||
|
|
@ -117,4 +116,4 @@ typedef boost::shared_ptr<metawriter_inmem> metawriter_inmem_ptr;
|
|||
|
||||
}
|
||||
|
||||
#endif /* METAWRITER_INMEM_HPP */
|
||||
#endif // MAPNIK_METAWRITER_INMEM_HPP
|
||||
|
|
|
|||
|
|
@ -20,9 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
|
||||
#ifndef METAWRITER_JSON_HPP
|
||||
#define METAWRITER_JSON_HPP
|
||||
#ifndef MAPNIK_METAWRITER_JSON_HPP
|
||||
#define MAPNIK_METAWRITER_JSON_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/metawriter.hpp>
|
||||
|
|
@ -150,4 +149,4 @@ typedef boost::shared_ptr<metawriter_json> metawriter_json_ptr;
|
|||
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif // MAPNIK_METAWRITER_JSON_HPP
|
||||
|
|
|
|||
|
|
@ -19,10 +19,9 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id$
|
||||
|
||||
#ifndef _OCTREE_HPP_
|
||||
#define _OCTREE_HPP_
|
||||
#ifndef MAPNIK_OCTREE_HPP
|
||||
#define MAPNIK_OCTREE_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/global.hpp>
|
||||
|
|
@ -303,6 +302,7 @@ public:
|
|||
private:
|
||||
node * root_;
|
||||
};
|
||||
|
||||
} // namespace mapnik
|
||||
|
||||
#endif /* _OCTREE_HPP_ */
|
||||
#endif // MAPNIK_OCTREE_HPP
|
||||
|
|
|
|||
|
|
@ -19,11 +19,9 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id$
|
||||
|
||||
#ifndef _PALETTE_HPP_
|
||||
#define _PALETTE_HPP_
|
||||
|
||||
#ifndef MAPNIK_PALETTE_HPP
|
||||
#define MAPNIK_PALETTE_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/config.hpp>
|
||||
|
|
@ -164,5 +162,5 @@ private:
|
|||
|
||||
} // namespace mapnik
|
||||
|
||||
#endif // _PALETTE_HPP_
|
||||
#endif // MAPNIK_PALETTE_HPP
|
||||
|
||||
|
|
|
|||
|
|
@ -19,15 +19,17 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id: params.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef PARAMS_HPP
|
||||
#define PARAMS_HPP
|
||||
#ifndef MAPNIK_PARAMS_HPP
|
||||
#define MAPNIK_PARAMS_HPP
|
||||
|
||||
// mapnik
|
||||
#include <boost/variant.hpp>
|
||||
#include <boost/optional.hpp>
|
||||
#include <boost/none.hpp>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
// stl
|
||||
#include <string>
|
||||
#include <map>
|
||||
|
||||
|
|
@ -100,4 +102,4 @@ public:
|
|||
};
|
||||
}
|
||||
|
||||
#endif //PARAMS_HPP
|
||||
#endif // MAPNIK_PARAMS_HPP
|
||||
|
|
|
|||
|
|
@ -28,10 +28,12 @@
|
|||
#include <mapnik/attribute.hpp>
|
||||
#include <mapnik/feature.hpp>
|
||||
#include <mapnik/value.hpp>
|
||||
|
||||
// boost
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/variant.hpp>
|
||||
#include <boost/foreach.hpp>
|
||||
|
||||
// stl
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
|
@ -140,4 +142,4 @@ typedef mapnik::path_processor<Feature> path_processor_type;
|
|||
|
||||
}
|
||||
|
||||
#endif //MAPNIK_PARSE_PATH_HPP
|
||||
#endif // MAPNIK_PARSE_PATH_HPP
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef MAPNIK_PATH_EXPRESSIONS_GRAMMAR_HPP
|
||||
#define MAPNIK_PATH_EXPRESSIONS_GRAMMAR_HPP
|
||||
|
||||
|
|
@ -29,22 +27,26 @@
|
|||
#include <mapnik/unicode.hpp>
|
||||
#include <mapnik/expression_node.hpp>
|
||||
#include <mapnik/feature.hpp>
|
||||
|
||||
// boost
|
||||
#include <boost/variant.hpp>
|
||||
#include <boost/concept_check.hpp>
|
||||
|
||||
//spirit2
|
||||
// spirit2
|
||||
#include <boost/spirit/include/qi.hpp>
|
||||
#include <boost/spirit/include/qi_action.hpp>
|
||||
//fusion
|
||||
|
||||
// fusion
|
||||
#include <boost/fusion/include/adapt_struct.hpp>
|
||||
//phoenix
|
||||
|
||||
// phoenix
|
||||
#include <boost/spirit/include/phoenix_core.hpp>
|
||||
#include <boost/spirit/include/phoenix_object.hpp>
|
||||
#include <boost/spirit/include/phoenix_operator.hpp>
|
||||
#include <boost/spirit/include/phoenix_function.hpp>
|
||||
#include <boost/spirit/include/phoenix_stl.hpp>
|
||||
#include <boost/spirit/home/phoenix/object/construct.hpp>
|
||||
|
||||
// stl
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
|
@ -56,11 +58,9 @@ namespace qi = boost::spirit::qi;
|
|||
namespace phoenix = boost::phoenix;
|
||||
namespace standard_wide = boost::spirit::standard_wide;
|
||||
|
||||
//
|
||||
using standard_wide::space_type;
|
||||
using standard_wide::space;
|
||||
|
||||
|
||||
template <typename Iterator>
|
||||
struct path_expression_grammar : qi::grammar<Iterator, std::vector<path_component>(), space_type>
|
||||
{
|
||||
|
|
@ -92,8 +92,6 @@ struct path_expression_grammar : qi::grammar<Iterator, std::vector<path_componen
|
|||
qi::rule<Iterator, std::string() > str;
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
||||
#endif // MAPNIK_PATH_EXPRESSIONS_GRAMMAR_HPP
|
||||
|
||||
|
|
|
|||
|
|
@ -20,11 +20,10 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef __PLACEMENT_FINDER__
|
||||
#define __PLACEMENT_FINDER__
|
||||
#ifndef MAPNIK_PLACEMENT_FINDER_HPP
|
||||
#define MAPNIK_PLACEMENT_FINDER_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/ctrans.hpp>
|
||||
#include <mapnik/label_collision_detector.hpp>
|
||||
#include <mapnik/text_symbolizer.hpp>
|
||||
|
|
@ -33,6 +32,7 @@
|
|||
#include <mapnik/text_path.hpp>
|
||||
#include <mapnik/text_placements.hpp>
|
||||
|
||||
// stl
|
||||
#include <queue>
|
||||
|
||||
namespace mapnik
|
||||
|
|
@ -144,7 +144,7 @@ private:
|
|||
DetectorT & detector_;
|
||||
box2d<double> const& dimensions_;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#endif // MAPNIK_PLACEMENT_FINDER_HPP
|
||||
|
|
|
|||
|
|
@ -20,14 +20,15 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: plugin.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
#ifndef MAPNIK_PLUGIN_HPP
|
||||
#define MAPNIK_PLUGIN_HPP
|
||||
|
||||
#ifndef PLUGIN_HPP
|
||||
#define PLUGIN_HPP
|
||||
// boost
|
||||
#include <boost/utility.hpp>
|
||||
|
||||
// stl
|
||||
#include <string>
|
||||
|
||||
// ltdl
|
||||
#include <ltdl.h>
|
||||
|
||||
|
|
@ -46,4 +47,4 @@ public:
|
|||
};
|
||||
}
|
||||
|
||||
#endif //PLUGIN_HPP
|
||||
#endif // MAPNIK_PLUGIN_HPP
|
||||
|
|
|
|||
|
|
@ -20,16 +20,16 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef MAPNIK_PNG_IO_HPP
|
||||
#define MAPNIK_PNG_IO_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/global.hpp>
|
||||
#include <mapnik/palette.hpp>
|
||||
#include <mapnik/octree.hpp>
|
||||
#include <mapnik/hextree.hpp>
|
||||
|
||||
// zlib
|
||||
#include <zlib.h>
|
||||
|
||||
extern "C"
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id: image_symbolizer.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef MAPNIK_POINT_SYMBOLIZER_HPP
|
||||
#define MAPNIK_POINT_SYMBOLIZER_HPP
|
||||
|
|
|
|||
|
|
@ -19,10 +19,9 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id$
|
||||
|
||||
#ifndef POLYGON_PATTERN_SYMBOLIZER_HPP
|
||||
#define POLYGON_PATTERN_SYMBOLIZER_HPP
|
||||
#ifndef MAPNIK_POLYGON_PATTERN_SYMBOLIZER_HPP
|
||||
#define MAPNIK_POLYGON_PATTERN_SYMBOLIZER_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/symbolizer.hpp>
|
||||
|
|
@ -57,4 +56,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif //POLYGON_PATTERN_SYMBOLIZER_HPP
|
||||
#endif // MAPNIK_POLYGON_PATTERN_SYMBOLIZER_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: polygon_symbolizer.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef POLYGON_SYMBOLIZER_HPP
|
||||
#define POLYGON_SYMBOLIZER_HPP
|
||||
#ifndef MAPNIK_POLYGON_SYMBOLIZER_HPP
|
||||
#define MAPNIK_POLYGON_SYMBOLIZER_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/color.hpp>
|
||||
|
|
@ -122,4 +120,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif // POLYGON_SYMBOLIZER_HPP
|
||||
#endif // MAPNIK_POLYGON_SYMBOLIZER_HPP
|
||||
|
|
|
|||
|
|
@ -20,17 +20,15 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: pool.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef POOL_HPP
|
||||
#define POOL_HPP
|
||||
#ifndef MAPNIK_POOL_HPP
|
||||
#define MAPNIK_POOL_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/utils.hpp>
|
||||
|
||||
// boost
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/utility.hpp>
|
||||
|
||||
#ifdef MAPNIK_THREADSAFE
|
||||
#include <boost/thread/mutex.hpp>
|
||||
#endif
|
||||
|
|
@ -164,5 +162,7 @@ public:
|
|||
return size;
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
#endif //POOL_HPP
|
||||
|
||||
#endif // MAPNIK_POOL_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef PROJ_TRANSFORM_HPP
|
||||
#define PROJ_TRANSFORM_HPP
|
||||
#ifndef MAPNIK_PROJ_TRANSFORM_HPP
|
||||
#define MAPNIK_PROJ_TRANSFORM_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/projection.hpp>
|
||||
|
|
@ -62,4 +60,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif // PROJ_TRANSFORM_HPP
|
||||
#endif // MAPNIK_PROJ_TRANSFORM_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef PROJECTION_HPP
|
||||
#define PROJECTION_HPP
|
||||
#ifndef MAPNIK_PROJECTION_HPP
|
||||
#define MAPNIK_PROJECTION_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/box2d.hpp>
|
||||
|
|
@ -35,8 +33,8 @@
|
|||
#if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 480
|
||||
#include <boost/thread/mutex.hpp>
|
||||
#endif
|
||||
|
||||
#include <boost/utility.hpp>
|
||||
|
||||
// stl
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
|
|
@ -85,6 +83,7 @@ private:
|
|||
static boost::mutex mutex_;
|
||||
#endif
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //PROJECTION_HPP
|
||||
#endif // MAPNIK_PROJECTION_HPP
|
||||
|
|
|
|||
|
|
@ -20,17 +20,20 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef MAPNIK_CONFIG_HELPERS_INCLUDED
|
||||
#define MAPNIK_CONFIG_HELPERS_INCLUDED
|
||||
#ifndef MAPNIK_PTREE_HELPERS_HPP
|
||||
#define MAPNIK_PTREE_HELPERS_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/enumeration.hpp>
|
||||
#include <mapnik/config_error.hpp>
|
||||
#include <mapnik/color_factory.hpp>
|
||||
|
||||
// boost
|
||||
#include <boost/property_tree/ptree.hpp>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
#include <boost/optional.hpp>
|
||||
|
||||
// stl
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
||||
|
|
@ -422,6 +425,7 @@ inline boost::optional<color> get_optional(const boost::property_tree::ptree & n
|
|||
|
||||
return result;
|
||||
}
|
||||
|
||||
} // end of namespace mapnik
|
||||
|
||||
#endif // MAPNIK_CONFIG_HELPERS_INCLUDED
|
||||
#endif // MAPNIK_PTREE_HELPERS_HPP
|
||||
|
|
|
|||
|
|
@ -19,15 +19,17 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id$
|
||||
|
||||
#ifndef QUAD_TREE_HPP
|
||||
#define QUAD_TREE_HPP
|
||||
#ifndef MAPNIK_QUAD_TREE_HPP
|
||||
#define MAPNIK_QUAD_TREE_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/box2d.hpp>
|
||||
|
||||
// boost
|
||||
#include <boost/ptr_container/ptr_vector.hpp>
|
||||
#include <boost/noncopyable.hpp>
|
||||
|
||||
// stl
|
||||
#include <vector>
|
||||
#include <cstring>
|
||||
|
|
@ -220,4 +222,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif // MAPNIK_QUAD_TREE_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef QUERY_HPP
|
||||
#define QUERY_HPP
|
||||
#ifndef MAPNIK_QUERY_HPP
|
||||
#define MAPNIK_QUERY_HPP
|
||||
|
||||
//mapnik
|
||||
#include <mapnik/box2d.hpp>
|
||||
|
|
@ -123,7 +121,7 @@ public:
|
|||
return names_;
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif //QUERY_HPP
|
||||
#endif // MAPNIK_QUERY_HPP
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id: raster.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef RASTER_HPP
|
||||
#define RASTER_HPP
|
||||
#ifndef MAPNIK_RASTER_HPP
|
||||
#define MAPNIK_RASTER_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/graphics.hpp>
|
||||
|
||||
namespace mapnik {
|
||||
|
|
@ -37,5 +37,5 @@ struct raster
|
|||
};
|
||||
}
|
||||
|
||||
#endif //RASTER_HPP
|
||||
#endif // MAPNIK_RASTER_HPP
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id$
|
||||
|
||||
/** \brief Raster Colouriser
|
||||
*
|
||||
|
|
@ -35,9 +34,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
|
||||
#ifndef RASTER_COLORIZER_HPP
|
||||
#define RASTER_COLORIZER_HPP
|
||||
#ifndef MAPNIK_RASTER_COLORIZER_HPP
|
||||
#define MAPNIK_RASTER_COLORIZER_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/config.hpp>
|
||||
|
|
@ -214,14 +212,9 @@ private:
|
|||
};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
typedef boost::shared_ptr<raster_colorizer> raster_colorizer_ptr;
|
||||
|
||||
|
||||
} // mapnik namespace
|
||||
|
||||
#endif //RASTER_COLORIZER_HPP
|
||||
#endif // MAPNIK_RASTER_COLORIZER_HPP
|
||||
|
|
|
|||
|
|
@ -19,10 +19,9 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id$
|
||||
|
||||
#ifndef RASTER_SYMBOLIZER_HPP
|
||||
#define RASTER_SYMBOLIZER_HPP
|
||||
#ifndef MAPNIK_RASTER_SYMBOLIZER_HPP
|
||||
#define MAPNIK_RASTER_SYMBOLIZER_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/config.hpp>
|
||||
|
|
@ -159,4 +158,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif //RASTER_SYMBOLIZER_HPP
|
||||
#endif // MAPNIK_RASTER_SYMBOLIZER_HPP
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef RULE_HPP
|
||||
#define RULE_HPP
|
||||
#ifndef MAPNIK_RULE_HPP
|
||||
#define MAPNIK_RULE_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/line_symbolizer.hpp>
|
||||
|
|
@ -327,4 +327,4 @@ private:
|
|||
|
||||
}
|
||||
|
||||
#endif //RULE_HPP
|
||||
#endif // MAPNIK_RULE_HPP
|
||||
|
|
|
|||
|
|
@ -19,22 +19,22 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
// $Id$
|
||||
|
||||
#ifndef SAVE_MAP_HPP
|
||||
#define SAVE_MAP_HPP
|
||||
#ifndef MAPNIK_SAVE_MAP_HPP
|
||||
#define MAPNIK_SAVE_MAP_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/config.hpp>
|
||||
|
||||
// stl
|
||||
#include <string>
|
||||
|
||||
namespace mapnik
|
||||
{
|
||||
class Map;
|
||||
|
||||
MAPNIK_DECL void save_map(Map const& map, std::string const& filename, bool explicit_defaults = false);
|
||||
|
||||
MAPNIK_DECL std::string save_map_to_string(Map const& map, bool explicit_defaults = false);
|
||||
|
||||
}
|
||||
|
||||
#endif // SAVE_MAP_HPP
|
||||
#endif // MAPNIK_SAVE_MAP_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,10 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
#ifndef MAPNIK_SCALE_DENOMINATOR_HPP
|
||||
#define MAPNIK_SCALE_DENOMINATOR_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/config.hpp>
|
||||
|
||||
namespace mapnik {
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id$
|
||||
|
||||
#ifndef MAPNIK_SEGMENT_HPP
|
||||
#define MAPNIK_SEGMENT_HPP
|
||||
|
||||
|
|
@ -41,4 +39,4 @@ static bool y_order(segment_t const& first,segment_t const& second)
|
|||
|
||||
}
|
||||
|
||||
#endif //MAPNIK_SEGMENT_HPP
|
||||
#endif // MAPNIK_SEGMENT_HPP
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*****************************************************************************/
|
||||
//$Id$
|
||||
|
||||
#ifndef MAPNIK_SHIELD_SYMBOLIZER_HPP
|
||||
#define MAPNIK_SHIELD_SYMBOLIZER_HPP
|
||||
|
|
@ -61,4 +60,4 @@ private:
|
|||
};
|
||||
}
|
||||
|
||||
#endif // SHIELD_SYMBOLIZER_HPP
|
||||
#endif // MAPNIK_SHIELD_SYMBOLIZER_HPP
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
//$Id: sql_utils.hpp 39 2005-04-10 20:39:53Z pavlenko $
|
||||
|
||||
#ifndef SQL_UTILS_HPP
|
||||
#define SQL_UTILS_HPP
|
||||
#ifndef MAPNIK_SQL_UTILS_HPP
|
||||
#define MAPNIK_SQL_UTILS_HPP
|
||||
|
||||
// boost
|
||||
#include <boost/algorithm/string.hpp>
|
||||
|
|
@ -196,4 +194,4 @@ inline std::string numeric2string(const char* buf)
|
|||
|
||||
}
|
||||
|
||||
#endif //SQL_UTILS_HPP
|
||||
#endif // MAPNIK_SQL_UTILS_HPP
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue