Merge pull request #4951 from tacaswell/fix_transpose_in_agg

WeatherGod · WeatherGod · commit 4fd00b0012f1 · 2015-08-18T09:16:12.000-04:00
FIX: argument order in RendereAgg.restore_region
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -109,7 +109,7 @@ void RendererAgg::restore_region(BufferRegion &region)
 
 // Restore the part of the saved region with offsets
 void
-RendererAgg::restore_region(BufferRegion &region, int x, int y, int xx1, int yy1, int xx2, int yy2)
+RendererAgg::restore_region(BufferRegion &region, int xx1, int yy1, int xx2, int yy2, int x, int y )
 {
     if (region.get_data() == NULL) {
         throw "Cannot restore_region from NULL data";
diff --git a/src/_backend_agg.h b/src/_backend_agg.h
@@ -215,7 +215,7 @@ class RendererAgg
 
     BufferRegion *copy_from_bbox(agg::rect_d in_rect);
     void restore_region(BufferRegion &reg);
-    void restore_region(BufferRegion &region, int x, int y, int xx1, int yy1, int xx2, int yy2);
+    void restore_region(BufferRegion &region, int xx1, int yy1, int xx2, int yy2, int x, int y);
 
     unsigned int width, height;
     double dpi;

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ void RendererAgg::restore_region(BufferRegion &region)`
`109`	`109`
`110`	`110`	`// Restore the part of the saved region with offsets`
`111`	`111`	`void`
`112`		`-RendererAgg::restore_region(BufferRegion &region, int x, int y, int xx1, int yy1, int xx2, int yy2)`
	`112`	`+RendererAgg::restore_region(BufferRegion &region, int xx1, int yy1, int xx2, int yy2, int x, int y )`
`113`	`113`	`{`
`114`	`114`	`if (region.get_data() == NULL) {`
`115`	`115`	`throw "Cannot restore_region from NULL data";`