poppler 2.0.2 → 2.0.3

data/ext/poppler/{rbpoppler-psfile.c → rbpoppler-ps-file.c}

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2006  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006-2013  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
@@ -56,7 +55,7 @@ rg_set_duplex(VALUE self, VALUE duplex)
 }
 
 void
-Init_poppler_psfile(VALUE mPoppler)
+Init_poppler_ps_file(VALUE mPoppler)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_PS_FILE, "PSFile", mPoppler);
 

data/ext/poppler/rbpoppler.c

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2006-2008 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006-2013 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
@@ -40,11 +39,7 @@ rg_s_version(G_GNUC_UNUSED VALUE self)
 static VALUE
 rg_s_cairo_available_p(G_GNUC_UNUSED VALUE self)
 {
-#ifdef RB_POPPLER_CAIRO_AVAILABLE
     return Qtrue;
-#else
-    return Qfalse;
-#endif
 }
 
 void
@@ -82,9 +77,6 @@ Init_poppler(void)
     G_RENAME_NICK("3D", "TYPE_3D");
     G_DEF_CLASS(POPPLER_TYPE_ANNOT_EXTERNAL_DATA_TYPE,
         "AnnotationExternalDataType", RG_TARGET_NAMESPACE);
-#  if !POPPLER_CHECK_VERSION(0, 9, 0)
-    G_DEF_CLASS(POPPLER_TYPE_ANNOT_TEXT_ICON, "AnnotationTextIcon", RG_TARGET_NAMESPACE);
-#  endif
     G_DEF_CLASS(POPPLER_TYPE_ANNOT_TEXT_STATE, "AnnotationTextState", RG_TARGET_NAMESPACE);
     G_DEF_CLASS(POPPLER_TYPE_ANNOT_FREE_TEXT_QUADDING,
         "AnnotationFreeTextQuadding", RG_TARGET_NAMESPACE);
@@ -95,25 +87,25 @@ Init_poppler(void)
     RG_DEF_SMETHOD(version, 0);
     RG_DEF_SMETHOD_P(cairo_available, 0);
 
-    Init_poppler_indexiter(RG_TARGET_NAMESPACE);
-    Init_poppler_fontinfo(RG_TARGET_NAMESPACE);
+    Init_poppler_index_iter(RG_TARGET_NAMESPACE);
+    Init_poppler_font_info(RG_TARGET_NAMESPACE);
     Init_poppler_document(RG_TARGET_NAMESPACE);
-    Init_poppler_fontsiter(RG_TARGET_NAMESPACE);
-    Init_poppler_psfile(RG_TARGET_NAMESPACE);
+    Init_poppler_fonts_iter(RG_TARGET_NAMESPACE);
+    Init_poppler_ps_file(RG_TARGET_NAMESPACE);
     Init_poppler_rectangle(RG_TARGET_NAMESPACE);
     Init_poppler_page(RG_TARGET_NAMESPACE);
     Init_poppler_color(RG_TARGET_NAMESPACE);
-    Init_poppler_linkmapping(RG_TARGET_NAMESPACE);
-    Init_poppler_pagetransition(RG_TARGET_NAMESPACE);
-    Init_poppler_imagemapping(RG_TARGET_NAMESPACE);
-    Init_poppler_formfieldmapping(RG_TARGET_NAMESPACE);
-    Init_poppler_annotationmapping(RG_TARGET_NAMESPACE);
+    Init_poppler_link_mapping(RG_TARGET_NAMESPACE);
+    Init_poppler_page_transition(RG_TARGET_NAMESPACE);
+    Init_poppler_image_mapping(RG_TARGET_NAMESPACE);
+    Init_poppler_form_field_mapping(RG_TARGET_NAMESPACE);
+    Init_poppler_annotation_mapping(RG_TARGET_NAMESPACE);
     Init_poppler_attachment(RG_TARGET_NAMESPACE);
     Init_poppler_action(RG_TARGET_NAMESPACE);
     Init_poppler_annotation(RG_TARGET_NAMESPACE);
-    Init_poppler_annotationmarkup(RG_TARGET_NAMESPACE);
-    Init_poppler_annotationtext(RG_TARGET_NAMESPACE);
-    Init_poppler_annotationfreetext(RG_TARGET_NAMESPACE);
-    Init_poppler_annotationcalloutline(RG_TARGET_NAMESPACE);
+    Init_poppler_annotation_markup(RG_TARGET_NAMESPACE);
+    Init_poppler_annotation_text(RG_TARGET_NAMESPACE);
+    Init_poppler_annotation_free_text(RG_TARGET_NAMESPACE);
+    Init_poppler_annotation_callout_line(RG_TARGET_NAMESPACE);
     Init_poppler_form_field(RG_TARGET_NAMESPACE);
 }

data/ext/poppler/rbpoppler.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2006-2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006-2013  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
@@ -47,18 +47,15 @@ extern GType poppler_dest_get_type (void) G_GNUC_CONST;
 #  define RB_POPPLER_TYPE_DEST_NOT_DEFINED
 #endif
 
-#if defined(HAVE_RB_CAIRO_H) && defined(POPPLER_HAS_CAIRO)
-#  define RB_POPPLER_CAIRO_AVAILABLE 1
-#  include <rb_cairo.h>
-#endif
+#include <rb_cairo.h>
 
 #ifdef POPPLER_TYPE_COLOR
 extern PopplerColor *rb_poppler_ruby_object_to_color(VALUE color);
 extern VALUE rb_poppler_ruby_object_from_color_with_free(PopplerColor *color);
 #endif
 
+extern VALUE rb_poppler_ruby_object_from_form_field(PopplerFormField *field);
 extern VALUE rb_poppler_ruby_object_from_action(PopplerAction *action);
 extern PopplerAction *rb_poppler_action_from_ruby_object(VALUE action);
-extern VALUE rb_poppler_ruby_object_from_form_field(PopplerFormField *field);
 
 #endif

data/ext/poppler/rbpopplerconversions.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2006-2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006-2013  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

data/sample/pdf2.rb

@@ -1,17 +1,53 @@
 #!/usr/bin/env ruby
 
-require 'tempfile'
+require "tempfile"
+require "optparse"
 require "poppler"
 require "gdk_pixbuf2"
 
-if ARGV.size < 2
-  puts "usage: #{$0} input.pdf output [scale_ratio] [rotate_angle]"
-  exit(-1)
+page = 0
+scale = 1.0
+rotate = 0
+
+parser = OptionParser.new
+parser.banner = <<-BANNER
+Usage: #{parser.program_name} INPUT.PDF OUTPUT [options]
+
+#{parser.program_name} coverts the target page in INPUT.PDF to an image file.
+Many popular image formats such as PNG and JPEG are supported.
+You can specify output image format by OUTPUT file extension.
+For example, the following comand generates PNG file:
+
+  % #{$0} INPUT.PDF OUTPUT.png
+
+BANNER
+
+parser.on("--page=PAGE", Integer,
+          "Use PAGE as the target page",
+          "(0-origin)",
+          "[#{page}]") do |value|
+  page = value.to_i
 end
 
-input, output, scale, rotate = ARGV
-scale = (scale || 1.0).to_f
-rotate = (rotate || 0).to_i % 360
+parser.on("--scale=RATIO", Float,
+          "Scale the target page in INPUT.PDF RATIO times larger in OUTPUT",
+          "[#{scale}]") do |value|
+  scale = value.to_f
+end
+
+parser.on("--rotate=DEGREE", Integer,
+          "Rotate the target page in INPUT.PDF DEGREE degrees clockwise in OUTPUT",
+          "(available values: 0...360)",
+          "[#{rotate}]") do |value|
+  rotate = value.to_i % 360
+end
+
+rest_args = parser.parse!
+if rest_args.size != 2
+  puts(parser.help)
+  exit(false)
+end
+input, output = rest_args
 
 ext_name = File.extname(output)[1..-1]
 if ext_name
@@ -52,9 +88,9 @@ def compute_size(width, height, rotate)
   end
 end
 
-def to_pixbuf_with_cairo(input, scale, rotate)
+def to_pixbuf_with_cairo(input, page_number, scale, rotate)
   doc = Poppler::Document.new(input)
-  page = doc[0]
+  page = doc[page_number]
   width, height = page.size.collect {|x| x * scale}
   surface_width, surface_height = compute_size(width, height, rotate)
 
@@ -86,7 +122,7 @@ unless Poppler.cairo_available?
   puts "cairo isn't available."
   exit(false)
 end
-pixbuf = to_pixbuf_with_cairo(input, scale, rotate)
+pixbuf = to_pixbuf_with_cairo(input, page, scale, rotate)
 
 if pixbuf.nil?
   puts "Is it a PDF file?: #{input}"

data/test/run-test.rb

@@ -2,21 +2,24 @@
 
 base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 
-if system("which make > /dev/null")
-  system("cd #{base_dir.dump} && make > /dev/null") or exit(1)
-end
+have_make = system("which make > /dev/null")
 
 glib_dir = File.expand_path(File.join(base_dir, "..", "glib2"))
 gdk_pixbuf_dir = File.expand_path(File.join(base_dir, "..", "gdk_pixbuf2"))
+pango_dir = File.join(File.join(base_dir, ".." , "pango"))
 gtk_dir = File.expand_path(File.join(base_dir, "..", "gtk2"))
 
 $LOAD_PATH.unshift(File.join(glib_dir, "test"))
 require 'glib-test-init'
 
 [[gtk_dir, "gtk2"],
- [gdk_pixbuf_dir, "gdk_pibuf2"],
+ [gdk_pixbuf_dir, "gdk_pixbuf2"],
+ [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)
+  end
   $LOAD_PATH.unshift(File.join(dir, "ext", module_name))
   $LOAD_PATH.unshift(File.join(dir, "lib"))
 end

data/test/test_page.rb

@@ -31,6 +31,7 @@ class TestPage < Test::Unit::TestCase
   end
 
   def test_render
+    only_poppler_version(0, 20, 0)
     document = Poppler::Document.new(image_pdf)
     page = document[0]
     png = StringIO.new

metadata

@@ -1,16 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: poppler
 version: !ruby/object:Gem::Version
-  version: 2.0.2
-  prerelease: 
+  version: 2.0.3
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
-dependencies: []
+date: 2013-12-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: cairo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.12.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.12.8
+- !ruby/object:Gem::Dependency
+  name: gdk_pixbuf2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
 description: Ruby/Poppler is a Ruby binding of poppler-glib.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -26,30 +53,30 @@ files:
 - ext/poppler/extconf.rb
 - ext/poppler/poppler.def
 - ext/poppler/rbpoppler-action.c
+- ext/poppler/rbpoppler-annotation-callout-line.c
+- ext/poppler/rbpoppler-annotation-free-text.c
+- ext/poppler/rbpoppler-annotation-mapping.c
+- ext/poppler/rbpoppler-annotation-markup.c
+- ext/poppler/rbpoppler-annotation-text.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-attachment.c
-- ext/poppler/rbpoppler-buttonfield.c
-- ext/poppler/rbpoppler-choicefield.c
+- ext/poppler/rbpoppler-button-field.c
+- ext/poppler/rbpoppler-choice-field.c
 - ext/poppler/rbpoppler-color.c
 - ext/poppler/rbpoppler-document.c
-- ext/poppler/rbpoppler-fontinfo.c
-- ext/poppler/rbpoppler-fontsiter.c
+- ext/poppler/rbpoppler-font-info.c
+- ext/poppler/rbpoppler-fonts-iter.c
+- ext/poppler/rbpoppler-form-field-mapping.c
 - ext/poppler/rbpoppler-form-field.c
-- ext/poppler/rbpoppler-formfieldmapping.c
-- ext/poppler/rbpoppler-imagemapping.c
-- ext/poppler/rbpoppler-indexiter.c
-- ext/poppler/rbpoppler-linkmapping.c
+- ext/poppler/rbpoppler-image-mapping.c
+- ext/poppler/rbpoppler-index-iter.c
+- ext/poppler/rbpoppler-link-mapping.c
+- ext/poppler/rbpoppler-page-transition.c
 - ext/poppler/rbpoppler-page.c
-- ext/poppler/rbpoppler-pagetransition.c
 - ext/poppler/rbpoppler-private.h
-- ext/poppler/rbpoppler-psfile.c
+- ext/poppler/rbpoppler-ps-file.c
 - ext/poppler/rbpoppler-rectangle.c
-- ext/poppler/rbpoppler-textfield.c
+- ext/poppler/rbpoppler-text-field.c
 - ext/poppler/rbpoppler.c
 - ext/poppler/rbpoppler.h
 - ext/poppler/rbpopplerconversions.h
@@ -70,26 +97,25 @@ files:
 - test/test_page.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.5
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby/Poppler is a Ruby binding of poppler-glib.
 test_files: []