|
36 | 36 | #include <mapnik/util/conversions.hpp>
|
37 | 37 | #include <mapnik/util/trim.hpp>
|
38 | 38 | #include <mapnik/box2d.hpp> // for box2d
|
39 |
| - |
40 |
| -// boost |
41 |
| -#include <boost/bind.hpp> |
| 39 | +#include <functional> |
42 | 40 |
|
43 | 41 | #include <cstdint>
|
44 | 42 |
|
@@ -229,27 +227,27 @@ mapnik::raster_ptr pgraster_wkb_reader::read_indexed(mapnik::box2d<double> const
|
229 | 227 | // mapnik does not support signed anyway
|
230 | 228 | case PT_8BUI:
|
231 | 229 | return read_data_band(bbox, width_, height_, hasnodata,
|
232 |
| - boost::bind(read_uint8, &ptr_)); |
| 230 | + std::bind(read_uint8, &ptr_)); |
233 | 231 | break;
|
234 | 232 | case PT_16BSI:
|
235 | 233 | // mapnik does not support signed anyway
|
236 | 234 | case PT_16BUI:
|
237 | 235 | return read_data_band(bbox, width_, height_, hasnodata,
|
238 |
| - boost::bind(read_uint16, &ptr_, endian_)); |
| 236 | + std::bind(read_uint16, &ptr_, endian_)); |
239 | 237 | break;
|
240 | 238 | case PT_32BSI:
|
241 | 239 | // mapnik does not support signed anyway
|
242 | 240 | case PT_32BUI:
|
243 | 241 | return read_data_band(bbox, width_, height_, hasnodata,
|
244 |
| - boost::bind(read_uint32, &ptr_, endian_)); |
| 242 | + std::bind(read_uint32, &ptr_, endian_)); |
245 | 243 | break;
|
246 | 244 | case PT_32BF:
|
247 | 245 | return read_data_band(bbox, width_, height_, hasnodata,
|
248 |
| - boost::bind(read_float32, &ptr_, endian_)); |
| 246 | + std::bind(read_float32, &ptr_, endian_)); |
249 | 247 | break;
|
250 | 248 | case PT_64BF:
|
251 | 249 | return read_data_band(bbox, width_, height_, hasnodata,
|
252 |
| - boost::bind(read_float64, &ptr_, endian_)); |
| 250 | + std::bind(read_float64, &ptr_, endian_)); |
253 | 251 | break;
|
254 | 252 | default:
|
255 | 253 | std::ostringstream err;
|
@@ -320,19 +318,19 @@ mapnik::raster_ptr pgraster_wkb_reader::read_grayscale(mapnik::box2d<double> con
|
320 | 318 | // mapnik does not support signed anyway
|
321 | 319 | case PT_8BUI:
|
322 | 320 | return read_grayscale_band(bbox, width_, height_, hasnodata,
|
323 |
| - boost::bind(read_uint8, &ptr_)); |
| 321 | + std::bind(read_uint8, &ptr_)); |
324 | 322 | break;
|
325 | 323 | case PT_16BSI:
|
326 | 324 | // mapnik does not support signed anyway
|
327 | 325 | case PT_16BUI:
|
328 | 326 | return read_grayscale_band(bbox, width_, height_, hasnodata,
|
329 |
| - boost::bind(read_uint16, &ptr_, endian_)); |
| 327 | + std::bind(read_uint16, &ptr_, endian_)); |
330 | 328 | break;
|
331 | 329 | case PT_32BSI:
|
332 | 330 | // mapnik does not support signed anyway
|
333 | 331 | case PT_32BUI:
|
334 | 332 | return read_grayscale_band(bbox, width_, height_, hasnodata,
|
335 |
| - boost::bind(read_uint32, &ptr_, endian_)); |
| 333 | + std::bind(read_uint32, &ptr_, endian_)); |
336 | 334 | break;
|
337 | 335 | default:
|
338 | 336 | std::ostringstream err;
|
|
0 commit comments