gdk_pixbuf2 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b92bfc517ef7d6262e5a24246bbd01d904a4e6d5
-  data.tar.gz: 56b50eb332261e736505b657fed6f388fc7133c0
+  metadata.gz: a91b55e9bbb505d1d8f5e48e90827d7f6f55601f
+  data.tar.gz: d41fbd88e2c340f0d03a413a342b3ac7e03229e0
 SHA512:
-  metadata.gz: a5e1725b0e6d082e1accb5a698511d45fc3041b232e4a3cd95005c621baa6bec9f6039e3d2e54953a64ae134185014e2d2cd336599abef6d9a1aa08b10ca5799
-  data.tar.gz: 24a63f85a753d2096b752e85d6bdcf32f8bfc3c52dc1fd9a93d3c1930b4ffcb12331544bd18c7d509b577c64c20eb1c5d90553329b7e94902136d89507ae1455
+  metadata.gz: 4bc4edb5416dc4c4ab09f4f41ce98ba49af8376c338d222991612f1b3612693dccea779e687e96ff74054d69678642116e7888efbe355cc8ad31f0939ff57f29
+  data.tar.gz: 68b50e48d6a2e178284b4aa386925fe0cb75ba2eb5962569e78547b3699d66e1621be7bd4cb37ebb8eeba22bb3eb7cfc2112cd3329847aae00dc7b067727da90

data/Rakefile

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2011-2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2016  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

data/lib/gdk_pixbuf2.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2016  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
@@ -14,80 +14,22 @@
 # 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 "glib2"
+require "gobject-introspection"
+require "gio2"
 
 base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path
 vendor_dir = base_dir + "vendor" + "local"
 vendor_bin_dir = vendor_dir + "bin"
 GLib.prepend_dll_path(vendor_bin_dir)
+vendor_girepository_dir = vendor_dir + "lib" + "girepository-1.0"
+GObjectIntrospection.prepend_typelib_path(vendor_girepository_dir)
 
-if vendor_dir.exist?
-  require "cairo"
-end
+require "gdk_pixbuf2/loader"
 
-begin
-  major, minor, _ = RUBY_VERSION.split(/\./)
-  require "#{major}.#{minor}/gdk_pixbuf2.so"
-rescue LoadError
-  require "gdk_pixbuf2.so"
-end
+module GdkPixbuf
+  LOG_DOMAIN = "GdkPixbuf"
+  GLib::Log.set_log_domain(LOG_DOMAIN)
 
-if vendor_dir.exist?
-  begin
-    require "gobject-introspection"
-    vendor_girepository_dir = vendor_dir + "lib" + "girepository-1.0"
-    GObjectIntrospection.prepend_typelib_path(vendor_girepository_dir)
-  rescue LoadError
-  end
+  loader = Loader.new(self)
+  loader.load("GdkPixbuf")
 end
-
-module Gdk
-  class PixbufLoader
-    def self.open(type = nil, mime_type = false)
-      loader = Gdk::PixbufLoader.new(type, mime_type)
-      if block_given?
-        begin
-          yield(loader)
-        ensure
-          loader.close
-        end
-      end
-      loader
-    end
-  end
-
-  class Pixbuf
-    LOG_DOMAIN = "GdkPixbuf"
-
-    class << self
-      def cairo_available?
-        if Gdk.respond_to?(:cairo_available?)
-          Gdk.cairo_available?
-        else
-          false
-        end
-      end
-    end
-
-    module Version
-      MAJOR = Gdk::Pixbuf::MAJOR
-      MINOR = Gdk::Pixbuf::MINOR
-      MICRO = Gdk::Pixbuf::MICRO
-      STRING = "#{MAJOR}.#{MINOR}.#{MICRO}"
-
-      class << self
-        def or_later?(major, minor, micro=nil)
-          micro ||= 0
-          version = [
-            MAJOR,
-            MINOR,
-            MICRO,
-          ]
-          (version <=> [major, minor, micro]) >= 0
-        end
-      end
-    end
-  end
-end
-
-GLib::Log.set_log_domain(Gdk::Pixbuf::LOG_DOMAIN)

data/lib/gdk_pixbuf2/deprecated.rb

@@ -0,0 +1,160 @@
+# Copyright (C) 2016  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module GdkPixbuf
+  class Pixbuf
+    extend GLib::Deprecatable
+
+    define_deprecated_enums "Colorspace", "COLORSPACE"
+    define_deprecated_enums "InterpType", "INTERP"
+    define_deprecated_enums "PixbufRotation", "ROTATE"
+
+    class << self
+      def new(*args, &block)
+        if args[0].is_a?(Pixbuf)
+          message = "#{caller[0]}: #{self}.new(pixbuf, ...) is deprecated. "
+          message << "Use pixbuf.new_subpixbuf(...)  instead."
+          warn(message)
+          args[0].new_subpixbuf(*args[1..-1])
+        elsif args.size == 1 and args[0].is_a?(Hash)
+          options = args[0]
+          src_pixbuf = options[:src_pixbuf]
+          if src_pixbuf
+            message = "#{caller[0]}: "
+            message << "#{self}.new(:src_pixbuf => pixbuf, ...) is deprecated. "
+            message << "Use pixbuf.new_subpixbuf(...)  instead."
+            warn(message)
+            src_pixbuf.new_subpixbuf(options[:src_x],
+                                     options[:src_y],
+                                     options[:width],
+                                     options[:height])
+          else
+            super
+          end
+        else
+          super
+        end
+      end
+    end
+
+    define_deprecated_method_by_hash_args :composite,
+                                          "dest_width, " +
+                                            "dest_height, " +
+                                            "interpolation_type, " +
+                                            "overall_alpha, " +
+                                            "check_size, " +
+                                            "color1, " +
+                                            "color2",
+                                          ":dest_width => dest_width, " +
+                                            ":dest_height => dest_height, " +
+                                            ":interpolation_type => interpolation_type, " +
+                                            ":overall_alpha => overall_alpha, " +
+                                            ":check_size => check_size, " +
+                                            ":color1 => color1, " +
+                                            ":color2 => color2" do |*args|
+      [
+        :dest_width => args[1],
+        :dest_height => args[2],
+        :interpolation_type => args[3],
+        :overall_alpha => args[4],
+        :check_size => args[5],
+        :color1 => args[6],
+        :color2 => args[7],
+      ]
+    end
+
+    define_deprecated_method_by_hash_args :composite!,
+                                          "source, " +
+                                            "dest_x, " +
+                                            "dest_y, " +
+                                            "dest_width, " +
+                                            "dest_height, " +
+                                            "offset_x, " +
+                                            "offset_y, " +
+                                            "scale_x, " +
+                                            "scale_y, " +
+                                            "interpolation_type, " +
+                                            "overall_alpha, " +
+                                            "check_x=0, " +
+                                            "check_y=0, " +
+                                            "check_size=nil, " +
+                                            "color1=0x999999, " +
+                                            "color2=0xdddddd",
+                                          "source, " +
+                                            ":dest_x => dest_x, " +
+                                            ":dest_y => dest_y, " +
+                                            ":dest_width => dest_width, " +
+                                            ":dest_height => dest_height, " +
+                                            ":offset_x => offset_x, " +
+                                            ":offset_y => offset_y, " +
+                                            ":scale_x => scale_x, " +
+                                            ":scale_y => scale_y, " +
+                                            ":interpolation_type => interpolation_type, " +
+                                            ":overall_alpha => overall_alpha, " +
+                                            ":check_x => check_x, " +
+                                            ":check_y => check_y, " +
+                                            ":check_size => check_size, " +
+                                            ":color1 => color1, " +
+                                            ":color2 => color2",
+                                          1 do |*args|
+      [
+        args[1],
+        :dest_x => args[2],
+        :dest_y => args[3],
+        :dest_width => args[4],
+        :dest_height => args[5],
+        :offset_x => args[6],
+        :offset_y => args[7],
+        :scale_x => args[8],
+        :scale_y => args[9],
+        :interpolation_type => args[10],
+        :overall_alpha => args[11],
+        :check_x => args[12],
+        :check_y => args[13],
+        :check_size => args[14],
+        :color1 => args[15],
+        :color2 => args[16],
+      ]
+    end
+  end
+
+  class PixbufFormat
+    extend GLib::Deprecatable
+
+    define_deprecated_method "domain", :raise => "Don't use this method anymore."
+    define_deprecated_method "signature", :raise => "Don't use this method anymore."
+  end
+
+  class Pixdata
+    extend GLib::Deprecatable
+
+    unless respond_to?(:from_pixbuf)
+      define_deprecated_singleton_method :from_pixbuf,
+                                         :raise => "Use Gio::Resource instead"
+    end
+  end
+end
+
+module Gdk
+  extend GLib::Deprecatable
+
+  define_deprecated_const :Pixbuf, "GdkPixbuf::Pixbuf"
+  define_deprecated_const :PixbufAnimation, "GdkPixbuf::PixbufAnimation"
+  define_deprecated_const :PixbufLoader, "GdkPixbuf::PixbufLoader"
+  define_deprecated_const :PixbufSimpleAnim, "GdkPixbuf::PixbufSimpleAnim"
+  define_deprecated_const :Pixdata, "GdkPixbuf::Pixdata"
+  define_deprecated_const :PixbufError, "GdkPixbuf::PixbufError"
+end

data/lib/gdk_pixbuf2/loader.rb

@@ -0,0 +1,51 @@
+# Copyright (C) 2016  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# 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 "English"
+
+module GdkPixbuf
+  class Loader < GObjectIntrospection::Loader
+    private
+    def pre_load(repository, namespace)
+    end
+
+    def post_load(repository, namespace)
+      require_libraries
+    end
+
+    def require_libraries
+      require "gdk_pixbuf2/pixbuf"
+      require "gdk_pixbuf2/pixbuf-loader"
+
+      require "gdk_pixbuf2/deprecated"
+
+      require "gdk_pixbuf2/version"
+    end
+
+    def initialize_post(object)
+      super
+      return unless object.is_a?(GLib::Object)
+      self.class.reference_gobject(object, :sink => true)
+    end
+
+    def define_constant(name, info)
+      if /PIXBUF_/ =~ name
+        name = $POSTMATCH
+      end
+      super(name, info)
+    end
+  end
+end

data/lib/gdk_pixbuf2/pixbuf-loader.rb

@@ -0,0 +1,24 @@
+# Copyright (C) 2016  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module GdkPixbuf
+  class PixbufLoader
+    def last_write(data)
+      write(data)
+      close
+    end
+  end
+end

data/lib/gdk_pixbuf2/pixbuf.rb

@@ -0,0 +1,282 @@
+# Copyright (C) 2016  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module GdkPixbuf
+  class Pixbuf
+    alias_method :initialize_raw, :initialize
+
+    def initialize(*args)
+      case args.size
+      when 1
+        case args[0]
+        when Hash
+          initialize_with_hash(args[0])
+        when String
+          message = "#{caller[0]}: #{self.class}.new(path) is deprecated. "
+          message << "Use #{self.class}.new(:file => path) instead."
+          warn message
+          initialize_raw(args[0])
+        when Array
+          message = "#{caller[0]}: #{self.class}.new(xpm) is deprecated. "
+          message << "Use #{self.class}.new(:xpm => xpm) instead."
+          warn message
+          initialize_new_from_xpm_data(args[0])
+        else
+          raise ArgumentError, "must be options: #{args[0].inspect}"
+        end
+      when 2
+        message = "#{caller[0]}: "
+        message << "#{self.class}.new(data, copy_pixels) is deprecated. "
+        message << "Use Gio::Resource instead."
+        warn message
+        initialize_from_inline(*args)
+      when 3
+        message = "#{caller[0]}: "
+        message << "#{self.class}.new(path, width, height) is deprecated. "
+        message << "Use #{self.class}.new(:file => path, :width => width, "
+        message << ":height => height) instead."
+        warn message
+        initialize_new_from_file_at_size(*args)
+      when 4
+        message = "#{caller[0]}: "
+        message << "#{self.class}.new(path, width, height, "
+        message << "preserve_aspect_ratio) is deprecated. "
+        message << "Use #{self.class}.new(:file => path, :width => width, "
+        message << ":height => height, "
+        message << ":preserve_aspect_ratio => preserve_aspect_ratio) instead."
+        warn message
+        initialize_new_from_file_at_scale(*args)
+      when 5
+        message = "#{caller[0]}: "
+        message << "#{self.class}.new(colorspace, has_alpha, bits_per_sample, "
+        message << "width, height) is deprecated."
+        message << "Use #{self.class}.new(:colorspace => colorspace, "
+        message << ":has_alpha => has_alpha, "
+        message << ":bits_per_sample => bits_per_sample, "
+        message << ":width => width, "
+        message << ":height => height) instead."
+        warn message
+        initialize_new(*args)
+      when 7
+        message = "#{caller[0]}: "
+        message << "#{self.class}.new(data, colorspace, has_alpha, "
+        message << "bits_per_sample, width, height) is deprecated."
+        message << "Use #{self.class}.new(:data => data, "
+        message << ":colorspace => colorspace, "
+        message << ":has_alpha => has_alpha, "
+        message << ":bits_per_sample => bits_per_sample, "
+        message << ":width => width, "
+        message << ":height => height) instead."
+        warn message
+        initialize_new_from_data(*args)
+      else
+        super
+      end
+    end
+
+    def initialize_with_hash(options)
+      colorspace = options[:colorspace] || GdkPixbuf::Colorspace::RGB
+      has_alpha = options[:has_alpha]
+      has_alpha = false if has_alpha.nil?
+      bits_per_sample = options[:bits_per_sample] || 8
+      row_stride = options[:row_stride] || 0
+      data = options[:data] || nil
+      bytes = options[:bytes] || nil
+      xpm = options[:xpm] || nil
+      file = options[:file] || nil
+      # stream = options[:stream] || nil
+      resource = options[:resource] || nil
+      width = options[:width] || nil
+      height = options[:height] || nil
+      size = true if width && height
+      scale = options[:scale] || nil
+      preserve_aspect_ratio = options[:preserve_aspect_ratio]
+      preserve_aspect_ratio = true if preserve_aspect_ratio.nil?
+
+      if file && size && scale
+        initialize_new_from_file_at_scale(file, width, height,
+                                          preserve_aspect_ratio)
+      elsif file && size && !scale
+        initialize_new_from_file_at_size(file, width, height)
+      elsif file && !size
+        initialize_new_from_file(file)
+      elsif resource && size && scale
+        initialize_new_from_resource_at_scale(resource, width, height,
+                                              preserve_aspect_ratio)
+      elsif resource && !scale
+        initialize_new_from_resource(resource)
+      elsif data && size
+        initialize_new_from_data(data, colorspace, has_alpha, bits_per_sample,
+                                 width, height, row_stride)
+      elsif bytes && size
+         initialize_new_from_bytes(bytes, colorspace, has_alpha, bits_per_sample,
+                                   width, height, row_stride)
+
+      elsif xpm
+        initialize_new_from_xpm_data(xpm)
+      elsif size
+        initialize_raw(colorspace, has_alpha, bits_per_sample, width, height)
+      else
+        message =
+          "must specify :file, :resource, :data, :bytes, :xpm, :width or :height"
+        raise ArgumentError, message
+      end
+      # https://developer.gnome.org/gdk-pixbuf/2.33/gdk-pixbuf-Image-Data-in-Memory.html
+      #	gdk_pixbuf_new                                  done
+      #	gdk_pixbuf_new_from_bytes                       done
+      #	gdk_pixbuf_new_from_data                        done
+      #	gdk_pixbuf_new_from_xpm_data                    done
+      #	gdk_pixbuf_new_subpixbuf
+      #	https://developer.gnome.org/gdk-pixbuf/2.33/gdk-pixbuf-File-Loading.html
+      #	gdk_pixbuf_new_from_file                        done
+      # gdk_pixbuf_new_from_file_at_size                done
+      #	gdk_pixbuf_new_from_file_at_scale               done
+      #	gdk_pixbuf_get_file_info
+      #	gdk_pixbuf_get_file_info_async
+      # gdk_pixbuf_get_file_info_finish
+      #	gdk_pixbuf_new_from_resource                    done
+      #	gdk_pixbuf_new_from_resource_at_scale           done
+      #	gdk_pixbuf_new_from_stream
+      # gdk_pixbuf_new_from_stream_async
+      #	gdk_pixbuf_new_from_stream_finish
+      #	gdk_pixbuf_new_from_stream_at_scale
+      #	gdk_pixbuf_new_from_stream_at_scale_async
+    end
+    private :initialize_with_hash
+
+    def dup
+      copy
+    end
+
+    def fill!(pixel)
+      fill(pixel)
+    end
+
+    def rotate(angle)
+      rotate_simple(angle)
+    end
+
+    alias_method :saturate_and_pixelate_raw, :saturate_and_pixelate
+    def saturate_and_pixelate(saturation, pixelate)
+      dest = dup
+      saturate_and_pixelate_raw(dest, saturation, pixelate)
+      dest
+    end
+
+    # TODO: test
+    # TODO: Improve API by Hash
+    def save(filename, type, options={})
+      keys = []
+      values = []
+      options.each do |key, value|
+        keys << key
+        values << value
+      end
+      savev(filename, type, keys, values)
+    end
+
+    alias_method :scale_raw, :scale
+    # TODO: test
+    # TODO: Improve API by Hash
+    def scale(*args)
+      case args.size
+      when 2, 3
+        width, height, interp_type = args
+        interp_type ||= :bilinear
+        scale_simple(width, height, interp_type)
+      else
+        scale_raw(*args)
+      end
+    end
+
+    # TODO: test
+    # TODO: Improve API by Hash
+    def scale!(source, *args)
+      if args.size == 8
+        args << :bilinear
+      end
+      source.scale_raw(self, *args)
+    end
+
+    alias_method :composite_raw, :composite
+    def composite(options)
+      destination = options[:destination] || options[:dest]
+      dest_x = options[:destination_x] || options[:dest_x] || 0
+      dest_y = options[:destination_y] || options[:dest_y] || 0
+      dest_width = options[:destination_width] || options[:dest_width]
+      dest_height = options[:destination_height] || options[:dest_height]
+
+      destination ||= Pixbuf.new(colorspace,
+                                 has_alpha?,
+                                 bits_per_sample,
+                                 dest_x + dest_width,
+                                 dest_y + dest_height)
+      destination.composite!(self, options)
+      destination
+    end
+
+    def composite!(source, options)
+      dest_x = options[:destination_x] || options[:dest_x] || 0
+      dest_y = options[:destination_y] || options[:dest_y] || 0
+      dest_width = options[:destination_width] || options[:dest_width]
+      dest_height = options[:destination_height] || options[:dest_height]
+      offset_x = options[:offset_x] || 0.0
+      offset_y = options[:offset_y] || 0.0
+      scale_x = options[:scale_x] || (dest_width / source.width.to_f)
+      scale_y = options[:scale_y] || (dest_height / source.height.to_f)
+      interpolation_type = options[:interpolation_type] ||
+        options[:interp_type] ||
+        :bilinear
+      overall_alpha = options[:overall_alpha] || 255
+      check_x = options[:check_x] || 0
+      check_y = options[:check_y] || 0
+      check_size = options[:check_size]
+      color1 = options[:color1] || 0x999999
+      color2 = options[:color2] || 0xdddddd
+
+      if check_size
+        source.composite_color(self,
+                               dest_x,
+                               dest_y,
+                               dest_width,
+                               dest_height,
+                               offset_x,
+                               offset_y,
+                               scale_x,
+                               scale_y,
+                               interpolation_type,
+                               overall_alpha,
+                               check_x,
+                               check_y,
+                               check_size,
+                               color1,
+                               color2)
+      else
+        source.composite_raw(self,
+                             dest_x,
+                             dest_y,
+                             dest_width,
+                             dest_height,
+                             offset_x,
+                             offset_y,
+                             scale_x,
+                             scale_y,
+                             interpolation_type,
+                             overall_alpha)
+      end
+    end
+  end
+end