poppler 0.90.2.3 → 0.90.3

data/ChangeLog

@@ -1,3 +1,14 @@
+2010-10-08  Guillaume Cottenceau
+
+	* RVAL2CSTR2 is deprecated, replace with RVAL2CSTR_ACCEPT_NIL
+
+	* CSTR2RVAL2 is deprecated, replace with CSTR2RVAL_FREE
+
+2010-10-03  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/poppler/rbpoppler-page.c: support Poppler 0.15.0. [#3079667]
+	Reported by Mamoru Tasaka. Thanks!!!
+
 2010-09-29  Kouhei Sutou  <kou@cozmixng.org>
 
 	* Rakefile: fix dependencies.

data/ext/poppler/depend

@@ -1,3 +1,5 @@
 install:
-	$(MAKEDIRS) $(libdir)/pkgconfig
-	$(INSTALL_DATA) ruby-poppler.pc $(libdir)/pkgconfig
+	if test -n "$(pkgconfigdir)"; then			\
+	  $(MAKEDIRS) $(pkgconfigdir);				\
+	  $(INSTALL_DATA) ruby-poppler.pc $(pkgconfigdir);	\
+	fi

data/ext/poppler/rbpoppler-form-field.c

@@ -109,7 +109,7 @@ text_field_get_text(VALUE self)
 static VALUE
 text_field_set_text(VALUE self, VALUE text)
 {
-    poppler_form_field_text_set_text(RVAL2TF(self), RVAL2CSTR2(text));
+    poppler_form_field_text_set_text(RVAL2TF(self), RVAL2CSTR_ACCEPT_NIL(text));
     return Qnil;
 }
 
@@ -219,7 +219,7 @@ choice_field_toggle_item(VALUE self, VALUE index)
 static VALUE
 choice_field_set_text(VALUE self, VALUE text)
 {
-    poppler_form_field_choice_set_text(RVAL2CF(self), RVAL2CSTR2(text));
+    poppler_form_field_choice_set_text(RVAL2CF(self), RVAL2CSTR_ACCEPT_NIL(text));
     return Qnil;
 }
 

data/ext/poppler/rbpoppler-page.c

@@ -332,6 +332,9 @@ page_get_text(int argc, VALUE *argv, VALUE self)
     }
 
     if (NIL_P(rb_rect)) {
+#if POPPLER_CHECK_VERSION(0, 15, 0)
+        text = poppler_page_get_text(page);
+#else
         PopplerRectangle rect;
         double width, height;
 
@@ -343,10 +346,16 @@ page_get_text(int argc, VALUE *argv, VALUE self)
         text = poppler_page_get_text(page,
                                      style,
                                      &rect);
+#endif
     } else {
-        text = poppler_page_get_text(page,
-                                     style,
-                                     RVAL2POPPLER_RECT(rb_rect));
+        PopplerRectangle *rect;
+
+	rect = RVAL2POPPLER_RECT(rb_rect);
+#if POPPLER_CHECK_VERSION(0, 15, 0)
+        text = poppler_page_get_selected_text(page, style, rect);
+#else
+        text = poppler_page_get_text(page, style, rect);
+#endif
     }
 
     rb_text = CSTR2RVAL(text);

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: poppler
 version: !ruby/object:Gem::Version 
-  hash: 657
+  hash: 369
   prerelease: false
   segments: 
   - 0
   - 90
-  - 2
   - 3
-  version: 0.90.2.3
+  version: 0.90.3
 platform: ruby
 authors: 
 - The Ruby-GNOME2 Proejct Team
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-03 00:00:00 +09:00
+date: 2010-10-23 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 371
+        hash: 369
         segments: 
         - 0
         - 90
-        - 2
-        version: 0.90.2
+        - 3
+        version: 0.90.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -59,12 +58,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 371
+        hash: 369
         segments: 
         - 0
         - 90
-        - 2
-        version: 0.90.2
+        - 3
+        version: 0.90.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -75,12 +74,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 371
+        hash: 369
         segments: 
         - 0
         - 90
-        - 2
-        version: 0.90.2
+        - 3
+        version: 0.90.3
   type: :runtime
   version_requirements: *id004
 description: Ruby/Poppler is a Ruby binding of poppler-glib.