poppler 3.1.0-x64-mingw32 → 3.1.1-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 620e47900c78b6747a00e840c9e79a51a3af3111
-  data.tar.gz: a0023300eec84e3cfc447d4d7a97906b704926cd
+  metadata.gz: 9300708c96e30a3654e2165011d8468950264f4f
+  data.tar.gz: be33f409f221649259e5e652e3ef3ed8db354d68
 SHA512:
-  metadata.gz: a2eb55c4bdef796d693f3fd237194432a6f5b216b9fc65467aa1e0ad460dcb8ef3401bef84fb73d06f4b687d7346fd096317976763f7fb864a89332571d6ef9d
-  data.tar.gz: 4357cceaebcd1170bc0b8c8fd41169eb78438104ba044e836ad7e0a09966777113a9efcdc6e1e92c1b0b3687f4f3e504bb4732a1cf15401ade34a3cc8f922775
+  metadata.gz: 4919ef3effd92b536cc87e618a2e08b9e811b41958ba35c327b083ea6aa6c3b6519faf4c305c32851a8227a2fe20f00ef9c93b82fe061b718f15eb33126c8fda
+  data.tar.gz: fc23491acccb4f9f48354009b7a0cfee83bf37237c19909681caa252148e31786925c5a5eb58d7edee6485e0723931dd54292c045f347b698b0d56a25c0323d4

data/ext/poppler/extconf.rb

@@ -30,7 +30,7 @@ rescue LoadError
   require 'mkmf-gnome2'
 end
 
-["glib2", "atk"].each do |package|
+["glib2", "gdk_pixbuf2"].each do |package|
   directory = "#{package}#{version_suffix}"
   build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
   add_depend_package(package, "#{directory}/ext/#{package}",

data/ext/poppler/rbpoppler-action.c

@@ -308,48 +308,78 @@ Init_poppler_action(VALUE mPoppler)
     rbg_define_method(rb_cPopplerActionAny, "type", action_any_type, 0);
     DEFINE_ACTION_ACCESSOR(rb_cPopplerActionAny, any, title);
 
-    rb_cPopplerActionUnknown = rb_define_class_under(mPoppler, "ActionUnknown",
-                                                     rb_cPopplerAction);
-
-    rb_cPopplerActionGotoDest = rb_define_class_under(mPoppler, "ActionGotoDest",
-                                                      rb_cPopplerActionAny);
+    rb_cPopplerActionUnknown =
+        G_DEF_CLASS_WITH_PARENT(POPPLER_ACTION_TYPE_UNKNOWN,
+                                "ActionUnknown",
+                                mPoppler,
+                                rb_cPopplerAction);
+
+    rb_cPopplerActionGotoDest =
+        G_DEF_CLASS_WITH_PARENT(POPPLER_ACTION_TYPE_GOTO_DEST,
+                                "ActionGotoDest",
+                                mPoppler,
+                                rb_cPopplerActionAny);
     DEFINE_ACTION_ACCESSOR(rb_cPopplerActionGotoDest, goto_dest, dest);
 
-    rb_cPopplerActionGotoRemote = rb_define_class_under(mPoppler, "ActionGotoRemote",
-                                                        rb_cPopplerActionAny);
+    rb_cPopplerActionGotoRemote =
+        G_DEF_CLASS_WITH_PARENT(POPPLER_ACTION_TYPE_GOTO_REMOTE,
+                                "ActionGotoRemote",
+                                mPoppler,
+                                rb_cPopplerActionAny);
     DEFINE_ACTION_ACCESSOR(rb_cPopplerActionGotoRemote, goto_remote, file_name);
     DEFINE_ACTION_ACCESSOR(rb_cPopplerActionGotoRemote, goto_remote, dest);
 
-    rb_cPopplerActionLaunch = rb_define_class_under(mPoppler, "ActionLaunch",
-                                                    rb_cPopplerActionAny);
+    rb_cPopplerActionLaunch =
+        G_DEF_CLASS_WITH_PARENT(POPPLER_ACTION_TYPE_LAUNCH,
+                                "ActionLaunch",
+                                mPoppler,
+                                rb_cPopplerActionAny);
     DEFINE_ACTION_ACCESSOR(rb_cPopplerActionLaunch, launch, file_name);
     DEFINE_ACTION_ACCESSOR(rb_cPopplerActionLaunch, launch, params);
 
-    rb_cPopplerActionURI = rb_define_class_under(mPoppler, "ActionURI", rb_cPopplerActionAny);
+    rb_cPopplerActionURI =
+        G_DEF_CLASS_WITH_PARENT(POPPLER_ACTION_TYPE_URI,
+                                "ActionURI",
+                                mPoppler,
+                                rb_cPopplerActionAny);
     DEFINE_ACTION_ACCESSOR(rb_cPopplerActionURI, uri, uri);
 
-    rb_cPopplerActionNamed = rb_define_class_under(mPoppler, "ActionNamed",
-                                                   rb_cPopplerActionAny);
+    rb_cPopplerActionNamed =
+        G_DEF_CLASS_WITH_PARENT(POPPLER_ACTION_TYPE_NAMED,
+                                "ActionNamed",
+                                mPoppler,
+                                rb_cPopplerActionAny);
     DEFINE_ACTION_ACCESSOR(rb_cPopplerActionNamed, named, named_dest);
 
 #if POPPLER_CHECK_VERSION(0, 14, 0)
-    rb_cPopplerActionMovie = rb_define_class_under(mPoppler, "ActionMovie",
-                                                   rb_cPopplerActionAny);
+    rb_cPopplerActionMovie =
+        G_DEF_CLASS_WITH_PARENT(POPPLER_ACTION_TYPE_MOVIE,
+                                "ActionMovie",
+                                mPoppler,
+                                rb_cPopplerActionAny);
     DEFINE_ACTION_ACCESSOR(rb_cPopplerActionMovie, movie, movie);
 
-    rb_cPopplerActionRendition = rb_define_class_under(mPoppler, "ActionRendtion",
-                                                       rb_cPopplerActionAny);
+    rb_cPopplerActionRendition =
+        G_DEF_CLASS_WITH_PARENT(POPPLER_ACTION_TYPE_RENDITION,
+                                "ActionRendtion",
+                                mPoppler,
+                                rb_cPopplerActionAny);
     DEFINE_ACTION_ACCESSOR(rb_cPopplerActionRendition, rendition, media);
 
-    rb_cPopplerActionOCGState = rb_define_class_under(mPoppler, "ActionOCGState",
-                                                      rb_cPopplerActionAny);
+    rb_cPopplerActionOCGState =
+        G_DEF_CLASS_WITH_PARENT(POPPLER_ACTION_TYPE_OCG_STATE,
+                                "ActionOCGState",
+                                mPoppler,
+                                rb_cPopplerActionAny);
     DEFINE_ACTION_ACCESSOR(rb_cPopplerActionOCGState, ocg_state, state_list);
 #endif
 
 #if POPPLER_CHECK_VERSION(0, 18, 0)
     rb_cPopplerActionJavaScript =
-        rb_define_class_under(mPoppler, "ActionJavaScript",
-                              rb_cPopplerActionAny);
+        G_DEF_CLASS_WITH_PARENT(POPPLER_ACTION_TYPE_JAVASCRIPT,
+                                "ActionJavaScript",
+                                mPoppler,
+                                rb_cPopplerActionAny);
     DEFINE_ACTION_ACCESSOR(rb_cPopplerActionJavaScript, javascript, script);
 #endif
 

data/ext/poppler/rbpoppler-index-iter.c

@@ -44,7 +44,6 @@ rg_initialize(VALUE self, VALUE document)
     PopplerIndexIter *iter;
     iter = poppler_index_iter_new(RVAL2POPPLERDOCUMENT(document));
     G_INITIALIZE(self, iter);
-    poppler_index_iter_free(iter);
     rb_ivar_set(self, id_valid, CBOOL2RVAL(iter));
     return Qnil;
 }
@@ -57,6 +56,9 @@ rg_child(VALUE self)
 
     CHECK_IITER_IS_VALID(self);
     child = poppler_index_iter_get_child(RVAL2POPPLERINDEXITER(self));
+    if (!child)
+        return Qnil;
+
     rb_child = POPPLERINDEXITER2RVAL(child);
     rb_ivar_set(rb_child, id_valid, CBOOL2RVAL(child));
     poppler_index_iter_free(child);

data/test/poppler-test-utils.rb

@@ -37,6 +37,10 @@ module PopplerTestUtils
     File.join(fixtures_dir, "image.png")
   end
 
+  def outline_pdf
+    File.join(fixtures_dir, "outline.pdf")
+  end
+
   def later_version?(major, minor, micro=nil)
     micro ||= 0
     (Poppler::BUILD_VERSION <=> [major, minor, micro]) >= 0

data/test/test-index-iter.rb

@@ -0,0 +1,49 @@
+# Copyright (C) 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
+# 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
+
+class TestIndexIter < Test::Unit::TestCase
+  def test_title
+    document = Poppler::Document.new(outline_pdf)
+    assert_equal([
+                   [
+                     "Heading1",
+                     [
+                       [
+                         "Heading2",
+                         [
+                           [
+                             "Heading3",
+                           ],
+                         ],
+                       ],
+                     ],
+                   ],
+                 ],
+                 collect_titles(document.index_iter))
+  end
+
+  private
+  def collect_titles(iter)
+    iter.collect do
+      titles = [iter.action.title]
+      child_iter = iter.child
+      if child_iter
+        titles << collect_titles(child_iter)
+      end
+      titles
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poppler
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: x64-mingw32
 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: cairo
@@ -30,14 +30,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/Poppler is a Ruby binding of poppler-glib.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -80,6 +80,7 @@ files:
 - extconf.rb
 - lib/2.2/poppler.so
 - lib/2.3/poppler.so
+- lib/2.4/poppler.so
 - lib/poppler.rb
 - sample/number-pdf.rb
 - sample/pdf2.rb
@@ -89,8 +90,11 @@ files:
 - sample/pdfdiv.rb
 - test/fixtures/image.pdf
 - test/fixtures/image.png
+- test/fixtures/outline.odt
+- test/fixtures/outline.pdf
 - test/poppler-test-utils.rb
 - test/run-test.rb
+- test/test-index-iter.rb
 - test/test-version.rb
 - test/test_annotation.rb
 - test/test_color.rb
@@ -254,7 +258,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: '2.1'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="