poppler 3.0.7 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f61f020bd2f0f15162d14ef61336c178f3c0d67
-  data.tar.gz: c4b29a5d14b6ffbf9607e2395b9b23770e59b22f
+  metadata.gz: b01b795199455ead82ad2777cfcbbeb257b4793f
+  data.tar.gz: 19af7209f58dfbbfe069bcfb12d75c52176f3249
 SHA512:
-  metadata.gz: 98c8c740eb62ce284118fd2db48954f3916f37f56f594cded47457a1795541db2f1976d9a745e7820d852b6ecac2d6ee40f32264561cf9c5b51bd9f26b20061b
-  data.tar.gz: 9b7e28040520196f525bb4f1afc2924f7ca494b0531fbf71fb08549686f28c451e39843f08ac03d3420fa12b8e135d774c801cc2fd1575ce26adc22f28d58e86
+  metadata.gz: e7e001be7aec5d2112f101e8ebf020ebc3feea41d082746f51f78ec3ebe37cffc8ded1294196109b46724cc915118e39e931613a170648a6fd39a5d4674bcbf1
+  data.tar.gz: 4464ff0fb7dbca8207146cf071eedf8df8286da3ef934cabc147dc4b6c66f742ae664e3ffbe185c64994c5c34a2e29aedf248abdeeb6d05cdb8af7d398d8023b

data/Rakefile

@@ -36,8 +36,8 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
   package.external_packages = [
     {
       :name => "libjpeg",
-      :base_name => "jpeg-9a",
-      :archive_base_name => "jpegsrc.v9a.tar.gz",
+      :base_name => "jpeg-9b",
+      :archive_base_name => "jpegsrc.v9b.tar.gz",
       :download_base_url => "http://www.ijg.org/files",
       :label => "libjpeg",
       :windows => {
@@ -47,9 +47,9 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
     },
     {
       :name => "sqlite-autoconf",
-      :download_base_url => "http://www.sqlite.org/2015",
+      :download_base_url => "http://www.sqlite.org/2016",
       :label => "SQLite",
-      :version => "3081101",
+      :version => "3140100",
       :compression_method => "gz",
       :windows => {
         :configure_args => [],
@@ -71,9 +71,9 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
     },
     {
       :name => "poppler",
-      :download_base_url => "http://poppler.freedesktop.org",
+      :download_base_url => "https://poppler.freedesktop.org",
       :label => "Poppler",
-      :version => "0.36.0",
+      :version => "0.42.0",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

data/ext/poppler/extconf.rb

@@ -30,7 +30,7 @@ rescue LoadError
   require 'mkmf-gnome2'
 end
 
-["glib2", "atk", "gdk_pixbuf2"].each do |package|
+["glib2", "atk"].each do |package|
   directory = "#{package}#{version_suffix}"
   build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
   add_depend_package(package, "#{directory}/ext/#{package}",
@@ -46,6 +46,7 @@ end
 setup_windows(module_name, base_dir)
 
 unless required_pkg_config_package([package_id, 0, 12, 0],
+                                   :altlinux => "libpoppler-glib-devel",
                                    :debian => "libpoppler-glib-dev",
                                    :redhat => "poppler-glib-devel",
                                    :arch => "poppler",

data/ext/poppler/rbpoppler-page.c

@@ -205,17 +205,17 @@ rg_text_layout(VALUE self)
     guint n_rectangles;
 
     if (poppler_page_get_text_layout(SELF(self), &rectangles, &n_rectangles)) {
-        VALUE *rb_list, *p;
-        VALUE ary;
+        VALUE rb_rectangles;
         guint i;
-        rb_list = p = ALLOC_N(VALUE, n_rectangles);
-        for (i = 0; i < n_rectangles; i++, p++) {
-            *p = POPPLERRECTANGLE2RVAL(&rectangles[i]);
+
+        rb_rectangles = rb_ary_new2(n_rectangles);
+        for (i = 0; i < n_rectangles; i++) {
+            rb_ary_push(rb_rectangles,
+                        POPPLERRECTANGLE2RVAL(&(rectangles[i])));
         }
-        ary = rb_ary_new4(n_rectangles, rb_list);
-        free(rb_list);
-        free(rectangles);
-        return ary;
+        g_free(rectangles);
+
+        return rb_rectangles;
     } else {
         return Qnil;
     }

data/ext/poppler/rbpoppler.c

@@ -56,7 +56,6 @@ Init_poppler(void)
                                 INT2FIX(POPPLER_MICRO_VERSION)));
 
     G_DEF_CLASS(POPPLER_TYPE_ERROR, "Error", RG_TARGET_NAMESPACE);
-    G_DEF_CLASS(POPPLER_TYPE_ORIENTATION, "Orientation", RG_TARGET_NAMESPACE);
 
     G_DEF_CLASS(POPPLER_TYPE_PAGE_TRANSITION_TYPE,
                 "PageTransitionType", RG_TARGET_NAMESPACE);

data/lib/poppler.rb

@@ -54,7 +54,7 @@ module Poppler
   class Document
     private
     def pdf_data?(data)
-      /\A%PDF-1\.\d/ =~ data
+      data.start_with?("%PDF-1.")
     end
 
     def ensure_uri(uri)

data/sample/pdf2.rb

@@ -115,7 +115,7 @@ def to_pixbuf_with_cairo(input, page_number, scale, rotate)
   temp = Tempfile.new("pdf2")
   cr.target.write_to_png(temp.path)
   cr.target.finish
-  Gdk::Pixbuf.new(temp.path)
+  GdkPixbuf::Pixbuf.new(:file => temp.path)
 end
 
 unless Poppler.cairo_available?

data/test/poppler-test-utils.rb

@@ -22,7 +22,7 @@ module PopplerTestUtils
   def form_pdf
     file = File.join(fixtures_dir, "form.pdf")
     return file if File.exist?(file)
-    pdf = open("http://www.irs.gov/pub/irs-pdf/fw9.pdf").read
+    pdf = open("https://www.irs.gov/pub/irs-pdf/fw9.pdf").read
     File.open(file, "wb") do |output|
       output.print(pdf)
     end

data/test/run-test.rb

@@ -15,10 +15,12 @@ require 'glib-test-init'
  [pango_dir, "pango"],
  [glib_dir, "glib2"],
  [base_dir, "poppler"]].each do |dir, module_name|
-  if have_make
-    system("cd #{dir.dump} && make > /dev/null") or exit(false)
+  if File.exist?(File.join(dir, "Makefile"))
+    if have_make
+      system("cd #{dir.dump} && make > /dev/null") or exit(false)
+    end
+    $LOAD_PATH.unshift(File.join(dir, "ext", module_name))
   end
-  $LOAD_PATH.unshift(File.join(dir, "ext", module_name))
   $LOAD_PATH.unshift(File.join(dir, "lib"))
 end
 require "poppler"

data/test/test_page.rb

@@ -30,6 +30,15 @@ class TestPage < Test::Unit::TestCase
     assert_kind_of(Poppler::Annotation, mapping.annotation)
   end
 
+  def test_text_layout
+    only_poppler_version(0, 16, 0)
+    document = Poppler::Document.new(form_pdf)
+    page = document[0]
+    layout = page.text_layout
+    assert_equal([60, 31, 79, 60],
+                 layout[0].to_a.collect(&:round))
+  end
+
   private
   def find_first_image_mapping(document)
     document.each do |page|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poppler
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.1.0
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2016-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.1.0
 description: Ruby/Poppler is a Ruby binding of poppler-glib.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -98,7 +98,7 @@ files:
 - test/test_page.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses:
-- LGPLv2.1 or later
+- LGPLv2.1+
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby/Poppler is a Ruby binding of poppler-glib.