ruby-libgd 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b6cf8d1607c8305b9baba3d94a36342d57543c5efb89bcac12a3887ea8a589d
-  data.tar.gz: 59620a7dbd30ec7c875c0ea69839170e7d76505dc7a8283514e83b7203e2e495
+  metadata.gz: b088efd8a6a97e9c78b98b3cad9679b16f44bb42f8db23a9ee69ccf2d6e0d354
+  data.tar.gz: 95b261eda0e28242e35af5161f6064c4a6a80194e06dce40a2b406174e68487c
 SHA512:
-  metadata.gz: 50e8dac738245acb26f3b4e95d35d2a2f79f319e15dbd056fd4dc0492b12d6ae29b0393407d4e01bc62a447ac5ed19501a8660ec3b16721a37d026fd6b08a63f
-  data.tar.gz: 3c3d1ef951a980be572ea48c5ec02804f40510421e03599ad3297836fc35927f4ede3c19392129b2d18b2c5208e61b9de33766977672357ac742fc3af31c150a
+  metadata.gz: bdcc47d45dc49eb617e99b19bdd088e0881b9ea8b84a7248347775f0847d0f1fef9717263f2cca5d85b088d3ebae8d8c9c8549707d92a86aeeb66689e853dc86
+  data.tar.gz: d3908f63c2e5bcc10379eba83d8ef0df78707cdd00a6ce3a62f3ab6b979a1b1365aa384de0e53b9a83748f53b61aa5d796d507aea51b0fb531c8955c858314c6

data/ext/gd/Makefile

@@ -0,0 +1,269 @@
+
+SHELL = /bin/sh
+
+# V=0 quiet, V=1 verbose.  other values don't work.
+V = 0
+V0 = $(V:0=)
+Q1 = $(V:1=)
+Q = $(Q1:0=@)
+ECHO1 = $(V:1=@ :)
+ECHO = $(ECHO1:0=@ echo)
+NULLCMD = :
+
+#### Start of system configuration section. ####
+
+srcdir = .
+topdir = /usr/local/include/ruby-3.3.0
+hdrdir = $(topdir)
+arch_hdrdir = /usr/local/include/ruby-3.3.0/x86_64-linux
+PATH_SEPARATOR = :
+VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
+prefix = $(DESTDIR)/usr/local
+rubysitearchprefix = $(rubylibprefix)/$(sitearch)
+rubyarchprefix = $(rubylibprefix)/$(arch)
+rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
+exec_prefix = $(prefix)
+vendorarchhdrdir = $(vendorhdrdir)/$(sitearch)
+sitearchhdrdir = $(sitehdrdir)/$(sitearch)
+rubyarchhdrdir = $(rubyhdrdir)/$(arch)
+vendorhdrdir = $(rubyhdrdir)/vendor_ruby
+sitehdrdir = $(rubyhdrdir)/site_ruby
+rubyhdrdir = $(includedir)/$(RUBY_VERSION_NAME)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
+vendorlibdir = $(vendordir)/$(ruby_version)
+vendordir = $(rubylibprefix)/vendor_ruby
+sitearchdir = $(sitelibdir)/$(sitearch)
+sitelibdir = $(sitedir)/$(ruby_version)
+sitedir = $(rubylibprefix)/site_ruby
+rubyarchdir = $(rubylibdir)/$(arch)
+rubylibdir = $(rubylibprefix)/$(ruby_version)
+sitearchincludedir = $(includedir)/$(sitearch)
+archincludedir = $(includedir)/$(arch)
+sitearchlibdir = $(libdir)/$(sitearch)
+archlibdir = $(libdir)/$(arch)
+ridir = $(datarootdir)/$(RI_BASE_NAME)
+mandir = $(datarootdir)/man
+localedir = $(datarootdir)/locale
+libdir = $(exec_prefix)/lib
+psdir = $(docdir)
+pdfdir = $(docdir)
+dvidir = $(docdir)
+htmldir = $(docdir)
+infodir = $(datarootdir)/info
+docdir = $(datarootdir)/doc/$(PACKAGE)
+oldincludedir = $(DESTDIR)/usr/include
+includedir = $(prefix)/include
+runstatedir = $(localstatedir)/run
+localstatedir = $(prefix)/var
+sharedstatedir = $(prefix)/com
+sysconfdir = $(prefix)/etc
+datadir = $(datarootdir)
+datarootdir = $(prefix)/share
+libexecdir = $(exec_prefix)/libexec
+sbindir = $(exec_prefix)/sbin
+bindir = $(exec_prefix)/bin
+archdir = $(rubyarchdir)
+
+
+CC_WRAPPER = 
+CC = gcc
+CXX = g++
+LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -Wl,-rpath,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -Wl,-rpath,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)-static $(MAINLIBS)
+empty =
+OUTFLAG = -o $(empty)
+COUTFLAG = -o $(empty)
+CSRCFLAG = $(empty)
+
+RUBY_EXTCONF_H = 
+cflags   = $(optflags) $(debugflags) $(warnflags)
+cxxflags = 
+optflags = -O3 -fno-fast-math
+debugflags = -ggdb3
+warnflags = -Wall -Wextra -Wdeprecated-declarations -Wdiv-by-zero -Wduplicated-cond -Wimplicit-function-declaration -Wimplicit-int -Wpointer-arith -Wwrite-strings -Wold-style-definition -Wimplicit-fallthrough=0 -Wmissing-noreturn -Wno-cast-function-type -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-packed-bitfield-compat -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wsuggest-attribute=format -Wsuggest-attribute=noreturn -Wunused-variable -Wmisleading-indentation -Wundef
+cppflags = 
+CCDLFLAGS = -fPIC
+CFLAGS   = $(CCDLFLAGS) $(cflags)  -fPIC $(ARCH_FLAG)
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
+DEFS     = 
+CPPFLAGS =   $(DEFS) $(cppflags)
+CXXFLAGS = $(CCDLFLAGS)  $(ARCH_FLAG)
+ldflags  = -L. -fstack-protector-strong -rdynamic -Wl,-export-dynamic -Wl,--no-as-needed
+dldflags = -Wl,--compress-debug-sections=zlib 
+ARCH_FLAG = 
+DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
+LDSHARED = $(CC) -shared
+LDSHAREDXX = $(CXX) -shared
+AR = gcc-ar
+EXEEXT = 
+
+RUBY_INSTALL_NAME = $(RUBY_BASE_NAME)
+RUBY_SO_NAME = ruby
+RUBYW_INSTALL_NAME = 
+RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
+RUBYW_BASE_NAME = rubyw
+RUBY_BASE_NAME = ruby
+
+arch = x86_64-linux
+sitearch = $(arch)
+ruby_version = 3.3.0
+ruby = $(bindir)/$(RUBY_BASE_NAME)
+RUBY = $(ruby)
+BUILTRUBY = $(bindir)/$(RUBY_BASE_NAME)
+ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/backward.h $(hdrdir)/ruby/ruby.h $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/missing.h $(hdrdir)/ruby/intern.h $(hdrdir)/ruby/st.h $(hdrdir)/ruby/subst.h $(arch_hdrdir)/ruby/config.h
+
+RM = rm -f
+RM_RF = rm -fr
+RMDIRS = rmdir --ignore-fail-on-non-empty -p
+MAKEDIRS = /usr/bin/mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+TOUCH = exit >
+
+#### End of system configuration section. ####
+
+preload = 
+libpath = . $(libdir)
+LIBPATH =  -L. -L$(libdir) -Wl,-rpath,$(libdir)
+DEFFILE = 
+
+CLEANFILES = mkmf.log
+DISTCLEANFILES = 
+DISTCLEANDIRS = 
+
+extout = 
+extout_prefix = 
+target_prefix = /gd
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED) -lm -lgd  -lm -lpthread  -lc
+ORIG_SRCS = arc.c blit.c char.c circle.c clip.c color.c draw_line.c ellipse.c encode.c fill.c filter.c gd.c image.c pixel.c polygon.c rectangle.c text.c transform.c version.c
+SRCS = $(ORIG_SRCS) 
+OBJS = arc.o blit.o char.o circle.o clip.o color.o draw_line.o ellipse.o encode.o fill.o filter.o gd.o image.o pixel.o polygon.o rectangle.o text.o transform.o version.o
+HDRS = $(srcdir)/clip.h $(srcdir)/ruby_gd.h
+LOCAL_HDRS = 
+TARGET = gd
+TARGET_NAME = gd
+TARGET_ENTRY = Init_$(TARGET_NAME)
+DLLIB = $(TARGET).so
+EXTSTATIC = 
+STATIC_LIB = 
+
+TIMESTAMP_DIR = .
+BINDIR        = $(bindir)
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+HDRDIR        = $(sitehdrdir)$(target_prefix)
+ARCHHDRDIR    = $(sitearchhdrdir)$(target_prefix)
+TARGET_SO_DIR =
+TARGET_SO     = $(TARGET_SO_DIR)$(DLLIB)
+CLEANLIBS     = $(TARGET_SO) false
+CLEANOBJS     = $(OBJS) *.bak
+TARGET_SO_DIR_TIMESTAMP = $(TIMESTAMP_DIR)/.sitearchdir.-.gd.time
+
+all:    $(DLLIB)
+static: $(STATIC_LIB)
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-static clean-rb
+
+clean-static::
+clean-rb-default::
+clean-rb::
+clean-so::
+clean: clean-so clean-static clean-rb-default clean-rb
+		-$(Q)$(RM_RF) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time
+
+distclean-rb-default::
+distclean-rb::
+distclean-so::
+distclean-static::
+distclean: clean distclean-so distclean-static distclean-rb-default distclean-rb
+		-$(Q)$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		-$(Q)$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+		-$(Q)$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
+
+realclean: distclean
+install: install-so install-rb
+
+install-so: $(DLLIB) $(TARGET_SO_DIR_TIMESTAMP)
+	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+clean-static::
+	-$(Q)$(RM) $(STATIC_LIB)
+install-rb: pre-install-rb do-install-rb install-rb-default
+install-rb-default: pre-install-rb-default do-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+do-install-rb:
+do-install-rb-default:
+pre-install-rb-default:
+	@$(NULLCMD)
+$(TARGET_SO_DIR_TIMESTAMP):
+	$(Q) $(MAKEDIRS) $(@D) $(RUBYARCHDIR)
+	$(Q) $(TOUCH) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .mm .cxx .cpp .o .S
+
+.cc.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
+
+.cc.S:
+	$(ECHO) translating $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
+
+.mm.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
+
+.mm.S:
+	$(ECHO) translating $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
+
+.cxx.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
+
+.cxx.S:
+	$(ECHO) translating $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
+
+.cpp.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
+
+.cpp.S:
+	$(ECHO) translating $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
+
+.c.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
+
+.c.S:
+	$(ECHO) translating $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
+
+.m.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
+
+.m.S:
+	$(ECHO) translating $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
+
+$(TARGET_SO): $(OBJS) Makefile
+	$(ECHO) linking shared-object gd/$(DLLIB)
+	-$(Q)$(RM) $(@)
+	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+$(OBJS): $(HDRS) $(ruby_headers)

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/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,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-libgd
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Germán Alberto Giménez Silva
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 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.
@@ -19,35 +20,56 @@ extensions:
 extra_rdoc_files: []
 files:
 - README.md
+- ext/gd/Makefile
 - ext/gd/arc.c
+- ext/gd/arc.o
 - ext/gd/blit.c
+- ext/gd/blit.o
 - ext/gd/char.c
+- ext/gd/char.o
 - ext/gd/circle.c
+- ext/gd/circle.o
 - ext/gd/clip.c
 - ext/gd/clip.h
+- ext/gd/clip.o
 - ext/gd/color.c
+- ext/gd/color.o
 - ext/gd/draw_line.c
+- ext/gd/draw_line.o
 - ext/gd/ellipse.c
+- ext/gd/ellipse.o
 - ext/gd/encode.c
+- ext/gd/encode.o
 - ext/gd/extconf.rb
 - ext/gd/fill.c
+- ext/gd/fill.o
 - ext/gd/filter.c
+- ext/gd/filter.o
 - ext/gd/gd.c
+- ext/gd/gd.o
 - ext/gd/gd.so
 - ext/gd/image.c
+- ext/gd/image.o
 - ext/gd/mkmf.log
 - ext/gd/pixel.c
+- ext/gd/pixel.o
 - ext/gd/polygon.c
+- ext/gd/polygon.o
 - ext/gd/rectangle.c
+- ext/gd/rectangle.o
 - ext/gd/ruby_gd.h
 - ext/gd/text.c
+- ext/gd/text.o
 - ext/gd/transform.c
+- ext/gd/transform.o
 - ext/gd/version.c
+- ext/gd/version.o
 - lib/gd.rb
 homepage: https://github.com/ggerman/ruby-libgd
 licenses:
 - MIT
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -63,7 +85,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Native Ruby bindings for libgd
 test_files: []