Merge pull request #2992 from jkseppan/tidyup-misc

mdboom · mdboom · commit b61e300fd1ea · 2014-04-20T18:14:20.000-04:00
Remove a few dead assignments
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -166,7 +166,6 @@ BufferRegion::to_string_argb(const Py::Tuple &args)
         throw Py::TypeError("Could not create memory for blit");
     }
 
-    pix = begin;
     for (i = 0; i < (size_t)height; ++i)
     {
         pix = begin + i * stride;
diff --git a/src/_image.cpp b/src/_image.cpp
@@ -991,7 +991,6 @@ _image_module::fromarray(const Py::Tuple& args)
     {
         throw Py::ValueError("Illegal array rank; must be rank; must 2 or 3");
     }
-    buffer -= NUMBYTES;
 
     return Py::asObject(imo);
 }
@@ -1099,7 +1098,6 @@ _image_module::fromarray2(const Py::Tuple& args)
     {
         throw Py::ValueError("Illegal array rank; must be rank; must 2 or 3");
     }
-    buffer -= NUMBYTES;
 
     return Py::asObject(imo);
 }
@@ -1681,7 +1679,6 @@ _image_module::pcolor(const Py::Tuple& args)
     unsigned char *inposition;
     size_t inrowsize(nx*4);
     size_t rowsize(cols*4);
-    rowstart = rowstarts;
     agg::int8u * position = buffer;
     agg::int8u * oldposition = NULL;
     start = reinterpret_cast<unsigned char*>(d->data);

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,6 @@ BufferRegion::to_string_argb(const Py::Tuple &args)`
`166`	`166`	`throw Py::TypeError("Could not create memory for blit");`
`167`	`167`	`}`
`168`	`168`
`169`		`- pix = begin;`
`170`	`169`	`for (i = 0; i < (size_t)height; ++i)`
`171`	`170`	`{`
`172`	`171`	`pix = begin + i * stride;`
Original file line number	Diff line number	Diff line change
`@@ -991,7 +991,6 @@ _image_module::fromarray(const Py::Tuple& args)`
`991`	`991`	`{`
`992`	`992`	`throw Py::ValueError("Illegal array rank; must be rank; must 2 or 3");`
`993`	`993`	`}`
`994`		`- buffer -= NUMBYTES;`
`995`	`994`
`996`	`995`	`return Py::asObject(imo);`
`997`	`996`	`}`
`@@ -1099,7 +1098,6 @@ _image_module::fromarray2(const Py::Tuple& args)`
`1099`	`1098`	`{`
`1100`	`1099`	`throw Py::ValueError("Illegal array rank; must be rank; must 2 or 3");`
`1101`	`1100`	`}`
`1102`		`- buffer -= NUMBYTES;`
`1103`	`1101`
`1104`	`1102`	`return Py::asObject(imo);`
`1105`	`1103`	`}`
`@@ -1681,7 +1679,6 @@ _image_module::pcolor(const Py::Tuple& args)`
`1681`	`1679`	`unsigned char *inposition;`
`1682`	`1680`	`size_t inrowsize(nx*4);`
`1683`	`1681`	`size_t rowsize(cols*4);`
`1684`		`- rowstart = rowstarts;`
`1685`	`1682`	`agg::int8u * position = buffer;`
`1686`	`1683`	`agg::int8u * oldposition = NULL;`
`1687`	`1684`	`start = reinterpret_cast<unsigned char*>(d->data);`