poppler 2.0.2-x86-mingw32 → 2.0.3-x86-mingw32

data/ext/poppler/{rbpoppler-annotationcalloutline.c → rbpoppler-annotation-callout-line.c}

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2008  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008-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
@@ -87,7 +86,7 @@ rg_inspect(VALUE self)
 }
 
 void
-Init_poppler_annotationcalloutline(VALUE mPoppler)
+Init_poppler_annotation_callout_line(VALUE mPoppler)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_ANNOT_CALLOUT_LINE,
                                          "AnnotationCalloutLine", mPoppler);

data/ext/poppler/{rbpoppler-annotationfreetext.c → rbpoppler-annotation-free-text.c}

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2008  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008-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
@@ -37,7 +36,7 @@ rg_callout_line(VALUE self)
 }
 
 void
-Init_poppler_annotationfreetext(VALUE mPoppler)
+Init_poppler_annotation_free_text(VALUE mPoppler)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_ANNOT_FREE_TEXT,
                                       "AnnotationFreeText", mPoppler);

data/ext/poppler/{rbpoppler-annotationmapping.c → rbpoppler-annotation-mapping.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
@@ -57,7 +56,7 @@ rg_set_annotation(VALUE self, VALUE annotation)
 }
 
 void
-Init_poppler_annotationmapping(VALUE mPoppler)
+Init_poppler_annotation_mapping(VALUE mPoppler)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_ANNOT_MAPPING,
                                              "AnnotationMapping", mPoppler);

data/ext/poppler/{rbpoppler-annotationmarkup.c → rbpoppler-annotation-markup.c}

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2008  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008-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
@@ -79,12 +78,14 @@ rg_external_data(VALUE self)
 }
 
 void
-Init_poppler_annotationmarkup(VALUE mPoppler)
+Init_poppler_annotation_markup(VALUE mPoppler)
 {
+    VALUE RG_TARGET_NAMESPACE;
+
     id_new = rb_intern("new");
     rb_cDate = rb_const_get(rb_cObject, rb_intern("Date"));
 
-    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_ANNOT_MARKUP,
+    RG_TARGET_NAMESPACE= G_DEF_CLASS(POPPLER_TYPE_ANNOT_MARKUP,
                                     "AnnotationMarkup", mPoppler);
 
     RG_DEF_METHOD(label, 0);

data/ext/poppler/{rbpoppler-annotationtext.c → rbpoppler-annotation-text.c}

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2008  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008-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
@@ -33,11 +32,7 @@ rg_open_p(VALUE self)
 static VALUE
 rg_icon(VALUE self)
 {
-#if POPPLER_CHECK_VERSION(0, 9, 0)
     return CSTR2RVAL_FREE(poppler_annot_text_get_icon(SELF(self)));
-#else
-    return POPPLERANNOTTEXTICON2RVAL(poppler_annot_text_get_icon(SELF(self)));
-#endif
 }
 
 static VALUE
@@ -47,7 +42,7 @@ rg_state(VALUE self)
 }
 
 void
-Init_poppler_annotationtext(VALUE mPoppler)
+Init_poppler_annotation_text(VALUE mPoppler)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_ANNOT_TEXT,
                                   "AnnotationText", mPoppler);

data/ext/poppler/{rbpoppler-fontinfo.c → rbpoppler-font-info.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
@@ -25,8 +24,6 @@
 
 static VALUE RG_TARGET_NAMESPACE;
 
-#if POPPLER_CHECK_VERSION(0, 6, 0)
-
 static ID id_valid;
 
 static VALUE
@@ -49,17 +46,14 @@ rg_scan(VALUE self, VALUE n_pages)
     }
     return rb_iter;
 }
-#endif
 
 void
-Init_poppler_fontinfo(VALUE mPoppler)
+Init_poppler_font_info(VALUE mPoppler)
 {
     id_valid = rb_intern("valid?");
 
     RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_FONT_INFO, "FontInfo", mPoppler);
 
-#if POPPLER_CHECK_VERSION(0, 6, 0)
     RG_DEF_METHOD(initialize, 1);
     RG_DEF_METHOD(scan, 1);
-#endif
 }

data/ext/poppler/{rbpoppler-fontsiter.c → rbpoppler-fonts-iter.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
@@ -105,19 +104,19 @@ rg_each(VALUE self)
 }
 
 void
-Init_poppler_fontsiter(VALUE mPoppler)
+Init_poppler_fonts_iter(VALUE mPoppler)
 {
+    VALUE RG_TARGET_NAMESPACE;
+
     id_valid = rb_intern("valid?");
 
-    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_FONTS_ITER, "FontsIter", mPoppler);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_FONTS_ITER, "FontsIter", mPoppler);
 
     rb_include_module(RG_TARGET_NAMESPACE, rb_mEnumerable);
 
     RG_DEF_METHOD(name, 0);
     RG_DEF_METHOD(full_name, 0);
-#if POPPLER_CHECK_VERSION(0, 6, 0)
     RG_DEF_METHOD(file_name, 0);
-#endif
     RG_DEF_METHOD(font_type, 0);
     RG_DEF_METHOD_P(embedded, 0);
     RG_DEF_METHOD_P(subset, 0);

data/ext/poppler/{rbpoppler-formfieldmapping.c → rbpoppler-form-field-mapping.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
@@ -29,7 +28,7 @@ DEF_ACCESSOR(form_field_mapping, field, RVAL2POPPLERFORMFIELDMAPPING,
              POPPLERFORMFIELD2RVAL, RVAL2POPPLERFORMFIELD)
 
 void
-Init_poppler_formfieldmapping(VALUE mPoppler)
+Init_poppler_form_field_mapping(VALUE mPoppler)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_FORM_FIELD_MAPPING,
                                     "FormFieldMapping", mPoppler);

data/ext/poppler/{rbpoppler-imagemapping.c → rbpoppler-image-mapping.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
@@ -26,26 +25,22 @@
 DEF_ACCESSOR_WITH_SETTER(image_mapping, area,
                          RVAL2POPPLERIMAGEMAPPING, RECT_ENTITY2RVAL, RECT_ENTITY_SET)
 DEF_ACCESSOR(image_mapping, image_id, RVAL2POPPLERIMAGEMAPPING, INT2NUM, NUM2INT)
-#ifdef RB_POPPLER_CAIRO_AVAILABLE
 static VALUE
 rg_image(VALUE self)
 {
     return rb_funcall(rb_iv_get(self, "@page"), rb_intern("get_image"),
                         1, INT2NUM(RVAL2POPPLERIMAGEMAPPING(self)->image_id));
 }
-#endif
 
 void
-Init_poppler_imagemapping(VALUE mPoppler)
+Init_poppler_image_mapping(VALUE mPoppler)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_IMAGE_MAPPING,
                                 "ImageMapping", mPoppler);
 
     rbg_define_method(RG_TARGET_NAMESPACE, "area", image_mapping_get_area, 0);
     rbg_define_method(RG_TARGET_NAMESPACE, "image_id", image_mapping_get_image_id, 0);
-#ifdef RB_POPPLER_CAIRO_AVAILABLE
     RG_DEF_METHOD(image, 0);
-#endif
 
     rbg_define_method(RG_TARGET_NAMESPACE, "set_area", image_mapping_set_area, 1);
     rbg_define_method(RG_TARGET_NAMESPACE, "set_image_id",

data/ext/poppler/{rbpoppler-indexiter.c → rbpoppler-index-iter.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
@@ -107,7 +106,7 @@ rg_each(VALUE self)
 }
 
 void
-Init_poppler_indexiter(VALUE mPoppler)
+Init_poppler_index_iter(VALUE mPoppler)
 {
     id_valid = rb_intern("valid?");
 

data/ext/poppler/{rbpoppler-linkmapping.c → rbpoppler-link-mapping.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
@@ -35,7 +34,7 @@ DEF_ACCESSOR(link_mapping, action, RVAL2POPPLERLINKMAPPING,
              POPPLERACTION2RVAL, RVAL2POPPLERACTION)
 
 void
-Init_poppler_linkmapping(VALUE mPoppler)
+Init_poppler_link_mapping(VALUE mPoppler)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_LINK_MAPPING, "LinkMapping",
                                mPoppler);

data/ext/poppler/{rbpoppler-pagetransition.c → rbpoppler-page-transition.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
@@ -32,7 +31,7 @@ DEF_ACCESSOR(page_trans, scale, RVAL2POPPLERPAGETRANSITION, NUM2DBL, rb_float_ne
 DEF_ACCESSOR(page_trans, rectangular, RVAL2POPPLERPAGETRANSITION, RVAL2CBOOL, CBOOL2RVAL)
 
 void
-Init_poppler_pagetransition(VALUE mPoppler)
+Init_poppler_page_transition(VALUE mPoppler)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_PAGE_TRANSITION,
                                   "PageTransition", mPoppler);

data/ext/poppler/rbpoppler-page.c

@@ -27,14 +27,12 @@
 static VALUE cRectangle;
 static VALUE cPSFile;
 
-#ifdef RB_POPPLER_CAIRO_AVAILABLE
 static VALUE
 page_render(VALUE self, VALUE cairo)
 {
     poppler_page_render(SELF(self), RVAL2CRCONTEXT(cairo));
     return Qnil;
 }
-#endif
 
 static VALUE
 page_render_to_ps(VALUE self, VALUE ps_file)
@@ -49,34 +47,23 @@ rg_render(VALUE self, VALUE ps_file_or_cairo)
     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, ps_file_or_cairo);
-#else
-        rb_raise(rb_eArgError, "cairo is not available");
-#endif
     }
 }
 
-#ifdef RB_POPPLER_CAIRO_AVAILABLE
 static VALUE
 page_render_for_printing(VALUE self, VALUE cairo)
 {
     poppler_page_render_for_printing(SELF(self), RVAL2CRCONTEXT(cairo));
     return Qnil;
 }
-#endif
 
 static VALUE
 rg_render_for_printing(VALUE self, VALUE cairo)
 {
-#ifdef RB_POPPLER_CAIRO_AVAILABLE
     return page_render_for_printing(self, cairo);
-#else
-    rb_raise(rb_eArgError, "cairo is not available");
-#endif
 }
 
-#ifdef RB_POPPLER_CAIRO_AVAILABLE
 static VALUE
 page_render_selection(VALUE self, VALUE cairo,
                       VALUE selection, VALUE rb_old_selection,
@@ -94,19 +81,14 @@ page_render_selection(VALUE self, VALUE cairo,
                                   RVAL2POPPLERCOLOR(background_color));
     return Qnil;
 }
-#endif
 
 static VALUE
 rg_render_selection(VALUE self,
                     VALUE cairo, VALUE selection, VALUE old_selection,
                     VALUE style, VALUE glyph_color, VALUE background_color)
 {
-#ifdef RB_POPPLER_CAIRO_AVAILABLE
     return page_render_selection(self, cairo, selection, old_selection,
                                  style, glyph_color, background_color);
-#else
-    rb_raise(rb_eArgError, "cairo is not available");
-#endif
 }
 
 static VALUE
@@ -135,13 +117,11 @@ rg_transition(VALUE self)
     return POPPLERPAGETRANSITION2RVAL(poppler_page_get_transition(SELF(self)));
 }
 
-#if RB_POPPLER_CAIRO_AVAILABLE
 static VALUE
 rg_thumbnail(VALUE self)
 {
     return CRSURFACE2RVAL(poppler_page_get_thumbnail(SELF(self)));
 }
-#endif
 
 static VALUE
 rg_thumbnail_size(VALUE self)
@@ -273,23 +253,18 @@ rg_image_mapping(VALUE self)
 
         image_mapping = node->data;
         mapping = POPPLERIMAGEMAPPING2RVAL(image_mapping);
-#ifdef RB_POPPLER_CAIRO_AVAILABLE
         rb_iv_set(mapping, "@page", self);
-#endif
-        rb_ary_push(mappings, mapping);
     }
     poppler_page_free_image_mapping(image_mapping);
 
     return mappings;
 }
 
-#ifdef RB_POPPLER_CAIRO_AVAILABLE
 static VALUE
 rg_get_image(VALUE self, VALUE image_id)
 {
     return CRSURFACE2RVAL(poppler_page_get_image(SELF(self), NUM2INT(image_id)));
 }
-#endif
 
 static VALUE
 rg_form_field_mapping(VALUE self)
@@ -328,9 +303,7 @@ Init_poppler_page(VALUE mPoppler)
     RG_DEF_METHOD(duration, 0);
     RG_DEF_METHOD(transition, 0);
 
-#if RB_POPPLER_CAIRO_AVAILABLE
     RG_DEF_METHOD(thumbnail, 0);
-#endif
     RG_DEF_METHOD(thumbnail_size, 0);
     RG_DEF_METHOD(find_text, 1);
     RG_DEF_METHOD(get_text, -1);
@@ -340,9 +313,7 @@ Init_poppler_page(VALUE mPoppler)
     RG_DEF_METHOD(get_selection_region, 3);
     RG_DEF_METHOD(link_mapping, 0);
     RG_DEF_METHOD(image_mapping, 0);
-#if RB_POPPLER_CAIRO_AVAILABLE
     RG_DEF_METHOD(get_image, 1);
-#endif
 
     RG_DEF_METHOD(form_field_mapping, 0);
     RG_DEF_METHOD(annotation_mapping, 0);

data/ext/poppler/rbpoppler-private.h

@@ -5,26 +5,26 @@
 
 #define RVAL2GDKPIXBUF(o) (GDK_PIXBUF(RVAL2GOBJ(o)))
 
-G_GNUC_INTERNAL void Init_poppler_indexiter(VALUE mPoppler);
-G_GNUC_INTERNAL void Init_poppler_fontinfo(VALUE mPoppler);
+G_GNUC_INTERNAL void Init_poppler_index_iter(VALUE mPoppler);
+G_GNUC_INTERNAL void Init_poppler_font_info(VALUE mPoppler);
 G_GNUC_INTERNAL void Init_poppler_document(VALUE mPoppler);
-G_GNUC_INTERNAL void Init_poppler_fontsiter(VALUE mPoppler);
-G_GNUC_INTERNAL void Init_poppler_psfile(VALUE mPoppler);
+G_GNUC_INTERNAL void Init_poppler_fonts_iter(VALUE mPoppler);
+G_GNUC_INTERNAL void Init_poppler_ps_file(VALUE mPoppler);
 G_GNUC_INTERNAL void Init_poppler_rectangle(VALUE mPoppler);
 G_GNUC_INTERNAL void Init_poppler_page(VALUE mPoppler);
 G_GNUC_INTERNAL void Init_poppler_color(VALUE mPoppler);
-G_GNUC_INTERNAL void Init_poppler_linkmapping(VALUE mPoppler);
-G_GNUC_INTERNAL void Init_poppler_pagetransition(VALUE mPoppler);
-G_GNUC_INTERNAL void Init_poppler_imagemapping(VALUE mPoppler);
-G_GNUC_INTERNAL void Init_poppler_formfieldmapping(VALUE mPoppler);
-G_GNUC_INTERNAL void Init_poppler_annotationmapping(VALUE mPoppler);
+G_GNUC_INTERNAL void Init_poppler_link_mapping(VALUE mPoppler);
+G_GNUC_INTERNAL void Init_poppler_page_transition(VALUE mPoppler);
+G_GNUC_INTERNAL void Init_poppler_image_mapping(VALUE mPoppler);
+G_GNUC_INTERNAL void Init_poppler_form_field_mapping(VALUE mPoppler);
+G_GNUC_INTERNAL void Init_poppler_annotation_mapping(VALUE mPoppler);
 G_GNUC_INTERNAL void Init_poppler_attachment(VALUE mPoppler);
 G_GNUC_INTERNAL void Init_poppler_action(VALUE mPoppler);
 G_GNUC_INTERNAL void Init_poppler_annotation(VALUE mPoppler);
-G_GNUC_INTERNAL void Init_poppler_annotationmarkup(VALUE mPoppler);
-G_GNUC_INTERNAL void Init_poppler_annotationtext(VALUE mPoppler);
-G_GNUC_INTERNAL void Init_poppler_annotationfreetext(VALUE mPoppler);
-G_GNUC_INTERNAL void Init_poppler_annotationcalloutline(VALUE mPoppler);
+G_GNUC_INTERNAL void Init_poppler_annotation_markup(VALUE mPoppler);
+G_GNUC_INTERNAL void Init_poppler_annotation_text(VALUE mPoppler);
+G_GNUC_INTERNAL void Init_poppler_annotation_free_text(VALUE mPoppler);
+G_GNUC_INTERNAL void Init_poppler_annotation_callout_line(VALUE mPoppler);
 G_GNUC_INTERNAL void Init_poppler_form_field(VALUE mPoppler);
 G_GNUC_INTERNAL void Init_poppler_button_field(VALUE mPoppler, VALUE cFormField);
 G_GNUC_INTERNAL void Init_poppler_text_field(VALUE mPoppler, VALUE cFormField);