gdk_pixbuf2 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0e18444ee5c0a6aa4e2bd625668b0b2904a8444
-  data.tar.gz: 6894e65834b0624b89e54cacc2ee9368b82944a1
+  metadata.gz: 703907114f5eacaca3578ef3be917cddf90724bf
+  data.tar.gz: 754f7ee7196d109a88c78d546aee27e15554f806
 SHA512:
-  metadata.gz: 262f535c393cf485565c388afa096f831aff9d39eac5ed4f0afabf8ec1f90c60ac504eb7333ea75f8ed214fe080892a921244ab5c14d4f24f0024eb048bb4465
-  data.tar.gz: a85711018d4690740a54dccc0bcada978791cb916b966578cc1e3de35dabc699416b15b46ff54368d44c0f1deee9dff710a5d12aae51664444f4a6272ee643d3
+  metadata.gz: 6d53df6a3f4ce451e0567e7abcd1eb1f173bd5d1198aeba98c29b5094c95b75048d6d958052d87448465f47e4856795376c3ecc680a7cac51e93e1090591f0e7
+  data.tar.gz: 74c95e217eb438f8ed94081d25b964f4c75a3dbd0d446a8f6fe7ae611c3bc09f8ef60c3cb3216bf2e9638bbc03d11ea07f04192e4fce5f339a24b22db6fd0127

data/Rakefile

@@ -36,7 +36,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "gdk-pixbuf",
       :download_site => :gnome,
       :label => "gdk-pixbuf",
-      :version => "2.36.0",
+      :version => "2.36.4",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

data/lib/gdk_pixbuf2/deprecated.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2016-2017  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -50,6 +50,8 @@ module GdkPixbuf
       end
     end
 
+    define_deprecated_method :save_to_buffer, :save
+
     define_deprecated_method_by_hash_args :composite,
                                           "dest_width, " +
                                             "dest_height, " +

data/lib/gdk_pixbuf2/pixbuf.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2016-2017  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -189,16 +189,70 @@ module GdkPixbuf
       dest
     end
 
-    # TODO: test
-    # TODO: Improve API by Hash
-    def save(filename, type, options={})
+    # @overload save(type, options={})
+    #
+    #   Save as `type` format.
+    #
+    #   @param type [String] The format to be saved. `"jpeg"`,
+    #     `"png"`, `"ico"` and `"bmp"` are available by default.
+    #
+    #   @param options [Hash<Symbol, String>] The options for
+    #     saving. Key-value pairs except `:filename` key are passed to
+    #     save logic. Available keys are depended on format. For
+    #     example, `:quality => "100"` is available in `"jpeg"`
+    #     format.
+    #   @option options [String] :filename The filename to be outputted.
+    #
+    #   @return [String, void] The saved data. If you specify
+    #     `:filename` option, it returns nothing.
+    #
+    # @overload save(filename, type, options={})
+    #
+    #   Save to `filename` as `type` format.
+    #
+    #   @return [void]
+    #
+    #   @deprecated since 3.1.1. Use `save(type, :filename =>
+    #     filename)` instead.
+    def save(*args)
+      case args.size
+      when 1
+        filename = nil
+        type, = args
+        options = {}
+      when 2
+        if args.last.is_a?(Hash)
+          type, options = args
+          if options.key?(:filename)
+            options = options.dup
+            filename = options.delete(:filename)
+          else
+            filename = nil
+          end
+        else
+          filename, type = args
+          options = {}
+        end
+      when 3
+        filename, type, options = args
+      else
+        message = "wrong number of arguments (given #{args.size}, expected 1..3)"
+        raise ArgumentError, message
+      end
+
       keys = []
       values = []
       options.each do |key, value|
+        key = key.to_s if key.is_a?(Symbol)
         keys << key
         values << value
       end
-      savev(filename, type, keys, values)
+      if filename
+        savev(filename, type, keys, values)
+      else
+        _, data = save_to_bufferv(type, keys, values)
+        data.pack("C*")
+      end
     end
 
     alias_method :scale_raw, :scale

data/test/gdk_pixbuf2-test-utils.rb

@@ -14,6 +14,8 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
+require "tempfile"
+
 require "test-unit"
 
 module GdkPixbufTestUtils
@@ -28,4 +30,13 @@ module GdkPixbufTestUtils
   def fixture_path(*components)
     File.join(File.dirname(__FILE__), "fixture", *components)
   end
+
+  def suppress_warning
+    verbose, $VERBOSE = $VERBOSE, nil
+    begin
+      yield
+    ensure
+      $VERBOSE = verbose
+    end
+  end
 end

data/test/test-pixbuf.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2016-2017  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -38,6 +38,12 @@ class TestPixbuf < Test::Unit::TestCase
     end
 
     sub_test_case("legacy form") do
+      setup do |&block|
+        suppress_warning do
+          block.call
+        end
+      end
+
       test "basic" do
         colorspace =  GdkPixbuf::Colorspace::RGB
         width = 100
@@ -158,19 +164,23 @@ class TestPixbuf < Test::Unit::TestCase
       end
 
       test "subpixbuf" do
-        src_pixbuf = GdkPixbuf::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
-        pixbuf = GdkPixbuf::Pixbuf.new(:src_pixbuf => src_pixbuf,
-                                       :src_x => 0,
-                                       :src_y => 0,
-                                       :width => 32,
-                                       :height => 32)
+        filename = fixture_path("gnome-logo-icon.png")
+        src_pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
+        pixbuf = suppress_warning do
+          GdkPixbuf::Pixbuf.new(:src_pixbuf => src_pixbuf,
+                                :src_x => 0,
+                                :src_y => 0,
+                                :width => 32,
+                                :height => 32)
+        end
         assert_equal(GdkPixbuf::Colorspace::RGB, pixbuf.colorspace)
         assert_equal(32, pixbuf.width)
         assert_equal(32, pixbuf.height)
       end
 
       test "data" do
-        src_pixbuf = GdkPixbuf::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
+        filename = fixture_path("gnome-logo-icon.png")
+        src_pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
         data = src_pixbuf.pixels.pack("C*")
         pixbuf = GdkPixbuf::Pixbuf.new(:data => data,
                                        :colorspace => src_pixbuf.colorspace,
@@ -185,7 +195,8 @@ class TestPixbuf < Test::Unit::TestCase
 
       test "bytes" do
         only_version(2, 32)
-        src_pixbuf = GdkPixbuf::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
+        filename = fixture_path("gnome-logo-icon.png")
+        src_pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
         bytes = src_pixbuf.pixels.flatten.pack("C*")
         pixbuf = GdkPixbuf::Pixbuf.new(:bytes => bytes,
                                        :colorspace => src_pixbuf.colorspace,
@@ -199,7 +210,8 @@ class TestPixbuf < Test::Unit::TestCase
       end
 
       test "resource" do
-        src_pixbuf = GdkPixbuf::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
+        filename = fixture_path("gnome-logo-icon.png")
+        src_pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
         resource = Gio::Resource.load(fixture_path("image.gresource"))
         Gio::Resources.register(resource)
         begin
@@ -238,7 +250,8 @@ class TestPixbuf < Test::Unit::TestCase
     end
 
     def test_new_subpixbuf
-      src_pixbuf = GdkPixbuf::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
+      filename = fixture_path("gnome-logo-icon.png")
+      src_pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
       pixbuf = src_pixbuf.new_subpixbuf(0, 0, 32, 32)
       assert_equal(GdkPixbuf::Colorspace::RGB, pixbuf.colorspace)
       assert_equal(32, pixbuf.width)
@@ -247,7 +260,8 @@ class TestPixbuf < Test::Unit::TestCase
   end
 
   def test_dup
-    pixbuf = GdkPixbuf::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
+    filename = fixture_path("gnome-logo-icon.png")
+    pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
     assert_equal(pixbuf.pixels, pixbuf.dup.pixels)
   end
 
@@ -260,7 +274,8 @@ class TestPixbuf < Test::Unit::TestCase
   end
 
   def test_rotate
-    pixbuf = GdkPixbuf::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
+    filename = fixture_path("gnome-logo-icon.png")
+    pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
     inverted_pixbuf = pixbuf.rotate(:upsidedown)
     assert_not_equal(pixbuf.pixels, inverted_pixbuf.pixels)
     inverted_twice_pixbuf = inverted_pixbuf.rotate(:upsidedown)
@@ -316,7 +331,8 @@ class TestPixbuf < Test::Unit::TestCase
     end
 
     test "no modifications" do
-      src_pixbuf = GdkPixbuf::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
+      filename = fixture_path("gnome-logo-icon.png")
+      src_pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
       pixbuf = src_pixbuf.saturate_and_pixelate(1, false)
       assert_equal(src_pixbuf.pixels, pixbuf.pixels)
     end
@@ -325,7 +341,8 @@ class TestPixbuf < Test::Unit::TestCase
       if /\Ai\d86-/ === RUBY_PLATFORM
         omit("floating point calculation result is different on i386")
       end
-      src_pixbuf = GdkPixbuf::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
+      filename = fixture_path("gnome-logo-icon.png")
+      src_pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
       pixbuf = src_pixbuf.saturate_and_pixelate(0, true)
       ref = saturate_and_pixelate_pixels(src_pixbuf, 0, true)
       assert_equal(ref, pixbuf.pixels, ref.size)
@@ -334,4 +351,33 @@ class TestPixbuf < Test::Unit::TestCase
       assert_equal(ref, pixbuf.pixels)
     end
   end
+
+  sub_test_case("#save") do
+    test("no options") do
+      png_filename = fixture_path("gnome-logo-icon.png")
+      pixbuf = GdkPixbuf::Pixbuf.new(:file => png_filename)
+      jpeg = pixbuf.save("jpeg")
+      assert_equal(["image/jpeg", false],
+                   Gio::ContentType.guess(nil, jpeg))
+    end
+
+    test(":filename") do
+      png_filename = fixture_path("gnome-logo-icon.png")
+      pixbuf = GdkPixbuf::Pixbuf.new(:file => png_filename)
+      output = Tempfile.new(["pixbuf", ".jpeg"])
+      pixbuf.save(output.path, "jpeg")
+      assert_equal(["image/jpeg", false],
+                   Gio::ContentType.guess(nil, output.read))
+    end
+  end
+
+  test("#save_to_buffer") do
+    png_filename = fixture_path("gnome-logo-icon.png")
+    pixbuf = GdkPixbuf::Pixbuf.new(:file => png_filename)
+    jpeg = suppress_warning do
+      pixbuf.save_to_buffer("jpeg")
+    end
+    assert_equal(["image/jpeg", false],
+                 Gio::ContentType.guess(nil, jpeg))
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gdk_pixbuf2
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-13 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gio2
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.1
 description: Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf-2.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf-2.x.