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

use std::size_t consistently (proj API)

Browse source
This commit is contained in:
Artem Pavlenko 2021-03-02 16:39:32 +00:00
parent cb75f00780
commit a149ebed16
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/mapnik/proj_transform.hpp
View file

@ -44,16 +44,16 @@ public:
bool is_known() const;
bool forward (double& x, double& y , double& z) const;
bool backward (double& x, double& y , double& z) const;
bool forward (double *x, double *y , double *z, int point_count, int offset = 1) const;
bool backward (double *x, double *y , double *z, int point_count, int offset = 1) const;
bool forward (double *x, double *y , double *z, std::size_t point_count, std::size_t offset = 1) const;
bool backward (double *x, double *y , double *z, std::size_t point_count, std::size_t offset = 1) const;
bool forward (geometry::point<double> & p) const;
bool backward (geometry::point<double> & p) const;
unsigned int forward (std::vector<geometry::point<double>> & ls) const;
unsigned int backward (std::vector<geometry::point<double>> & ls) const;
bool forward (box2d<double> & box) const;
bool backward (box2d<double> & box) const;
bool forward (box2d<double> & box, int points) const;
bool backward (box2d<double> & box, int points) const;
bool forward (box2d<double> & box, std::size_t points) const;
bool backward (box2d<double> & box, std::size_t points) const;
private:
PJ_CONTEXT* ctx_ = nullptr;
PJ* transform_ = nullptr;

8
src/proj_transform.cpp
View file

@ -214,7 +214,7 @@ unsigned int proj_transform::forward (std::vector<geometry::point<double>> & ls)
return 0;
}
bool proj_transform::forward (double * x, double * y , double * z, int point_count, int offset) const
bool proj_transform::forward (double * x, double * y , double * z, std::size_t point_count, std::size_t offset) const
{
if (is_source_equal_dest_)
return true;
@ -240,7 +240,7 @@ bool proj_transform::forward (double * x, double * y , double * z, int point_cou
return true;
}
bool proj_transform::backward (double * x, double * y , double * z, int point_count, int offset) const
bool proj_transform::backward (double * x, double * y , double * z, std::size_t point_count, std::size_t offset) const
{
if (is_source_equal_dest_)
return true;
@ -372,7 +372,7 @@ bool proj_transform::backward (box2d<double> & box) const
// Alternative is to provide proper clipping box
// in the target srs by setting map 'maximum-extent'
bool proj_transform::backward(box2d<double>& env, int points) const
bool proj_transform::backward(box2d<double>& env, std::size_t points) const
{
if (is_source_equal_dest_)
return true;
@ -411,7 +411,7 @@ bool proj_transform::backward(box2d<double>& env, int points) const
return true;
}
bool proj_transform::forward(box2d<double>& env, int points) const
bool proj_transform::forward(box2d<double>& env, std::size_t points) const
{
if (is_source_equal_dest_)
return true;