poppler 1.2.1 → 1.2.2

data/README

@@ -9,8 +9,6 @@ Requirements
     Ruby:               http://www.ruby-lang.org/
     poppler-glib [*]:   http://poppler.freedesktop.org/
     Ruby/GLib2:         http://ruby-gnome2.sourceforge.net/
-    Ruby/GTK2:          http://ruby-gnome2.sourceforge.net/
-    Ruby/GdkPixbuf2:    http://ruby-gnome2.sourceforge.net/
     cairo/rcairo: http://cairographics.org/ (optional)
 
     [*]: 0.8.0 or later is requried.
@@ -26,7 +24,7 @@ Install
 
 Copying
 -------
-   Copyright (c) 2002-2006 Ruby-GNOME2 Project Team
+   Copyright (c) 2002-2013 Ruby-GNOME2 Project Team
 
    This program is free software.
    You can distribute/modify this program under the terms of

data/Rakefile

@@ -6,7 +6,7 @@ require 'gnome2-raketask'
 package = GNOME2Package.new do |_package|
   _package.summary = "Ruby/Poppler is a Ruby binding of poppler-glib."
   _package.description = "Ruby/Poppler is a Ruby binding of poppler-glib."
-  _package.dependency.gem.runtime = ["gtk2"]
+  _package.dependency.gem.runtime = []
   _package.win32.packages = []
   _package.win32.dependencies = ["poppler",
                                  ["libpng", "1.2.40-1"],

data/ext/poppler/extconf.rb

@@ -30,7 +30,7 @@ rescue LoadError
   require 'mkmf-gnome2'
 end
 
-["glib2", "atk", "pango", "gdk_pixbuf2", "gtk2"].each do |package|
+["glib2", "atk", "pango", "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-color.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2006-2008 Ruby-GNOME2 Project Team
  *
  *  This library is free software; you can redistribute it and/or
@@ -29,19 +29,6 @@ VALUE RG_TARGET_NAMESPACE;
 PopplerColor *
 rb_poppler_ruby_object_to_color(VALUE color)
 {
-#ifdef POPPLER_WITH_GDK
-    if (RTEST(rb_obj_is_kind_of(color, rb_cGdkColor))) {
-        GdkColor *gdk_color;
-
-        gdk_color = RVAL2GDKCOLOR(color);
-        color = rb_funcall(RG_TARGET_NAMESPACE, rb_intern("new"),
-                           3,
-                           UINT2NUM(gdk_color->red),
-                           UINT2NUM(gdk_color->green),
-                           UINT2NUM(gdk_color->blue));
-    }
-#endif
-
     return RVAL2BOXED(color, POPPLER_TYPE_COLOR);
 }
 

data/ext/poppler/rbpoppler-page.c

@@ -24,28 +24,9 @@
 #define RG_TARGET_NAMESPACE cPage
 #define SELF(self) (RVAL2POPPLERPAGE(self))
 
-#ifndef GDK_TYPE_REGION
-extern GType gdk_region_get_type(void);
-#  define GDK_TYPE_REGION (gdk_region_get_type())
-#endif
-
 static VALUE cRectangle;
 static VALUE cPSFile;
 
-#ifdef POPPLER_WITH_GDK
-static VALUE
-page_render_to_pixbuf(VALUE self, VALUE src_x, VALUE src_y, VALUE src_width,
-                      VALUE src_height, VALUE scale, VALUE rotation,
-                      VALUE pixbuf)
-{
-    poppler_page_render_to_pixbuf(SELF(self), NUM2INT(src_x),
-                                  NUM2INT(src_y), NUM2INT(src_width),
-                                  NUM2INT(src_height), NUM2DBL(scale),
-                                  NUM2INT(rotation), RVAL2GDKPIXBUF(pixbuf));
-    return Qnil;
-}
-#endif
-
 #ifdef RB_POPPLER_CAIRO_AVAILABLE
 static VALUE
 page_render(VALUE self, VALUE cairo)
@@ -63,49 +44,19 @@ page_render_to_ps(VALUE self, VALUE ps_file)
 }
 
 static VALUE
-rg_render(int argc, VALUE *argv, VALUE self)
+rg_render(VALUE ps_file_or_cairo, VALUE self)
 {
-    if (argc == 1) {
-        if (RVAL2CBOOL(rb_obj_is_kind_of(argv[0], cPSFile))) {
-            return page_render_to_ps(self, argv[0]);
-        } else {
+    if (RVAL2CBOOL(rb_obj_is_kind_of(ps_file_or_cairo, cPSFile))) {
+        return page_render_to_ps(self, ps_file_or_cairo);
+    } else {
 #ifdef RB_POPPLER_CAIRO_AVAILABLE
-            return page_render(self, argv[0]);
-#else
-            rb_raise(rb_eArgError, "cairo is not available");
-#endif
-        }
-    } else if (argc == 7) {
-#ifdef POPPLER_WITH_GDK
-        return page_render_to_pixbuf(self, argv[0], argv[1], argv[2], argv[3],
-                                     argv[4], argv[5], argv[6]);
+        return page_render(self, ps_file_or_cairo);
 #else
-        rb_raise(rb_eArgError, "GDK is not available");
+        rb_raise(rb_eArgError, "cairo is not available");
 #endif
-    } else {
-        rb_raise(rb_eArgError,
-                 "wrong number of arguments (%d for 1 or 7)",
-                 argc);
     }
 }
 
-#ifdef POPPLER_WITH_GDK
-static VALUE
-page_render_to_pixbuf_for_printing(VALUE self, VALUE src_x, VALUE src_y,
-                                   VALUE src_width, VALUE src_height,
-                                   VALUE scale, VALUE rotation, VALUE pixbuf)
-{
-    poppler_page_render_to_pixbuf_for_printing(SELF(self), NUM2INT(src_x),
-                                               NUM2INT(src_y),
-                                               NUM2INT(src_width),
-                                               NUM2INT(src_height),
-                                               NUM2DBL(scale),
-                                               NUM2INT(rotation),
-                                               RVAL2GDKPIXBUF(pixbuf));
-    return Qnil;
-}
-#endif
-
 #ifdef RB_POPPLER_CAIRO_AVAILABLE
 static VALUE
 page_render_for_printing(VALUE self, VALUE cairo)
@@ -116,26 +67,13 @@ page_render_for_printing(VALUE self, VALUE cairo)
 #endif
 
 static VALUE
-rg_render_for_printing(int argc, VALUE *argv, VALUE self)
+rg_render_for_printing(VALUE self, VALUE cairo)
 {
-    if (argc == 1) {
 #ifdef RB_POPPLER_CAIRO_AVAILABLE
-        return page_render_for_printing(self, argv[0]);
-#else
-        rb_raise(rb_eArgError, "cairo is not available");
-#endif
-    } else if (argc == 7) {
-#ifdef POPPLER_WITH_GDK
-        return page_render_to_pixbuf_for_printing(self, argv[0], argv[1],
-                                                  argv[2], argv[3],
-                                                  argv[4], argv[5], argv[6]);
+    return page_render_for_printing(self, cairo);
 #else
-        rb_raise(rb_eArgError, "GDK is not available");
+    rb_raise(rb_eArgError, "cairo is not available");
 #endif
-    } else {
-        rb_raise(rb_eArgError,
-                 "wrong number of arguments (%d for 1 or 7)", argc);
-    }
 }
 
 #ifdef RB_POPPLER_CAIRO_AVAILABLE
@@ -158,53 +96,17 @@ page_render_selection(VALUE self, VALUE cairo,
 }
 #endif
 
-#ifdef POPPLER_WITH_GDK
-static VALUE
-page_render_selection_to_pixbuf(VALUE self, VALUE scale, VALUE rotation,
-                                VALUE pixbuf, VALUE selection,
-                                VALUE rb_old_selection,
-                                VALUE style,
-                                VALUE glyph_color, VALUE background_color)
-{
-    PopplerRectangle *old_selection = NULL;
-
-    if (!NIL_P(rb_old_selection))
-        old_selection = RVAL2POPPLERRECTANGLE(rb_old_selection);
-    poppler_page_render_selection_to_pixbuf(SELF(self),
-                                            NUM2DBL(scale),
-                                            NUM2INT(rotation),
-                                            RVAL2GDKPIXBUF(pixbuf),
-                                            RVAL2POPPLERRECTANGLE(selection),
-                                            old_selection,
-                                            RVAL2POPPLERSELECTIONSTYLE(style),
-                                            RVAL2GDKCOLOR(glyph_color),
-                                            RVAL2GDKCOLOR(background_color));
-    return Qnil;
-}
-#endif
-
 static VALUE
-rg_render_selection(int argc, VALUE *argv, VALUE self)
+rg_render_selection(VALUE self,
+                    VALUE cairo, VALUE selection, VALUE old_selection,
+                    VALUE style, VALUE glyph_color, VALUE background_color)
 {
-    if (argc == 6) {
 #ifdef RB_POPPLER_CAIRO_AVAILABLE
-        return page_render_selection(self, argv[0], argv[1], argv[2],
-                                     argv[3], argv[4], argv[5]);
+    return page_render_selection(self, cairo, selection, old_selection,
+                                 style, glyph_color, background_color);
 #else
-        rb_raise(rb_eArgError, "cairo is not available");
-#endif
-    } else if (argc == 8) {
-#ifdef POPPLER_WITH_GDK
-        return page_render_selection_to_pixbuf(self, argv[0], argv[1],
-                                               argv[2], argv[3], argv[4],
-                                               argv[5], argv[6], argv[7]);
-#else
-        rb_raise(rb_eArgError, "GDK is not available");
+    rb_raise(rb_eArgError, "cairo is not available");
 #endif
-    } else {
-        rb_raise(rb_eArgError,
-                 "wrong number of arguments (%d for 5 or 8)", argc);
-    }
 }
 
 static VALUE
@@ -241,14 +143,6 @@ rg_thumbnail(VALUE self)
 }
 #endif
 
-#ifdef POPPLER_WITH_GDK
-static VALUE
-rg_thumbnail_pixbuf(VALUE self)
-{
-    return GOBJ2RVAL(poppler_page_get_thumbnail_pixbuf(SELF(self)));
-}
-#endif
-
 static VALUE
 rg_thumbnail_size(VALUE self)
 {
@@ -427,8 +321,8 @@ Init_poppler_page(VALUE mPoppler)
     cRectangle = rb_const_get(mPoppler, rb_intern("Rectangle"));
     cPSFile = rb_const_get(mPoppler, rb_intern("PSFile"));
 
-    RG_DEF_METHOD(render, -1);
-    RG_DEF_METHOD(render_for_printing, -1);
+    RG_DEF_METHOD(render, 1);
+    RG_DEF_METHOD(render_for_printing, 1);
     RG_DEF_METHOD(size, 0);
     RG_DEF_METHOD(index, 0);
     RG_DEF_METHOD(duration, 0);
@@ -436,9 +330,6 @@ Init_poppler_page(VALUE mPoppler)
 
 #if RB_POPPLER_CAIRO_AVAILABLE
     RG_DEF_METHOD(thumbnail, 0);
-#endif
-#if POPPLER_WITH_GDK
-    RG_DEF_METHOD(thumbnail_pixbuf, 0);
 #endif
     RG_DEF_METHOD(thumbnail_size, 0);
     RG_DEF_METHOD(find_text, 1);
@@ -455,6 +346,6 @@ Init_poppler_page(VALUE mPoppler)
 
     RG_DEF_METHOD(form_field_mapping, 0);
     RG_DEF_METHOD(annotation_mapping, 0);
-    RG_DEF_METHOD(render_selection, -1);
+    RG_DEF_METHOD(render_selection, 6);
     RG_DEF_METHOD(crop_box, 0);
 }

data/ext/poppler/rbpoppler-private.h

@@ -3,10 +3,6 @@
 
 #include "rbpoppler.h"
 
-#ifdef POPPLER_WITH_GDK
-#  include <rbgdk.h>
-#endif
-
 #define RVAL2GDKPIXBUF(o) (GDK_PIXBUF(RVAL2GOBJ(o)))
 
 G_GNUC_INTERNAL void Init_poppler_indexiter(VALUE mPoppler);

data/sample/pdf2.rb

@@ -2,6 +2,7 @@
 
 require 'tempfile'
 require "poppler"
+require "gdk_pixbuf2"
 
 if ARGV.size < 2
   puts "usage: #{$0} input.pdf output [scale_ratio] [rotate_angle]"
@@ -81,23 +82,11 @@ def to_pixbuf_with_cairo(input, scale, rotate)
   Gdk::Pixbuf.new(temp.path)
 end
 
-def to_pixbuf(input, scale, rotate)
-  doc = Poppler::Document.new(input)
-  page = doc[0]
-  width, height = page.size.collect {|x| x * scale}
-  pixbuf_width, pixbuf_height = compute_size(width, height, rotate)
-  pixbuf = Gdk::Pixbuf.new(Gdk::Pixbuf::COLORSPACE_RGB, true, 8,
-                           pixbuf_width, pixbuf_height)
-  page.render(0, 0, width, height, scale, rotate, pixbuf)
-  pixbuf
-end
-
-if Poppler.cairo_available?
-  puts "using cairo..."
-  pixbuf = to_pixbuf_with_cairo(input, scale, rotate)
-else
-  pixbuf = to_pixbuf(input, scale, rotate)
+unless Poppler.cairo_available?
+  puts "cairo isn't available."
+  exit(false)
 end
+pixbuf = to_pixbuf_with_cairo(input, scale, rotate)
 
 if pixbuf.nil?
   puts "Is it a PDF file?: #{input}"

data/test/test_page.rb

@@ -1,49 +1,10 @@
 class TestPage < Test::Unit::TestCase
   def test_get_image
+    omit("We don't have PDF that has image...")
     document = Poppler::Document.new(image_pdf)
     page, mapping = find_first_image_mapping(document)
-    if later_version?(0, 7, 2) and Poppler.cairo_available?
-      assert_kind_of(Cairo::ImageSurface, page.get_image(mapping.image_id))
-      assert_kind_of(Cairo::ImageSurface, mapping.image)
-    else
-      assert_kind_of(Gdk::Pixbuf, mapping.image)
-    end
-  end
-
-  def test_render_to_pixbuf
-    only_old_poppler_version(0, 17, 0)
-
-    document = Poppler::Document.new(image_pdf)
-    page = document[0]
-    width, height = page.size
-    pixbuf = Gdk::Pixbuf.new(Gdk::Pixbuf::COLORSPACE_RGB, true, 8,
-                             width / 2, height / 2)
-    pixbuf.fill!(0)
-    assert_equal("\0" * 10, pixbuf.pixels[0, 10])
-    page.render(0, 0, width, height, 0.5, 0, pixbuf)
-    assert_not_equal("\0" * 10, pixbuf.pixels[0, 10])
-  end
-
-  def test_render_to_pixbuf_for_printing
-    only_poppler_version(0, 7, 2)
-    only_old_poppler_version(0, 17, 0)
-
-    document = Poppler::Document.new(image_pdf)
-    page = document[0]
-    width, height = page.size
-    pixbuf = Gdk::Pixbuf.new(Gdk::Pixbuf::COLORSPACE_RGB, true, 8,
-                             width / 2, height / 2)
-    pixbuf.fill!(0)
-    assert_equal("\0" * 10, pixbuf.pixels[0, 10])
-    page.render_for_printing(0, 0, width, height, 0.5, 0, pixbuf)
-    assert_not_equal("\0" * 10, pixbuf.pixels[0, 10])
-  end
-
-  def test_thumbnail_pixbuf
-    omit("We doesn't have a PDF that has a thumbnail...")
-    document = Poppler::Document.new(thumbnail_pdf)
-    page = document[0]
-    assert_kind_of(Gdk::Pixbuf, page.thumbnail_pixbuf)
+    assert_kind_of(Cairo::ImageSurface, page.get_image(mapping.image_id))
+    assert_kind_of(Cairo::ImageSurface, mapping.image)
   end
 
   def test_selection_region

metadata

@@ -1,130 +1,94 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: poppler
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 1.2.2
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 1
-  version: 1.2.1
 platform: ruby
-authors: 
+authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: gtk2
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 2
-        - 1
-        version: 1.2.1
-  type: :runtime
-  version_requirements: *id001
+date: 2013-03-11 00:00:00.000000000 Z
+dependencies: []
 description: Ruby/Poppler is a Ruby binding of poppler-glib.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
-
-extensions: 
+extensions:
 - ext/poppler/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - README
 - Rakefile
 - extconf.rb
 - lib/poppler.rb
-- ext/poppler/rbpoppler-annotationmarkup.c
-- ext/poppler/rbpoppler-attachment.c
+- ext/poppler/depend
+- ext/poppler/extconf.rb
+- ext/poppler/poppler.def
+- ext/poppler/rbpoppler-action.c
+- ext/poppler/rbpoppler-annotation.c
 - ext/poppler/rbpoppler-annotationcalloutline.c
+- ext/poppler/rbpoppler-annotationfreetext.c
+- ext/poppler/rbpoppler-annotationmapping.c
+- ext/poppler/rbpoppler-annotationmarkup.c
 - ext/poppler/rbpoppler-annotationtext.c
-- ext/poppler/rbpoppler-linkmapping.c
-- ext/poppler/rbpoppler-fontinfo.c
-- ext/poppler/rbpoppler.h
-- ext/poppler/rbpoppler.c
-- ext/poppler/rbpoppler-psfile.c
+- ext/poppler/rbpoppler-attachment.c
+- ext/poppler/rbpoppler-buttonfield.c
 - ext/poppler/rbpoppler-choicefield.c
+- ext/poppler/rbpoppler-color.c
+- ext/poppler/rbpoppler-document.c
+- ext/poppler/rbpoppler-fontinfo.c
 - ext/poppler/rbpoppler-fontsiter.c
-- ext/poppler/rbpoppler-pagetransition.c
-- ext/poppler/rbpoppler-page.c
-- ext/poppler/extconf.rb
-- ext/poppler/rbpoppler-rectangle.c
 - ext/poppler/rbpoppler-form-field.c
-- ext/poppler/rbpoppler-annotationmapping.c
-- ext/poppler/rbpoppler-action.c
-- ext/poppler/rbpoppler-imagemapping.c
 - ext/poppler/rbpoppler-formfieldmapping.c
-- ext/poppler/rbpoppler-annotation.c
+- ext/poppler/rbpoppler-imagemapping.c
+- ext/poppler/rbpoppler-indexiter.c
+- ext/poppler/rbpoppler-linkmapping.c
+- ext/poppler/rbpoppler-page.c
+- ext/poppler/rbpoppler-pagetransition.c
 - ext/poppler/rbpoppler-private.h
+- ext/poppler/rbpoppler-psfile.c
+- ext/poppler/rbpoppler-rectangle.c
 - ext/poppler/rbpoppler-textfield.c
-- ext/poppler/rbpoppler-annotationfreetext.c
-- ext/poppler/poppler.def
+- ext/poppler/rbpoppler.c
+- ext/poppler/rbpoppler.h
 - ext/poppler/rbpopplerconversions.h
-- ext/poppler/rbpoppler-buttonfield.c
-- ext/poppler/depend
-- ext/poppler/rbpoppler-document.c
-- ext/poppler/rbpoppler-color.c
-- ext/poppler/rbpoppler-indexiter.c
+- sample/number-pdf.rb
+- sample/pdf2.rb
 - sample/pdf2svg.rb
 - sample/pdf2text.rb
-- sample/pdf2.rb
 - sample/pdfcrop.rb
-- sample/number-pdf.rb
 - sample/pdfdiv.rb
-- test/test_document.rb
+- test/fixtures/image.pdf
 - test/poppler-test-utils.rb
-- test/test_page.rb
 - test/run-test.rb
-- test/fixtures/image.pdf
+- test/test_annotation.rb
 - test/test_color.rb
 - test/test_constants.rb
-- test/test_annotation.rb
+- test/test_document.rb
+- test/test_page.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 61
-      segments: 
-      - 1
-      - 8
-      - 5
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.5
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby/Poppler is a Ruby binding of poppler-glib.
 test_files: []
-