[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@cfb72c5 [master] Add the AnnotCalloutLine module

[cedlemo <nu...@co...>]

cedlemo	2017-07-21 02:08:25 +0900 (Fri, 21 Jul 2017)

  New Revision: cfb72c5f906b0b36542c2bd1995041aa90c403e1
  https://github.com/ruby-gnome2/ruby-gnome2/commit/cfb72c5f906b0b36542c2bd1995041aa90c403e1

  Merged 7316c70: Merge pull request #1068 from cedlemo/poppler_gi_form

  Message:
    Add the AnnotCalloutLine module

  Copied files:
    poppler/lib/poppler/annot-callout-line.rb
      (from poppler/lib/poppler.rb)
  Modified files:
    poppler/lib/poppler.rb
    poppler/lib/poppler/loader.rb

  Modified: poppler/lib/poppler.rb (+0 -27)
===================================================================
--- poppler/lib/poppler.rb    2017-07-21 02:02:55 +0900 (009ace7)
+++ poppler/lib/poppler.rb    2017-07-21 02:08:25 +0900 (2837e57)
@@ -33,31 +33,4 @@ module Poppler
   loader = Loader.new(self)
   loader.load("Poppler")
 
-  class AnnotCalloutLine
-    alias_method :initialize_raw, :initialize
-    def initialize(*args)
-      initialize_raw
-      if args.size == 1 && args.class == Hash
-        self.multiline = args[:multiline] || false
-        self.x1 = args[:x1] || 0
-        self.y1 = args[:y1] || 0
-        self.x2 = args[:x2] || 0
-        self.y2 = args[:y2] || 0
-        self.x3 = args[:x3] || 0
-        self.y3 = args[:y3] || 0
-      elsif args.class == Array && args.size == 7
-        self.multiline = args[0]
-        self.x1 = args[1]
-        self.y1 = args[2]
-        self.x2 = args[3]
-        self.y2 = args[4]
-        self.x3 = args[5]
-        self.y3 = args[6]
-      end
-    end
-
-    def to_a
-      [multiline?, x1, y1, x2, y2, x3, y3]
-    end
-  end
 end

  Copied: poppler/lib/poppler/annot-callout-line.rb (+0 -18) 75%
===================================================================
--- poppler/lib/poppler.rb    2017-07-21 02:02:55 +0900 (009ace7)
+++ poppler/lib/poppler/annot-callout-line.rb    2017-07-21 02:08:25 +0900 (31c0d8f)
@@ -14,25 +14,7 @@
 # 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 "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)
-
-require "poppler/loader"
-
 module Poppler
-  LOG_DOMAIN = "Poppler"
-  GLib::Log.set_log_domain(LOG_DOMAIN)
-
-  loader = Loader.new(self)
-  loader.load("Poppler")
-
   class AnnotCalloutLine
     alias_method :initialize_raw, :initialize
     def initialize(*args)

  Modified: poppler/lib/poppler/loader.rb (+1 -0)
===================================================================
--- poppler/lib/poppler/loader.rb    2017-07-21 02:02:55 +0900 (23253cc)
+++ poppler/lib/poppler/loader.rb    2017-07-21 02:08:25 +0900 (5e9674f)
@@ -26,6 +26,7 @@ module Poppler
 
     def require_libraries
       require "poppler/version"
+      require "poppler/annot-callout-line"
     end
   end
 end