ruby-libgd 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2290b81211eb8b17a3930af54b2eb52235e657fa38d946abf938bb646d9a986e
-  data.tar.gz: 82b2bacfad22db150bdcc1ca321e77bdfca00e76c36fb69f01aaff38ecdca4a2
+  metadata.gz: 9eeb38f45f5b10901ca181a764eaa2674ace08857e5f0e8abd780992e0bed0fd
+  data.tar.gz: 9b9c340d1062ac114b96e5866d8d4644da1fa1d2f423f813d3b91ae48043008a
 SHA512:
-  metadata.gz: 2a459d1c261cd8124587e3abb2c218097987e6bc5b856d485b0e5a3a0e1797a7a2ee954fddf01f65053889b9999520727563b9cd0b1cadf8a7c58b3da29b02f1
-  data.tar.gz: 750ca9ccdc9e8a6c4b63a24e69e8dce114854723abc6ba9cbd1189415fb8bff675497e04e9e7a5e5b2581db603eee9d57d873d5d82de066fc35f099a3cd79819
+  metadata.gz: b8f6e6c75657ec17d591bb3122732432f66720a46efac1076a29faeda7035d16cbf5d3d62a0d14a2736d8a388729747882b350b4a19720c39f70013fcf35d518
+  data.tar.gz: 9a5baf51987aa6bfacbb2896f35a3f590cd2ce8cdf9067b57a25afcbb3a08bd5225ce81c7161d38417c8d772267992e4f8fbe05ee6adad76dd75f3ac9c7d253f

data/ext/gd/circle.c

@@ -4,10 +4,7 @@ static VALUE gd_image_circle(VALUE self, VALUE cx, VALUE cy, VALUE r, VALUE colo
   gd_image_wrapper *wrap;
   TypedData_Get_Struct(self, gd_image_wrapper, &gd_image_type, wrap);
 
-  int red = NUM2INT(rb_ary_entry(color, 0));
-  int green = NUM2INT(rb_ary_entry(color, 1));
-  int blue = NUM2INT(rb_ary_entry(color, 2));
-  int c = gdImageColorAllocate(wrap->img, red, green, blue);
+  int c = color_to_gd(wrap->img, color);
 
   gdImageArc(wrap->img,
              NUM2INT(cx), NUM2INT(cy),
@@ -21,10 +18,7 @@ static VALUE gd_image_filled_circle(VALUE self, VALUE cx, VALUE cy, VALUE r, VAL
   gd_image_wrapper *wrap;
   TypedData_Get_Struct(self, gd_image_wrapper, &gd_image_type, wrap);
 
-  int red = NUM2INT(rb_ary_entry(color, 0));
-  int green = NUM2INT(rb_ary_entry(color, 1));
-  int blue = NUM2INT(rb_ary_entry(color, 2));
-  int c = gdImageColorAllocate(wrap->img, red, green, blue);
+  int c = color_to_gd(wrap->img, color);
 
   gdImageFilledEllipse(wrap->img,
                        NUM2INT(cx), NUM2INT(cy),

data/ext/gd/draw_line.c

@@ -38,11 +38,7 @@ static VALUE gd_image_line(VALUE self, VALUE x1, VALUE y1, VALUE x2, VALUE y2, V
     rb_raise(rb_eArgError, "color must be [r,g,b]");
   }
 
-  int r = NUM2INT(rb_ary_entry(color, 0));
-  int g = NUM2INT(rb_ary_entry(color, 1));
-  int b = NUM2INT(rb_ary_entry(color, 2));
-
-  int c = gdImageColorAllocate(wrap->img, r, g, b);
+  int c = color_to_gd(wrap->img, color);
   gdImageLine(wrap->img, NUM2INT(x1), NUM2INT(y1), NUM2INT(x2), NUM2INT(y2), c);
 
   return Qnil;

data/ext/gd/encode.c

@@ -1,17 +1,5 @@
 #include "ruby_gd.h"
 
-/**
-  - [ ] imagegif — Output image to browser or file
-  - [x] imagewbmp — Output image to browser or file
-  - [x] imagewebp — Output a WebP image to browser or file
-  - [ ] imagexbm — Output an XBM image to browser or file
-  - [x] imagepng — Output a PNG image to either the browser or a file
-  - [x] imagejpeg — Output image to browser or file
-  - [ ] imagegd — Output GD image to browser or file
-  - [ ] imagegd2 — Output GD2 image to browser or file
-  - [ ] imageavif — Output image to browser or file
-  - [ ] imagebmp — Output a BMP image to browser or file
- **/
 static VALUE gd_image_save(int argc, VALUE *argv, VALUE self) {
   VALUE path, opts;
   rb_scan_args(argc, argv, "11", &path, &opts);
@@ -28,6 +16,8 @@ static VALUE gd_image_save(int argc, VALUE *argv, VALUE self) {
   if (!f) rb_sys_fail(filename);
 
   if (strcmp(ext, ".png") == 0) {
+    gdImageSaveAlpha(wrap->img, 1);
+    gdImageAlphaBlending(wrap->img, 0);
     gdImagePng(wrap->img, f);
   } else if (strcmp(ext, ".jpg") == 0 || strcmp(ext, ".jpeg") == 0) {
     int quality = 90;

data/ext/gd/fill.c

@@ -10,13 +10,17 @@ static VALUE gd_image_fill(VALUE self, VALUE color) {
   if (!wrap || !wrap->img)
     rb_raise(rb_eRuntimeError, "uninitialized GD::Image");
 
-  int r = NUM2INT(rb_ary_entry(color,0));
-  int g = NUM2INT(rb_ary_entry(color,1));
-  int b = NUM2INT(rb_ary_entry(color,2));
-  int c = gdImageColorAllocate(wrap->img,r,g,b);
+  int c = color_to_gd(wrap->img, color);
 
-  gdImageFilledRectangle(wrap->img,0,0,wrap->img->sx,wrap->img->sy,c);
-  return Qnil;
+  gdImageFilledRectangle(
+    wrap->img,
+    0, 0,
+    gdImageSX(wrap->img) - 1,
+    gdImageSY(wrap->img) - 1,
+    c
+  );
+
+  return self;
 }
 
 void gd_define_fill(VALUE cGDImage) {

data/ext/gd/image.c

@@ -19,6 +19,12 @@ static VALUE gd_image_initialize(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "width and height must be positive");
 
   wrap->img = gdImageCreateTrueColor(w, h);
+  gdImageSaveAlpha(wrap->img, 1);
+  gdImageAlphaBlending(wrap->img, 0);
+
+  int t = gdTrueColorAlpha(0,0,0,127);
+  gdImageFilledRectangle(wrap->img, 0, 0, w-1, h-1, t);
+
   if (!wrap->img)
     rb_raise(rb_eRuntimeError, "gdImageCreateTrueColor failed");
 
@@ -52,8 +58,11 @@ static VALUE gd_image_initialize_true_color(VALUE self, VALUE width, VALUE heigh
   }
 
   // Opcional: desactivar el fondo transparente si no lo necesitas
-  gdImageAlphaBlending(wrap->img, 1);
-  gdImageSaveAlpha(wrap->img, 0);
+  gdImageSaveAlpha(wrap->img, 1);
+  gdImageAlphaBlending(wrap->img, 0);
+  
+  int t = gdTrueColorAlpha(0,0,0,127);
+  gdImageFilledRectangle(wrap->img, 0,0, w-1, h-1, t);
 
   return self;
 }

data/ext/gd/pixel.c

@@ -4,35 +4,39 @@ static VALUE gd_image_set_pixel(VALUE self, VALUE x, VALUE y, VALUE color) {
   gd_image_wrapper *wrap;
   TypedData_Get_Struct(self, gd_image_wrapper, &gd_image_type, wrap);
 
-  int r = NUM2INT(rb_ary_entry(color,0));
-  int g = NUM2INT(rb_ary_entry(color,1));
-  int b = NUM2INT(rb_ary_entry(color,2));
-
-  int c = gdImageColorAllocate(wrap->img, r, g, b);
+  int c = color_to_gd(wrap->img, color);
 
   gdImageSetPixel(wrap->img, NUM2INT(x), NUM2INT(y), c);
 
   return Qnil;
 }
 
-static VALUE gd_image_get_pixel(VALUE self, VALUE x, VALUE y) {
+static VALUE gd_image_get_pixel(VALUE self, VALUE vx, VALUE vy) {
   gd_image_wrapper *wrap;
   TypedData_Get_Struct(self, gd_image_wrapper, &gd_image_type, wrap);
 
-  int c = gdImageGetPixel(wrap->img, NUM2INT(x), NUM2INT(y));
+  int x = NUM2INT(vx);
+  int y = NUM2INT(vy);
+
+  if (!wrap || !wrap->img) rb_raise(rb_eRuntimeError, "uninitialized GD::Image");
 
-  int r = gdImageRed(wrap->img, c);
-  int g = gdImageGreen(wrap->img, c);
-  int b = gdImageBlue(wrap->img, c);
+  int p = gdImageGetTrueColorPixel(wrap->img, x, y);
 
-  VALUE ary = rb_ary_new_capa(3);
+  int r = gdTrueColorGetRed(p);
+  int g = gdTrueColorGetGreen(p);
+  int b = gdTrueColorGetBlue(p);
+  int a = gdTrueColorGetAlpha(p);
+
+  VALUE ary = rb_ary_new_capa(4);
   rb_ary_push(ary, INT2NUM(r));
   rb_ary_push(ary, INT2NUM(g));
   rb_ary_push(ary, INT2NUM(b));
+  rb_ary_push(ary, INT2NUM(a));
 
   return ary;
 }
 
+
 void gd_define_pixel(VALUE cGDImage) {
   rb_define_method(cGDImage, "set_pixel", gd_image_set_pixel, 3);
   rb_define_method(cGDImage, "get_pixel", gd_image_get_pixel, 2);

data/ext/gd/rectangle.c

@@ -7,11 +7,7 @@ static VALUE gd_image_rect(VALUE self, VALUE x1, VALUE y1, VALUE x2, VALUE y2, V
   gd_image_wrapper *wrap;
   TypedData_Get_Struct(self, gd_image_wrapper, &gd_image_type, wrap);
 
-  int r = NUM2INT(rb_ary_entry(color, 0));
-  int g = NUM2INT(rb_ary_entry(color, 1));
-  int b = NUM2INT(rb_ary_entry(color, 2));
-
-  int c = gdImageColorAllocate(wrap->img, r, g, b);
+  int c = color_to_gd(wrap->img, color);
   gdImageRectangle(wrap->img,
                    NUM2INT(x1), NUM2INT(y1),
                    NUM2INT(x2), NUM2INT(y2),
@@ -23,11 +19,7 @@ static VALUE gd_image_filled_rect(VALUE self, VALUE x1, VALUE y1, VALUE x2, VALU
   gd_image_wrapper *wrap;
   TypedData_Get_Struct(self, gd_image_wrapper, &gd_image_type, wrap);
 
-  int r = NUM2INT(rb_ary_entry(color, 0));
-  int g = NUM2INT(rb_ary_entry(color, 1));
-  int b = NUM2INT(rb_ary_entry(color, 2));
-
-  int c = gdImageColorAllocate(wrap->img, r, g, b);
+  int c = color_to_gd(wrap->img, color);
   gdImageFilledRectangle(wrap->img,
                          NUM2INT(x1), NUM2INT(y1),
                          NUM2INT(x2), NUM2INT(y2),

data/ext/gd/text.c

@@ -19,11 +19,7 @@ static VALUE gd_image_text(VALUE self, VALUE text, VALUE opts) {
   if (NIL_P(x) || NIL_P(y) || NIL_P(size) || NIL_P(color) || NIL_P(font))
     rb_raise(rb_eArgError, "missing options");
 
-  int r = NUM2INT(rb_ary_entry(color,0));
-  int g = NUM2INT(rb_ary_entry(color,1));
-  int b = NUM2INT(rb_ary_entry(color,2));
-
-  int fg = gdImageColorAllocate(wrap->img, r, g, b);
+  int fg = color_to_gd(wrap->img, color);
 
   int brect[8];
   char *err = gdImageStringFT(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-libgd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Germán Alberto Giménez Silva
@@ -66,6 +66,7 @@ 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