Fix #162

r-lib · Mar 15, 2024 · 25eedc4 · 25eedc4
1 parent 4b0b74e
commit 25eedc4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,8 @@
 # ragg (development version)
 
+* Make sure the linejoin/linemitre setting is honored when drawing rectangles
+  (#162)
+
 # ragg 1.3.0
 
 * Added supported for new graphics enigine features: Groups, paths, luminance

diff --git a/src/AggDevice.h b/src/AggDevice.h
@@ -132,7 +132,8 @@ class AggDevice {
   void drawCircle(double x, double y, double r, int fill, int col, double lwd, 
                   int lty, R_GE_lineend lend, int pattern);
   void drawRect(double x0, double y0, double x1, double y1, int fill, int col, 
-                double lwd, int lty, R_GE_lineend lend, int pattern);
+                double lwd, int lty, R_GE_lineend lend, R_GE_linejoin ljoin, 
+                double lmitre, int pattern);
   void drawPolygon(int n, double *x, double *y, int fill, int col, double lwd, 
                    int lty, R_GE_lineend lend, R_GE_linejoin ljoin, 
                    double lmitre, int pattern);
@@ -1141,7 +1142,8 @@ template<class PIXFMT, class R_COLOR, typename BLNDFMT>
 void AggDevice<PIXFMT, R_COLOR, BLNDFMT>::drawRect(double x0, double y0, double x1, 
                                           double y1, int fill, int col, 
                                           double lwd, int lty, 
-                                          R_GE_lineend lend, int pattern) {
+                                          R_GE_lineend lend, R_GE_linejoin ljoin, 
+                                          double lmitre, int pattern) {
   bool draw_fill = visibleColour(fill) || pattern != -1;
   bool draw_stroke = visibleColour(col) && lwd > 0.0 && lty != LTY_BLANK;
 
@@ -1170,7 +1172,7 @@ void AggDevice<PIXFMT, R_COLOR, BLNDFMT>::drawRect(double x0, double y0, double
   rect.line_to(x1, y0);
   rect.close_polygon();
 
-  drawShape(ras, ras_clip, rect, draw_fill, draw_stroke, fill, col, lwd, lty, lend, GE_ROUND_JOIN, 1.0, pattern);
+  drawShape(ras, ras_clip, rect, draw_fill, draw_stroke, fill, col, lwd, lty, lend, ljoin, lmitre, pattern);
 }
 
 template<class PIXFMT, class R_COLOR, typename BLNDFMT>

diff --git a/src/init_device.h b/src/init_device.h
@@ -129,7 +129,7 @@ void agg_rect(double x0, double y0, double x1, double y1, const pGEcontext gc,
 
   BEGIN_CPP
   device->drawRect(x0, y0, x1, y1, gc->fill, gc->col, gc->lwd, 
-                   gc->lty, gc->lend, pattern);
+                   gc->lty, gc->lend, gc->ljoin, gc->lmitre, pattern);
   END_CPP
 
   return;