update names

artemp · artemp · commit b864705fb000 · 2015-05-04T18:53:17.000+02:00
diff --git a/src/mapnik_image.cpp b/src/mapnik_image.cpp
@@ -68,7 +68,7 @@ PyObject* tostring1( image_any const& im)
 #else
         ::PyString_FromStringAndSize
 #endif
-        ((const char*)im.getBytes(),im.getSize());
+        ((const char*)im.bytes(),im.size());
 }
 
 // encode (png,jpeg)
@@ -156,14 +156,14 @@ struct get_pixel_visitor
     {
         throw std::runtime_error("Can not return a null image from a pixel (shouldn't have reached here)");
     }
-    
+
     template <typename T>
     object operator() (T const& im)
     {
         using pixel_type = typename T::pixel_type;
         return object(mapnik::get_pixel<pixel_type>(im, x_, y_));
     }
-    
+
   private:
     unsigned x_;
     unsigned y_;
@@ -173,7 +173,7 @@ object get_pixel(mapnik::image_any const& im, unsigned x, unsigned y, bool get_c
 {
     if (x < static_cast<unsigned>(im.width()) && y < static_cast<unsigned>(im.height()))
     {
-        if (get_color) 
+        if (get_color)
         {
             return object(
                 mapnik::get_pixel<mapnik::color>(im, x, y)
@@ -312,7 +312,7 @@ void composite(image_any & dst, image_any & src, mapnik::composite_mode_e mode,
     bool demultiply_dst = mapnik::premultiply_alpha(dst);
     bool demultiply_src = mapnik::premultiply_alpha(src);
     mapnik::composite(dst,src,mode,opacity,dx,dy);
-    if (demultiply_dst) 
+    if (demultiply_dst)
     {
         mapnik::demultiply_alpha(dst);
     }
diff --git a/src/python_grid_utils.cpp b/src/python_grid_utils.cpp
@@ -73,7 +73,7 @@ void grid2utf(T const& grid_type,
     {
         std::uint16_t idx = 0;
         const std::unique_ptr<Py_UNICODE[]> line(new Py_UNICODE[array_size]);
-        typename T::value_type const* row = data.getRow(y);
+        typename T::value_type const* row = data.get_row(y);
         for (unsigned x = 0; x < data.width(); ++x)
         {
             typename T::value_type feature_id = row[x];
@@ -136,7 +136,7 @@ void grid2utf(T const& grid_type,
     {
         std::uint16_t idx = 0;
         const std::unique_ptr<Py_UNICODE[]> line(new Py_UNICODE[array_size]);
-        mapnik::grid::value_type const* row = grid_type.getRow(y);
+        mapnik::grid::value_type const* row = grid_type.get_row(y);
         for (unsigned x = 0; x < grid_type.width(); x=x+resolution)
         {
             typename T::value_type feature_id = row[x];
@@ -203,7 +203,7 @@ void grid2utf2(T const& grid_type,
     {
         uint16_t idx = 0;
         const std::unique_ptr<Py_UNICODE[]> line(new Py_UNICODE[array_size]);
-        mapnik::grid::value_type * row = target.getRow(y);
+        mapnik::grid::value_type * row = target.get_row(y);
         unsigned x;
         for (x = 0; x < target.width(); ++x)
         {

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ PyObject* tostring1( image_any const& im)`
`68`	`68`	`#else`
`69`	`69`	`::PyString_FromStringAndSize`
`70`	`70`	`#endif`
`71`		`- ((const char*)im.getBytes(),im.getSize());`
	`71`	`+ ((const char*)im.bytes(),im.size());`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`// encode (png,jpeg)`
`@@ -156,14 +156,14 @@ struct get_pixel_visitor`
`156`	`156`	`{`
`157`	`157`	`throw std::runtime_error("Can not return a null image from a pixel (shouldn't have reached here)");`
`158`	`158`	`}`
`159`		`-`
	`159`	`+`
`160`	`160`	`template <typename T>`
`161`	`161`	`object operator() (T const& im)`
`162`	`162`	`{`
`163`	`163`	`using pixel_type = typename T::pixel_type;`
`164`	`164`	`return object(mapnik::get_pixel<pixel_type>(im, x_, y_));`
`165`	`165`	`}`
`166`		`-`
	`166`	`+`
`167`	`167`	`private:`
`168`	`168`	`unsigned x_;`
`169`	`169`	`unsigned y_;`
`@@ -173,7 +173,7 @@ object get_pixel(mapnik::image_any const& im, unsigned x, unsigned y, bool get_c`
`173`	`173`	`{`
`174`	`174`	`if (x < static_cast<unsigned>(im.width()) && y < static_cast<unsigned>(im.height()))`
`175`	`175`	`{`
`176`		`- if (get_color)`
	`176`	`+ if (get_color)`
`177`	`177`	`{`
`178`	`178`	`return object(`
`179`	`179`	`mapnik::get_pixel<mapnik::color>(im, x, y)`
`@@ -312,7 +312,7 @@ void composite(image_any & dst, image_any & src, mapnik::composite_mode_e mode,`
`312`	`312`	`bool demultiply_dst = mapnik::premultiply_alpha(dst);`
`313`	`313`	`bool demultiply_src = mapnik::premultiply_alpha(src);`
`314`	`314`	`mapnik::composite(dst,src,mode,opacity,dx,dy);`
`315`		`- if (demultiply_dst)`
	`315`	`+ if (demultiply_dst)`
`316`	`316`	`{`
`317`	`317`	`mapnik::demultiply_alpha(dst);`
`318`	`318`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ void grid2utf(T const& grid_type,`
`73`	`73`	`{`
`74`	`74`	`std::uint16_t idx = 0;`
`75`	`75`	`const std::unique_ptr<Py_UNICODE[]> line(new Py_UNICODE[array_size]);`
`76`		`- typename T::value_type const* row = data.getRow(y);`
	`76`	`+ typename T::value_type const* row = data.get_row(y);`
`77`	`77`	`for (unsigned x = 0; x < data.width(); ++x)`
`78`	`78`	`{`
`79`	`79`	`typename T::value_type feature_id = row[x];`
`@@ -136,7 +136,7 @@ void grid2utf(T const& grid_type,`
`136`	`136`	`{`
`137`	`137`	`std::uint16_t idx = 0;`
`138`	`138`	`const std::unique_ptr<Py_UNICODE[]> line(new Py_UNICODE[array_size]);`
`139`		`- mapnik::grid::value_type const* row = grid_type.getRow(y);`
	`139`	`+ mapnik::grid::value_type const* row = grid_type.get_row(y);`
`140`	`140`	`for (unsigned x = 0; x < grid_type.width(); x=x+resolution)`
`141`	`141`	`{`
`142`	`142`	`typename T::value_type feature_id = row[x];`
`@@ -203,7 +203,7 @@ void grid2utf2(T const& grid_type,`
`203`	`203`	`{`
`204`	`204`	`uint16_t idx = 0;`
`205`	`205`	`const std::unique_ptr<Py_UNICODE[]> line(new Py_UNICODE[array_size]);`
`206`		`- mapnik::grid::value_type * row = target.getRow(y);`
	`206`	`+ mapnik::grid::value_type * row = target.get_row(y);`
`207`	`207`	`unsigned x;`
`208`	`208`	`for (x = 0; x < target.width(); ++x)`
`209`	`209`	`{`