gdk_pixbuf2 3.0.8 → 3.0.9

data/lib/gdk_pixbuf2/version.rb

@@ -0,0 +1,33 @@
+# 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
+  module Version
+    STRING = [MAJOR, MINOR, MICRO].join(".")
+
+    class << self
+      def or_later?(major, minor, micro=nil)
+        micro ||= 0
+        version = [
+          MAJOR,
+          MINOR,
+          MICRO,
+        ]
+        (version <=> [major, minor, micro]) >= 0
+      end
+    end
+  end
+end

data/sample/anim.rb

@@ -2,7 +2,7 @@
 =begin
   anim.rb - Ruby/GdkPixbuf sample script.
 
-  Copyright (c) 2002-2006 Ruby-GNOME2 Project Team
+  Copyright (c) 2002-2016 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
 
   $Id: anim.rb,v 1.5 2006/06/17 14:38:08 mutoh Exp $
@@ -16,7 +16,7 @@ w.signal_connect('delete-event') do
 end
 
 box = Gtk::VBox.new
-src =  Gdk::PixbufAnimation.new("floppybuddy.gif")
+src =  GdkPixbuf::PixbufAnimation.new(File.join(__dir__, "floppybuddy.gif"))
 box.pack_start(Gtk::Image.new(src))
 p src.width
 p src.height

data/sample/composite.rb

@@ -2,7 +2,7 @@
 =begin
   composite.rb - Ruby/GdkPixbuf sample script.
 
-  Copyright (c) 2002-2006 Ruby-GNOME2 Project Team
+  Copyright (c) 2002-2016 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
 
   $Id: composite.rb,v 1.6 2006/06/17 14:38:08 mutoh Exp $
@@ -16,23 +16,53 @@ unless filename
   exit(1)
 end
 
-src =  Gdk::Pixbuf.new(filename)
+src =  GdkPixbuf::Pixbuf.new(:file => filename)
 
 vbox = Gtk::VBox.new
 
-dst = src.composite(100, 100, Gdk::Pixbuf::INTERP_HYPER,
-		200, 32, 0xFF0000, 0x00FF00)
+dst = src.composite(:dest_width  => 100,
+                    :dest_height => 100,
+                    :interp_type => :hyper,
+                    :overall_alpha => 255,
+                    :check_size => 32,
+                    :color1 => 0xFF0000,
+                    :color2 => 0x00FF00)
 vbox.pack_start(Gtk::Image.new(dst))
 
-dst = Gdk::Pixbuf.new(Gdk::Pixbuf::COLORSPACE_RGB, true, 8, 200, 200)
-dst.composite!(src, 0, 0, 200, 200, 0, 0, 1.8, 1.8,
-              Gdk::Pixbuf::INTERP_HYPER, 200)
+dst = GdkPixbuf::Pixbuf.new(:colorspace => :rgb,
+                            :has_alpha => true,
+                            :bits_per_sample => 8,
+                            :width =>200,
+                            :height => 200)
+dst.composite!(src,
+               :dest_width => 200,
+               :dest_height => 200,
+               :scale_x => 1.8,
+               :scale_y => 1.8,
+               :interp_type => :hyper,
+               :overall_alpha => 200)
 vbox.pack_start(Gtk::Image.new(dst))
 
-dst = Gdk::Pixbuf.new(Gdk::Pixbuf::COLORSPACE_RGB, true, 8, 200, 200)
-dst.composite!(src, 10, 10, 180, 180, 15, 15, 3, 2, 
-              Gdk::Pixbuf::INTERP_BILINEAR, 200, 100, 100, 16, 
-              0x999999, 0xdddddd)
+dst = GdkPixbuf::Pixbuf.new(:colorspace => :rgb,
+                            :has_alpha => true,
+                            :bits_per_sample => 8,
+                            :width =>200,
+                            :height => 200)
+dst.composite!(src,
+               :dest_x => 10,
+               :dest_y => 10,
+               :dest_width => 180,
+               :dest_height => 180,
+               :offset_x => 15,
+               :offset_y => 15,
+               :scale_x => 3,
+               :scale_y => 2,
+               :overall_alpha => 200,
+               :check_x => 100,
+               :check_y => 100,
+               :check_size => 16,
+               :color1 => 0x999999,
+               :color2 => 0xdddddd)
 vbox.pack_start(Gtk::Image.new(dst))
 
 window = Gtk::Window.new.add(vbox)

data/sample/flip.rb

@@ -2,7 +2,7 @@
 =begin
   flip.rb - Ruby/GdkPixbuf sample script.
 
-  Copyright (c) 2005,2006 Ruby-GNOME2 Project Team
+  Copyright (c) 2005-2016 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
 
   $Id: flip.rb,v 1.3 2006/06/17 14:38:08 mutoh Exp $
@@ -25,7 +25,7 @@ end
 
 vbox = Gtk::VBox.new
 
-src =  Gdk::Pixbuf.new(filename)
+src =  GdkPixbuf::Pixbuf.new(:file => filename)
 vbox.add(Gtk::Image.new(src))
 
 # Horizontal

data/sample/format.rb

@@ -2,7 +2,7 @@
 =begin
   format.rb - Ruby/GdkPixbuf sample script.
 
-  Copyright (c) 2004-2006 Ruby-GNOME2 Project Team
+  Copyright (c) 2004-2016 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
 
   $Id: format.rb,v 1.4 2006/06/17 14:38:08 mutoh Exp $
@@ -22,14 +22,12 @@ unless filename
   exit(1)
 end
 
-puts fileinfo = Gdk::Pixbuf.get_file_info(filename)[0]
+puts fileinfo = GdkPixbuf::Pixbuf.get_file_info(filename)[0]
 puts "name = #{fileinfo.name}"
 puts "description = #{fileinfo.description}"
 puts "mime_types = #{fileinfo.mime_types.inspect}"
 puts "extensions = #{fileinfo.extensions.inspect}"
 puts "writable = #{fileinfo.writable?}"
-puts "domain = #{fileinfo.domain}"
-puts "signature = #{fileinfo.signature.inspect}"
 
 if Gtk.check_version?(2, 6, 0)
   puts "Since 2.6 --- "

data/sample/loader.rb

@@ -2,15 +2,15 @@
 =begin
   loader.rb - Ruby/GdkPixbuf sample script.
 
-  Copyright (c) 2003,2006: Ruby-GNOME2 Project Team
+  Copyright (c) 2003-2016: Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
 
   $Id: loader.rb,v 1.3 2006/06/17 14:38:08 mutoh Exp $
 =end
 require 'gtk2'
 
-loader = Gdk::PixbufLoader.new
-File.open("gnome-foot.png","rb") { |f|
+loader = GdkPixbuf::PixbufLoader.new
+File.open(File.join(__dir__, "gnome-foot.png"), "rb") { |f|
   loader.last_write(f.read)
 }
 pixbuf = loader.pixbuf

data/sample/rotate.rb

@@ -2,7 +2,7 @@
 =begin
   rotate.rb - Ruby/GdkPixbuf sample script.
 
-  Copyright (c) 2005,2006 Ruby-GNOME2 Project Team
+  Copyright (c) 2005-2016 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
 
   $Id: rotate.rb,v 1.3 2006/06/17 14:38:08 mutoh Exp $
@@ -25,13 +25,13 @@ end
 
 vbox = Gtk::VBox.new
 
-src =  Gdk::Pixbuf.new(filename)
+src =  GdkPixbuf::Pixbuf.new(:file => filename)
 vbox.add(Gtk::Image.new(src))
 
-dst = src.rotate(Gdk::Pixbuf::ROTATE_COUNTERCLOCKWISE)
+dst = src.rotate(:counterclockwise)
 vbox.add(Gtk::Image.new(dst))
 
-dst2 = src.rotate(Gdk::Pixbuf::ROTATE_UPSIDEDOWN)
+dst2 = src.rotate(:upsidedown)
 vbox.add(Gtk::Image.new(dst2))
 
 window = Gtk::Window.new

data/sample/save.rb

@@ -2,7 +2,7 @@
 =begin
   save.rb - Ruby/GdkPixbuf sample script.
 
-  Copyright (c) 2002-2006 Ruby-GNOME2 Project Team
+  Copyright (c) 2002-2016 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
 
   $Id: save.rb,v 1.5 2006/06/17 14:38:08 mutoh Exp $
@@ -17,9 +17,9 @@ if ! from or ! to
   exit(1)
 end
 
-src =  Gdk::Pixbuf.new(from)
+src =  GdkPixbuf::Pixbuf.new(from)
 
-dst = src.scale(300, 300, Gdk::Pixbuf::INTERP_HYPER)
+dst = src.scale(300, 300, :hyper)
 # This doesn't work ....
 #dst.save(to, "jpeg", {:quality => 100})
 dst.save(to, "png")

data/sample/scale.rb

@@ -2,7 +2,7 @@
 =begin
   scale.rb - Ruby/GdkPixbuf sample script.
 
-  Copyright (c) 2002-2006 Ruby-GNOME2 Project Team
+  Copyright (c) 2002-2016 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
 
   $Id: scale.rb,v 1.10 2006/06/17 14:38:08 mutoh Exp $
@@ -18,20 +18,28 @@ end
 
 vbox = Gtk::VBox.new
 
-src =  Gdk::Pixbuf.new(filename)
+src =  GdkPixbuf::Pixbuf.new(:file => filename)
 vbox.add(Gtk::Image.new(src))
 
-dst = src.scale(200, 200, Gdk::Pixbuf::INTERP_NEAREST)
+dst = src.scale(200, 200, :nearest)
 dst.scale!(src, 60, 60, 90, 90, -50, 50, 6, 3)
 vbox.add(Gtk::Image.new(dst))
 
-dst2 = Gdk::Pixbuf.new(Gdk::Pixbuf::COLORSPACE_RGB, true, 8, 200, 200)
+dst2 = GdkPixbuf::Pixbuf.new(:colorspace => :rgb,
+                             :has_alpha =>true,
+                             :bits_per_sample => 8,
+                             :width => 200,
+                             :height => 200)
 dst2.scale!(src, 0, 0, 100, 100, 0, 0, 1.5, 1.5)
 
 vbox.add(Gtk::Image.new(dst2))
 
-dst3 = Gdk::Pixbuf.new(Gdk::Pixbuf::COLORSPACE_RGB, true, 8, 200, 200)
-dst3.scale!(src, 0, 0, 200, 200, 0, 0, 5, 3,  Gdk::Pixbuf::INTERP_HYPER)
+dst3 = GdkPixbuf::Pixbuf.new(:colorspace => :rgb,
+                             :has_alpha =>true,
+                             :bits_per_sample => 8,
+                             :width => 200,
+                             :height => 200)
+dst3.scale!(src, 0, 0, 200, 200, 0, 0, 5, 3, :hyper)
 vbox.add(Gtk::Image.new(dst3))
 
 window = Gtk::Window.new

data/sample/simpleanim.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 =begin
   simpleanim.rb - Ruby/GdkPixbuf sample script for Gdk::PixbufSimpleAnim.
-  
+
   Inspired by http://mail.gnome.org/archives/gtk-perl-list/2005-September/msg00110.html
 
-  Copyright (c) 2002-2006 Ruby-GNOME2 Project Team
+  Copyright (c) 2002-2016 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
 
   $Id: simpleanim.rb,v 1.2 2006/06/17 14:38:08 mutoh Exp $
@@ -14,13 +14,19 @@ require 'gtk2'
 
 $stdout.sync = true
 
-simple_anim = Gdk::PixbufSimpleAnim.new(64, 64, 24)
+simple_anim = GdkPixbuf::PixbufSimpleAnim.new(64, 64, 24)
 store_pixels = []
 
 print 'generating frames'
 for red in 0 .. 126
     store_pixels << pixels = ([ 4*(63-red).abs, 0, 0 ] * (64*64)).pack('C*')
-    pixbuf = Gdk::Pixbuf.new(pixels, Gdk::Pixbuf::COLORSPACE_RGB, false, 8, 64, 64, 64*3)
+    pixbuf = GdkPixbuf::Pixbuf.new(:data => pixels,
+                                   :colorspace => :rgb,
+                                   :has_alpha =>false,
+                                   :bits_per_sample => 8,
+                                   :width => 64,
+                                   :height => 64,
+                                   :row_stride => 64*3)
     simple_anim.add_frame(pixbuf)
     print '.'
 end

data/sample/utils.rb

@@ -2,7 +2,7 @@
 =begin
   utils.rb - Ruby/GdkPixbuf sample script.
 
-  Copyright (c) 2002-2006 Ruby-GNOME2 Project Team
+  Copyright (c) 2002-2016 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
 
   $Id: utils.rb,v 1.4 2006/06/17 14:38:08 mutoh Exp $
@@ -16,15 +16,18 @@ unless filename
   exit(1)
 end
 
-src =  Gdk::Pixbuf.new(filename)
+src =  GdkPixbuf::Pixbuf.new(:file => filename)
 
 vbox = Gtk::VBox.new
 
 dst = src.add_alpha(true, 0, 0, 0)
 vbox.pack_start(Gtk::Image.new(dst))
 
-dst = Gdk::Pixbuf.new(Gdk::Pixbuf::COLORSPACE_RGB, true, 8, 
-                      src.width + 20, src.height + 30)
+dst = GdkPixbuf::Pixbuf.new(:colorspace => :rgb,
+                            :has_alpha => true,
+                            :bits_per_sample => 8, 
+                            :width => src.width + 20,
+                            :height => src.height + 30)
 src.copy_area(0, 0, src.width / 2, src.height / 2, dst, 10, 20)
 vbox.pack_start(Gtk::Image.new(dst))
 

data/sample/xpm.rb

@@ -2,7 +2,7 @@
 =begin
   xpm.rb - Ruby/GdkPixbuf sample script.
 
-  Copyright (c) 2002-2006 Ruby-GNOME2 Project Team
+  Copyright (c) 2002-2016 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
 
   $Id: xpm.rb,v 1.5 2006/06/17 14:38:08 mutoh Exp $
@@ -11,11 +11,11 @@
 require 'gtk2'
 
 r_xpm = [
-      "10 10 3 1", 
-      "   c None", 
-      ".  c #FE0B0B", 
-      "+  c #FFFFFF", 
-      "+.......++",   
+      "10 10 3 1",
+      "   c None",
+      ".  c #FE0B0B",
+      "+  c #FFFFFF",
+      "+.......++",
       "+..    ..+",
       "+..    ..+",
       "+..   ...+",
@@ -24,15 +24,15 @@ r_xpm = [
       "+..++..+++",
       "+..++...++",
       "+..+++...+",
-      "+..++++..+"]     
+      "+..++++..+"]
 
 w = Gtk::Window.new
 w.signal_connect('delete-event') do
   Gtk.main_quit
 end
 
-src =  Gdk::Pixbuf.new(r_xpm)
-dst = src.scale(300, 300, Gdk::Pixbuf::INTERP_HYPER)
+src =  GdkPixbuf::Pixbuf.new(:xpm => r_xpm)
+dst = src.scale(300, 300, :hyper)
 
 w.add(Gtk::Image.new(dst))
 w.show_all

data/test/fixture/image.gresource.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/ruby/gnome">
+    <file>gnome-logo-icon.png</file>
+  </gresource>
+</gresources>

data/test/gdk_pixbuf2-test-utils.rb

@@ -17,4 +17,15 @@
 require "test-unit"
 
 module GdkPixbufTestUtils
+  private
+  def only_version(major, minor, micro=nil)
+    micro ||= 0
+    unless GdkPixbuf::Version.or_later?(major, minor, micro)
+      omit("Require GdkPixbuf >= #{major}.#{minor}.#{micro}")
+    end
+  end
+
+  def fixture_path(*components)
+    File.join(File.dirname(__FILE__), "fixture", *components)
+  end
 end

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 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
@@ -20,14 +20,17 @@ ruby_gnome2_base = File.join(File.dirname(__FILE__), "..", "..")
 ruby_gnome2_base = File.expand_path(ruby_gnome2_base)
 
 glib_base = File.join(ruby_gnome2_base, "glib2")
+gobject_introspection_base = File.join(ruby_gnome2_base, "gobject-introspection")
 gdk_pixbuf2_base = File.join(ruby_gnome2_base, "gdk_pixbuf2")
 
 modules = [
   [glib_base, "glib2"],
-  [gdk_pixbuf2_base, "gdk_pixbuf2"]
+  [gobject_introspection_base, "gobject-introspection"],
+  [gdk_pixbuf2_base, "gdk_pixbuf2"],
 ]
 modules.each do |target, module_name|
-  if system("which make > /dev/null")
+  makefile = File.join(target, "Makefile")
+  if File.exist?(makefile) and system("which make > /dev/null")
     `make -C #{target.dump} > /dev/null` or exit(false)
   end
   $LOAD_PATH.unshift(File.join(target, "ext", module_name))