Add explicit casts so converting from Py::Long to size_t works on 32bit machines

Neil · mdboom · commit 7327d13f3424 · 2011-03-16T10:43:53.000-04:00
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -108,7 +108,7 @@ Py::Object
 BufferRegion::set_x(const Py::Tuple &args)
 {
     args.verify_length(1);
-    size_t x = Py::Int(args[0]);
+    size_t x = (long) Py::Int(args[0]);
     rect.x1 = x;
     return Py::Object();
 }
@@ -118,7 +118,7 @@ Py::Object
 BufferRegion::set_y(const Py::Tuple &args)
 {
     args.verify_length(1);
-    size_t y = Py::Int(args[0]);
+    size_t y = (long)Py::Int(args[0]);
     rect.y1 = y;
     return Py::Object();
 }
@@ -1732,16 +1732,16 @@ RendererAgg::draw_quad_mesh(const Py::Tuple& args)
 
     //segments, trans, clipbox, colors, linewidths, antialiaseds
     GCAgg gc(args[0], dpi);
-    agg::trans_affine       master_transform = py_to_agg_transformation_matrix(args[1].ptr());
-    size_t                  mesh_width       = Py::Int(args[2]);
-    size_t                  mesh_height      = Py::Int(args[3]);
-    Py::Object              coordinates      = args[4];
-    Py::Object              offsets_obj      = args[5];
-    agg::trans_affine       offset_trans     = py_to_agg_transformation_matrix(args[6].ptr());
-    Py::Object              facecolors_obj   = args[7];
-    bool                    antialiased      = (bool)Py::Int(args[8]);
-    bool                    showedges        = (bool)Py::Int(args[9]);
-    bool                    free_edgecolors  = false;
+    agg::trans_affine master_transform = py_to_agg_transformation_matrix(args[1].ptr());
+    size_t            mesh_width       = (long)Py::Int(args[2]);
+    size_t            mesh_height      = (long)Py::Int(args[3]);
+    Py::Object        coordinates      = args[4];
+    Py::Object        offsets_obj      = args[5];
+    agg::trans_affine offset_trans     = py_to_agg_transformation_matrix(args[6].ptr());
+    Py::Object        facecolors_obj   = args[7];
+    bool              antialiased      = (bool)Py::Boolean(args[8]);
+    bool              showedges        = (bool)Py::Boolean(args[9]);
+    bool              free_edgecolors  = false;
 
     QuadMeshGenerator path_generator(mesh_width, mesh_height, coordinates.ptr());
 
diff --git a/src/_image.cpp b/src/_image.cpp
@@ -668,7 +668,7 @@ Image::set_interpolation(const Py::Tuple& args)
 
     args.verify_length(1);
 
-    size_t method = Py::Int(args[0]);
+    size_t method = (long)Py::Int(args[0]);
     interpolation = (unsigned)method;
     return Py::Object();
 }
@@ -702,7 +702,7 @@ Image::set_aspect(const Py::Tuple& args)
     _VERBOSE("Image::set_aspect");
 
     args.verify_length(1);
-    size_t method = Py::Int(args[0]);
+    size_t method = (long)Py::Int(args[0]);
     aspect = (unsigned)method;
     return Py::Object();
 
@@ -756,8 +756,8 @@ _image_module::from_images(const Py::Tuple& args)
 
     args.verify_length(3);
 
-    size_t numrows = (size_t)Py::Int(args[0]);
-    size_t numcols = (size_t)Py::Int(args[1]);
+    size_t numrows = (long)Py::Int(args[0]);
+    size_t numcols = (long)Py::Int(args[1]);
 
     if (numrows >= 32768 || numcols >= 32768)
     {
@@ -800,8 +800,8 @@ _image_module::from_images(const Py::Tuple& args)
     {
         tup = Py::Tuple(tups[imnum]);
         Image* thisim = static_cast<Image*>(tup[0].ptr());
-        ox = Py::Int(tup[1]);
-        oy = Py::Int(tup[2]);
+        ox = (long)Py::Int(tup[1]);
+        oy = (long)Py::Int(tup[2]);
         bool isflip = (thisim->rbufOut->stride()) < 0;
         //std::cout << "from images " << isflip << "; stride=" << thisim->rbufOut->stride() << std::endl;
         size_t ind = 0;
@@ -1171,8 +1171,8 @@ _image_module::frombuffer(const Py::Tuple& args)
     args.verify_length(4);
 
     PyObject *bufin = new_reference_to(args[0]);
-    size_t x = Py::Int(args[1]);
-    size_t y = Py::Int(args[2]);
+    size_t x = (long)Py::Int(args[1]);
+    size_t y = (long)Py::Int(args[2]);
 
     if (x >= 32768 || y >= 32768)
     {
