tinyimg 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 974d95b03df2d7a90c238049b4083912464b8616
-  data.tar.gz: ee647517f46360743859de3c5aca8b02be3ee59c
+  metadata.gz: d6c767cf7d39a737f942dc653bed088967678c01
+  data.tar.gz: 872f0520067cb5ff2d529f3d5595a5f48771e578
 SHA512:
-  metadata.gz: fe80301f446341e671ec3d116f912fea97744817c1ddf4d9923b7c95e50c32d5df3b1e9dde81da975e318b1de49042ee516f37adce89b15eb7a89b518c9bf31e
-  data.tar.gz: 4fffdcd8475a7f547ec3fdd1d9856ce078cbbda8920f2ac357237e6f750ca9c6488e52056c7727eb2a5c1cc33c6b628d50806ffe5083334ad2606c9a13220e26
+  metadata.gz: ebdfdef6986a4d77a18d62de00d391751d78c51530d86bf63f6f69c66574c45ad82d1b1df603add2375168f12ae02f4d954217083f4111593c4cea0bf1f922bf
+  data.tar.gz: 53babb3f77c2c543d48f5c6bb24cbf9a058ec598fc56075d5afdae04417e0ab49adcbba1980ba07a938cf4aae98c3aa239004a95970e0c8362fcb6ff050dd7f3

data/README.md

@@ -55,6 +55,14 @@ image.crop!(x: 20, y: 20, width: 50, height: 50)
 image.crop!(width: image.height)
 ```
 
+Set the transparent color of your PNG image if you're about to save it to a JPEG, as JPEG doesn't support
+transparency:
+
+```ruby
+# Make the transparent color red
+image.fill_transparent_color!(255, 0, 0)
+```
+
 Then get an image back:
 
 ```ruby
@@ -71,17 +79,18 @@ image.height      # => 80
 image.dimensions  # => [120, 80]
 ```
 
-You can also use the non-! versions of the operation methods: `resize_exact`, `resize`, `resize_to_fit`, `resize_to_fill` and `crop`.
-These create a new image in memory and return it, leaving the old image untouched.  This is useful if you want
+You can also use the non-! versions of the operation methods: `resize_exact`, `resize`, `resize_to_fit`, `resize_to_fill`, `crop`
+and `fill_transparent_color`.  These create a new image in memory and return it, leaving the old image untouched.  This is useful if you want
 to resize an original image to multiple sizes.  Using these methods will take more memory.
 
 ## Examples
 
-Take an uploaded file that's a PNG or JPEG, save the original as a JPEG, then resize to create a thumbnail and save that too:
+Take an uploaded file that's a PNG or JPEG, make the transparent color white, save the original as a JPEG, then resize to create a thumbnail and save that too:
 
 ```ruby
 Tinyimg
   .from_io(params[:uploaded_file])
+  .fill_transparent_color!(255, 255, 255)
   .save("#{path}/full_size.jpg")
   .resize_to_fit!(100, 100)
   .save("#{path}/thumbnail.jpg")
@@ -96,4 +105,4 @@ user.update!(thumbnail_image: data)
 
 ## Author and licence
 
-Copyright 2015 Roger Nesbitt.  Licenced under the MIT licence.
+Copyright 2015-2016 Roger Nesbitt.  Licenced under the MIT licence.

data/ext/tinyimg/tinyimg.c

@@ -240,6 +240,40 @@ VALUE resize_exact_bang(VALUE self, VALUE width_value, VALUE height_value)
   return self;
 }
 
+VALUE fill_transparent_color_bang(VALUE self, VALUE red_value, VALUE green_value, VALUE blue_value)
+{
+  gdImagePtr image_in, image_out;
+  int red, green, blue;
+  int color;
+
+  Check_Type(red_value, T_FIXNUM);
+  Check_Type(green_value, T_FIXNUM);
+  Check_Type(blue_value, T_FIXNUM);
+
+  red = FIX2INT(red_value);
+  green = FIX2INT(green_value);
+  blue = FIX2INT(blue_value);
+
+  if (red < 0 || green < 0 || blue < 0 || red > 255 || green > 255 || blue > 255) {
+    rb_raise(get_error_class(self), "red, green and blue must be integers between 0 and 255");
+  }
+
+  image_in = get_image_data(self);
+  image_out = gdImageCreateTrueColor(gdImageSX(image_in), gdImageSY(image_in));
+
+  color = gdImageColorAllocate(image_out, red, green, blue);
+  gdImageFilledRectangle(image_out, 0, 0, gdImageSX(image_in), gdImageSY(image_in), color);
+
+  gdImageCopy(
+      image_out, image_in, 0, 0, 0, 0,
+      gdImageSX(image_in), gdImageSY(image_in)
+  );
+
+  set_image_data(self, image_out);
+
+  return self;
+}
+
 VALUE internal_crop_bang(VALUE self, VALUE x_value, VALUE y_value, VALUE width_value, VALUE height_value)
 {
   gdImagePtr image_in, image_out;
@@ -292,6 +326,7 @@ void Init_tinyimg()
   rb_define_class_under(cTinyimg, "Error", rb_const_get(rb_cObject, rb_intern("StandardError")));
 
   rb_define_method(cTinyimg, "resize_exact!", resize_exact_bang, 2);
+  rb_define_method(cTinyimg, "fill_transparent_color!", fill_transparent_color_bang, 3);
   rb_define_method(cTinyimg, "to_jpeg", to_jpeg, -1);
   rb_define_method(cTinyimg, "to_png", to_png, -1);
   rb_define_private_method(cTinyimg, "initialize_copy", initialize_copy, -1);

data/lib/tinyimg.rb

@@ -76,6 +76,14 @@ class Tinyimg
     internal_crop!(x, y, width, height)
   end
 
+  # Implemented in C
+  # def fill_transparent_color!(red, green, blue)
+  # end
+
+  def fill_transparent_color(red, green, blue)
+    dup.fill_transparent_color!(red, green, blue)
+  end
+
   def save(filename)
     if respond_to?(:save_to_file)
       save_to_file(filename)

data/spec/tinyimg_spec.rb

@@ -159,6 +159,20 @@ RSpec.describe Tinyimg do
     end
   end
 
+  describe "#fill_transparent_color" do
+    it "returns an image of the same size without crashing (we can't test this easily)" do
+      result = sample.fill_transparent_color(255, 0, 0)
+      expect(result.dimensions).to eq [200, 153]
+    end
+  end
+
+  describe "#fill_transparent_color!" do
+    it "returns an image of the same size without crashing (we can't test this easily)" do
+      sample.fill_transparent_color!(255, 0, 0)
+      expect(sample.dimensions).to eq [200, 153]
+    end
+  end
+
   describe "#save" do
     it "saves a JPEG" do
       begin

data/tinyimg.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name = 'tinyimg'
-  gem.version = '0.1.2'
+  gem.version = '0.1.3'
   gem.summary = "Tiny and fast JPEG/PNG cropping and resizing"
   gem.description = "Convert between JPEG/PNG, crop and resize images, either all in memory or via disk.  Only requires libgd to function."
   gem.has_rdoc = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinyimg
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Roger Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Tiny and fast JPEG/PNG cropping and resizing