ruby-libgd 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3842326bd6413b4f2e29d338600edeaf860def862c1aa6c9f55cfb57769ca5e
-  data.tar.gz: 9dc0b760f12eb9ecb69268362a043d15b8b585615727832c0899133685ae1261
+  metadata.gz: b088efd8a6a97e9c78b98b3cad9679b16f44bb42f8db23a9ee69ccf2d6e0d354
+  data.tar.gz: 95b261eda0e28242e35af5161f6064c4a6a80194e06dce40a2b406174e68487c
 SHA512:
-  metadata.gz: 91565c334782c8abe36121c9ff4443f4f0768472a5f034e52ddfea3dfd7710e9fc987747ed192bc43c2b2d73bb49d4448cdbaff7c92905e3d07c6ccbd0b83932
-  data.tar.gz: 83b5786eba8197bd0e4e6d8a07856aaaa679ae398a6ba06a1dde40e38221787ef169dd9ae00c7ae5efc9b4266c72d2d9c56cebebe62635b0cda94427fcdc30a0
+  metadata.gz: bdcc47d45dc49eb617e99b19bdd088e0881b9ea8b84a7248347775f0847d0f1fef9717263f2cca5d85b088d3ebae8d8c9c8549707d92a86aeeb66689e853dc86
+  data.tar.gz: d3908f63c2e5bcc10379eba83d8ef0df78707cdd00a6ce3a62f3ab6b979a1b1365aa384de0e53b9a83748f53b61aa5d796d507aea51b0fb531c8955c858314c6

data/ext/gd/arc.c

@@ -1,52 +1,64 @@
 #include "ruby_gd.h"
 
-static VALUE gd_image_arc(VALUE self,
-    VALUE vcx, VALUE vcy,
-    VALUE vw, VALUE vh,
-    VALUE vstart, VALUE vend,
-    VALUE vcolor
-) {
-    gd_image_wrapper *wrap;
-    TypedData_Get_Struct(self, gd_image_wrapper, &gd_image_type, wrap);
-
-    int cx = NUM2INT(vcx);
-    int cy = NUM2INT(vcy);
-    int w  = NUM2INT(vw);
-    int h  = NUM2INT(vh);
-    int s  = NUM2INT(vstart);
-    int e  = NUM2INT(vend);
-
-    int c = color_to_gd(wrap->img, vcolor);
-
-    gdImageArc(wrap->img, cx, cy, w, h, s, e, c);
-
-    return self;
+static VALUE
+gd_image_arc(int argc, VALUE *argv, VALUE self)
+{
+  VALUE vcx, vcy, vw, vh, vstart, vend, vcolor, opts;
+  VALUE thickness = Qnil;
+  opts = Qnil;
+
+  rb_scan_args(argc, argv, "7:", &vcx, &vcy, &vw, &vh, &vstart, &vend, &vcolor, &opts);
+
+  if (!NIL_P(opts)) {
+    thickness = rb_hash_aref(opts, ID2SYM(rb_intern("thickness")));
+  }
+
+  gd_image_wrapper *wrap;
+  TypedData_Get_Struct(self, gd_image_wrapper, &gd_image_type, wrap);
+
+  int cx = NUM2INT(vcx);
+  int cy = NUM2INT(vcy);
+  int w  = NUM2INT(vw);
+  int h  = NUM2INT(vh);
+  int s  = NUM2INT(vstart);
+  int e  = NUM2INT(vend);
+  int c  = color_to_gd(wrap->img, vcolor);
+
+  int t = NIL_P(thickness) ? 1 : NUM2INT(thickness);
+  int half = t / 2;
+
+  for (int i = -half; i <= half; i++) {
+    gdImageArc(wrap->img, cx + i, cy, w, h, s, e, c);
+  }
+
+  return self;
 }
 
-static VALUE gd_image_filled_arc(VALUE self,
-    VALUE vcx, VALUE vcy,
-    VALUE vw, VALUE vh,
-    VALUE vstart, VALUE vend,
-    VALUE vcolor
-) {
-    gd_image_wrapper *wrap;
-    TypedData_Get_Struct(self, gd_image_wrapper, &gd_image_type, wrap);
+static VALUE
+gd_image_filled_arc(int argc, VALUE *argv, VALUE self)
+{
+  VALUE vcx, vcy, vw, vh, vstart, vend, vcolor;
+  rb_scan_args(argc, argv, "7", &vcx, &vcy, &vw, &vh, &vstart, &vend, &vcolor);
 
-    int cx = NUM2INT(vcx);
-    int cy = NUM2INT(vcy);
-    int w  = NUM2INT(vw);
-    int h  = NUM2INT(vh);
-    int s  = NUM2INT(vstart);
-    int e  = NUM2INT(vend);
+  gd_image_wrapper *wrap;
+  TypedData_Get_Struct(self, gd_image_wrapper, &gd_image_type, wrap);
 
-    int c = color_to_gd(wrap->img, vcolor);
+  int cx = NUM2INT(vcx);
+  int cy = NUM2INT(vcy);
+  int w  = NUM2INT(vw);
+  int h  = NUM2INT(vh);
+  int s  = NUM2INT(vstart);
+  int e  = NUM2INT(vend);
+  int c  = color_to_gd(wrap->img, vcolor);
 
-    gdImageFilledArc(wrap->img, cx, cy, w, h, s, e, c, gdArc);
+  gdImageFilledArc(wrap->img, cx, cy, w, h, s, e, c, gdArc);
 
-    return self;
+  return self;
 }
 
-void gd_define_arc(VALUE cGDImage) {
-    rb_define_method(cGDImage, "arc", gd_image_arc, 7);
-    rb_define_method(cGDImage, "filled_arc", gd_image_filled_arc, 7);
+void
+gd_define_arc(VALUE cGDImage)
+{
+  rb_define_method(cGDImage, "arc",        gd_image_arc,        -1);
+  rb_define_method(cGDImage, "filled_arc", gd_image_filled_arc, -1);
 }

data/ext/gd/circle.c

@@ -1,33 +1,82 @@
 #include "ruby_gd.h"
 
-static VALUE gd_image_circle(VALUE self, VALUE cx, VALUE cy, VALUE r, VALUE color) {
+static VALUE gd_image_circle(int argc, VALUE *argv, VALUE self)
+{
+  VALUE vcx, vcy, vradius, vcolor, opts;
+  VALUE thickness = Qnil;
+  opts = Qnil;
+
+  rb_scan_args(argc, argv, "4:", &vcx, &vcy, &vradius, &vcolor, &opts);
+
+  if (!NIL_P(opts)) {
+    thickness = rb_hash_aref(opts, ID2SYM(rb_intern("thickness")));
+  }
+
   gd_image_wrapper *wrap;
   TypedData_Get_Struct(self, gd_image_wrapper, &gd_image_type, wrap);
 
-  int c = color_to_gd(wrap->img, color);
+  int cx = NUM2INT(vcx);
+  int cy = NUM2INT(vcy);
+  int r  = NUM2INT(vradius);
+  int c  = color_to_gd(wrap->img, vcolor);
 
-  gdImageArc(wrap->img,
-             NUM2INT(cx), NUM2INT(cy),
-             NUM2INT(r)*2, NUM2INT(r)*2,
-             0, 360,
-             c);
-  return Qnil;
+  int t = NIL_P(thickness) ? 1 : NUM2INT(thickness);
+  int half = t / 2;
+
+  for (int i = -half; i <= half; i++) {
+    gdImageArc(wrap->img,
+               cx, cy,
+               (r + i) * 2, (r + i) * 2,
+               0, 360,
+               c);
+  }
+
+  return self;
 }
 
-static VALUE gd_image_filled_circle(VALUE self, VALUE cx, VALUE cy, VALUE r, VALUE color) {
+static VALUE gd_image_filled_circle(int argc, VALUE *argv, VALUE self)
+{
+  VALUE vcx, vcy, vradius, vcolor, opts;
+  VALUE thickness = Qnil;
+  opts = Qnil;
+
+  rb_scan_args(argc, argv, "4:", &vcx, &vcy, &vradius, &vcolor, &opts);
+
+  if (!NIL_P(opts)) {
+    thickness = rb_hash_aref(opts, ID2SYM(rb_intern("thickness")));
+  }
+
   gd_image_wrapper *wrap;
   TypedData_Get_Struct(self, gd_image_wrapper, &gd_image_type, wrap);
 
-  int c = color_to_gd(wrap->img, color);
+  int cx = NUM2INT(vcx);
+  int cy = NUM2INT(vcy);
+  int r  = NUM2INT(vradius);
+  int c  = color_to_gd(wrap->img, vcolor);
 
+  /* Fill */
   gdImageFilledEllipse(wrap->img,
-                       NUM2INT(cx), NUM2INT(cy),
-                       NUM2INT(r)*2, NUM2INT(r)*2,
+                       cx, cy,
+                       r * 2, r * 2,
                        c);
-  return Qnil;
+
+  /* Stroke */
+  int t = NIL_P(thickness) ? 1 : NUM2INT(thickness);
+  int half = t / 2;
+
+  for (int i = -half; i <= half; i++) {
+    gdImageArc(wrap->img,
+               cx, cy,
+               (r + i) * 2, (r + i) * 2,
+               0, 360,
+               c);
+  }
+
+  return self;
 }
 
-void gd_define_circle(VALUE cGDImage) {
-  rb_define_method(cGDImage, "circle", gd_image_circle, 4);
-  rb_define_method(cGDImage, "filled_circle", gd_image_filled_circle, 4);
+void gd_define_circle(VALUE cGDImage)
+{
+  rb_define_method(cGDImage, "circle",        gd_image_circle,        -1);
+  rb_define_method(cGDImage, "filled_circle", gd_image_filled_circle, -1);
 }

data/ext/gd/draw_line.c

@@ -2,7 +2,17 @@
 #include "ruby_gd.h"
 #include "clip.h"
 
-static VALUE gd_image_line(VALUE self, VALUE x1, VALUE y1, VALUE x2, VALUE y2, VALUE color) {
+static VALUE gd_image_line(int argc, VALUE *argv, VALUE self) {
+  VALUE x1, y1, x2, y2, color, opts;
+  opts = Qnil;
+
+  rb_scan_args(argc, argv, "5:", &x1, &y1, &x2, &y2, &color, &opts);
+
+  VALUE thickness = Qnil;
+  if (!NIL_P(opts)) {
+    thickness = rb_hash_aref(opts, ID2SYM(rb_intern("thickness")));
+  }
+
   gd_image_wrapper *wrap;
   TypedData_Get_Struct(self, gd_image_wrapper, &gd_image_type, wrap);
 
@@ -39,11 +49,17 @@ static VALUE gd_image_line(VALUE self, VALUE x1, VALUE y1, VALUE x2, VALUE y2, V
   }
 
   int c = color_to_gd(wrap->img, color);
+  int old = 1;
+
+  if (!NIL_P(thickness)) {
+    gdImageSetThickness(wrap->img, NUM2INT(thickness));
+  }
   gdImageLine(wrap->img, NUM2INT(x1), NUM2INT(y1), NUM2INT(x2), NUM2INT(y2), c);
+  gdImageSetThickness(wrap->img, old);
 
   return Qnil;
 }
 
 void gd_define_line(VALUE cGDImage) {
-  rb_define_method(cGDImage, "line", gd_image_line, 5);
+  rb_define_method(cGDImage, "line", gd_image_line, -1);
 }

data/ext/gd/ellipse.c

@@ -2,3 +2,83 @@
     - [ ] imageellipse — Draw an ellipse
     - [ ] imagefilledellipse — Draw a filled ellipse
  */
+#include "ruby_gd.h"
+
+static VALUE gd_image_ellipse(int argc, VALUE *argv, VALUE self)
+{
+  VALUE vcx, vcy, vw, vh, vcolor, opts;
+  VALUE thickness = Qnil;
+  opts = Qnil;
+
+  rb_scan_args(argc, argv, "5:", &vcx, &vcy, &vw, &vh, &vcolor, &opts);
+
+  if (!NIL_P(opts)) {
+    thickness = rb_hash_aref(opts, ID2SYM(rb_intern("thickness")));
+  }
+
+  gd_image_wrapper *wrap;
+  TypedData_Get_Struct(self, gd_image_wrapper, &gd_image_type, wrap);
+
+  int cx = NUM2INT(vcx);
+  int cy = NUM2INT(vcy);
+  int w  = NUM2INT(vw);
+  int h  = NUM2INT(vh);
+  int c  = color_to_gd(wrap->img, vcolor);
+
+  int t = NIL_P(thickness) ? 1 : NUM2INT(thickness);
+  int half = t / 2;
+
+  for (int i = -half; i <= half; i++) {
+    gdImageArc(wrap->img,
+               cx, cy,
+               w + i * 2, h + i * 2,
+               0, 360,
+               c);
+  }
+
+  return self;
+}
+
+static VALUE gd_image_filled_ellipse(int argc, VALUE *argv, VALUE self)
+{
+  VALUE vcx, vcy, vw, vh, vcolor, opts;
+  VALUE thickness = Qnil;
+  opts = Qnil;
+
+  rb_scan_args(argc, argv, "5:", &vcx, &vcy, &vw, &vh, &vcolor, &opts);
+
+  if (!NIL_P(opts)) {
+    thickness = rb_hash_aref(opts, ID2SYM(rb_intern("thickness")));
+  }
+
+  gd_image_wrapper *wrap;
+  TypedData_Get_Struct(self, gd_image_wrapper, &gd_image_type, wrap);
+
+  int cx = NUM2INT(vcx);
+  int cy = NUM2INT(vcy);
+  int w  = NUM2INT(vw);
+  int h  = NUM2INT(vh);
+  int c  = color_to_gd(wrap->img, vcolor);
+
+  /* Fill */
+  gdImageFilledEllipse(wrap->img, cx, cy, w, h, c);
+
+  /* Stroke */
+  int t = NIL_P(thickness) ? 1 : NUM2INT(thickness);
+  int half = t / 2;
+
+  for (int i = -half; i <= half; i++) {
+    gdImageArc(wrap->img,
+               cx, cy,
+               w + i * 2, h + i * 2,
+               0, 360,
+               c);
+  }
+
+  return self;
+}
+
+void gd_define_ellipse(VALUE cGDImage) {
+  rb_define_method(cGDImage, "ellipse",        gd_image_ellipse,        -1);
+  rb_define_method(cGDImage, "filled_ellipse", gd_image_filled_ellipse, -1);
+}

data/ext/gd/gd.c

@@ -72,8 +72,9 @@ void Init_gd(void) {
   gd_define_pixel(cGDImage);
   gd_define_line(cGDImage);
   gd_define_arc(cGDImage);
-  gd_define_rect(cGDImage);
+  gd_define_rectangle(cGDImage);
   gd_define_circle(cGDImage);
+  gd_define_ellipse(cGDImage);
   gd_define_polygon(cGDImage);
 
   gd_define_text(cGDImage);

data/ext/gd/image.c

@@ -196,7 +196,7 @@ static VALUE gd_image_height(VALUE self) {
     return INT2NUM(gdImageSY(wrap->img));
 }
 
-static VALUE gd_image_copy(
+static VALUE gd_image_copy (
   VALUE self, VALUE src,
   VALUE dx, VALUE dy,
   VALUE sx, VALUE sy,
@@ -219,7 +219,6 @@ static VALUE gd_image_copy(
   return Qnil;
 }
 
-
 void gd_define_image(VALUE mGD) {
   VALUE cGDImage = rb_define_class_under(mGD, "Image", rb_cObject);
 

data/ext/gd/rectangle.c

@@ -3,31 +3,58 @@
  - [ ] imagerectangle — Draw a rectangle
  - [ ] imagefilledrectangle — Draw a filled rectangle
  */
-static VALUE gd_image_rect(VALUE self, VALUE x1, VALUE y1, VALUE x2, VALUE y2, VALUE color) {
+static VALUE gd_image_rectangle(int argc, VALUE *argv, VALUE self) {
+  VALUE x1, y1, x2, y2, color, opts;
+  VALUE thickness = Qnil;
+  opts = Qnil;
+
+  rb_scan_args(argc, argv, "5:", &x1, &y1, &x2, &y2, &color, &opts);
+  if (!NIL_P(opts)) {
+    thickness = rb_hash_aref(opts, ID2SYM(rb_intern("thickness")));
+  }
+
   gd_image_wrapper *wrap;
   TypedData_Get_Struct(self, gd_image_wrapper, &gd_image_type, wrap);
 
   int c = color_to_gd(wrap->img, color);
+
+  if (!NIL_P(thickness)) {
+    gdImageSetThickness(wrap->img, NUM2INT(thickness));
+  }
   gdImageRectangle(wrap->img,
                    NUM2INT(x1), NUM2INT(y1),
                    NUM2INT(x2), NUM2INT(y2),
                    c);
+  gdImageSetThickness(wrap->img, 1);
   return Qnil;
 }
 
-static VALUE gd_image_filled_rect(VALUE self, VALUE x1, VALUE y1, VALUE x2, VALUE y2, VALUE color) {
+static VALUE gd_image_filled_rectangle(int argc, VALUE *argv, VALUE self) {
+  VALUE x1, y1, x2, y2, color, opts;
+  VALUE thickness = Qnil;
+  opts = Qnil;
+
+  rb_scan_args(argc, argv, "5:", &x1, &y1, &x2, &y2, &color, &opts);
+  if (!NIL_P(opts)) {
+    thickness = rb_hash_aref(opts, ID2SYM(rb_intern("thickness")));
+  }
+
   gd_image_wrapper *wrap;
   TypedData_Get_Struct(self, gd_image_wrapper, &gd_image_type, wrap);
 
   int c = color_to_gd(wrap->img, color);
+  if (!NIL_P(thickness)) {
+    gdImageSetThickness(wrap->img, NUM2INT(thickness));
+  }
   gdImageFilledRectangle(wrap->img,
                          NUM2INT(x1), NUM2INT(y1),
                          NUM2INT(x2), NUM2INT(y2),
                          c);
+  gdImageSetThickness(wrap->img, 1);
   return Qnil;
 }
 
-void gd_define_rect(VALUE cGDImage) {
-  rb_define_method(cGDImage, "rect", gd_image_rect, 5);
-  rb_define_method(cGDImage, "filled_rect", gd_image_filled_rect, 5);
+void gd_define_rectangle(VALUE cGDImage) {
+  rb_define_method(cGDImage, "rectangle", gd_image_rectangle, -1);
+  rb_define_method(cGDImage, "filled_rectangle", gd_image_filled_rectangle, -1);
 }

data/ext/gd/ruby_gd.h

@@ -21,8 +21,9 @@ void gd_define_fill(VALUE cGDImage);
 void gd_define_pixel(VALUE cGDImage);
 void gd_define_line(VALUE cGDImage);
 void gd_define_arc(VALUE cGDImage);
-void gd_define_rect(VALUE cGDImage);
+void gd_define_rectangle(VALUE cGDImage);
 void gd_define_circle(VALUE cGDImage);
+void gd_define_ellipse(VALUE cGDImage);
 void gd_define_polygon(VALUE cGDImage);
 
 void gd_define_text(VALUE cGDImage);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-libgd
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Germán Alberto Giménez Silva
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-03 00:00:00.000000000 Z
+date: 2026-01-05 00:00:00.000000000 Z
 dependencies: []
 description: High-performance native Ruby bindings to libgd for image generation,
   drawing, filters, alpha blending, and transformations.
@@ -50,7 +50,6 @@ files:
 - ext/gd/gd.so
 - ext/gd/image.c
 - ext/gd/image.o
-- ext/gd/join.sh
 - ext/gd/mkmf.log
 - ext/gd/pixel.c
 - ext/gd/pixel.o
@@ -66,7 +65,6 @@ files:
 - ext/gd/version.c
 - ext/gd/version.o
 - lib/gd.rb
-- lib/gd/gd.so
 homepage: https://github.com/ggerman/ruby-libgd
 licenses:
 - MIT
@@ -75,6 +73,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- ext
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/ext/gd/join.sh

@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-OUT="c_sources_dump.txt"
-
-echo "Generating $OUT ..."
-echo "======================" > "$OUT"
-echo "Generated on $(date)" >> "$OUT"
-echo "" >> "$OUT"
-
-find . -name "*.c" -type f | sort | while read -r file; do
-  echo "----------------------------------------" >> "$OUT"
-  echo "FILE: $file" >> "$OUT"
-  echo "----------------------------------------" >> "$OUT"
-  echo "" >> "$OUT"
-
-  sed 's/\t/  /g' "$file" >> "$OUT"
-
-  echo "" >> "$OUT"
-  echo "" >> "$OUT"
-done
-
-echo "Done."
-echo "Output written to: $OUT"