sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small changes to hopefully fix compile issues on linux

Browse source
This commit is contained in:
Blake Thompson 2015-02-04 20:48:59 -06:00
parent 06ef081282
commit 5966b12973
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mapnik/grid/grid.hpp
View file

@ -35,7 +35,6 @@
#include <mapnik/util/conversions.hpp> #include <mapnik/util/conversions.hpp>
// stl // stl
#include <cstdint>
#include <map> #include <map>
#include <set> #include <set>
#include <cmath> #include <cmath>

3
include/mapnik/pixel_types.hpp
View file

@ -23,8 +23,7 @@
#ifndef MAPNIK_PIXEL_TYPES_HPP #ifndef MAPNIK_PIXEL_TYPES_HPP
#define MAPNIK_PIXEL_TYPES_HPP #define MAPNIK_PIXEL_TYPES_HPP
// std #include <mapnik/global.hpp>
#include <cstdint>
struct rgba8_t { using type = std::uint32_t; }; struct rgba8_t { using type = std::uint32_t; };
struct gray8_t { using type = std::uint8_t; }; struct gray8_t { using type = std::uint8_t; };

6
include/mapnik/value_types.hpp
View file

@ -43,10 +43,12 @@ namespace mapnik {
#ifdef BIGINT #ifdef BIGINT
//using value_integer = boost::long_long_type; //using value_integer = boost::long_long_type;
using value_integer = long long; //using value_integer = long long;
using value_integer = std::int64_t;
using value_integer_pixel = gray64s_t; using value_integer_pixel = gray64s_t;
#else #else
using value_integer = int; //using value_integer = int;
using value_integer = std::int32_t;
using value_integer_pixel = gray32s_t; using value_integer_pixel = gray32s_t;
#endif #endif