poppler 1.1.2-x86-mingw32 → 1.1.3-x86-mingw32

Sign up to get free protection for your applications and to get access to all the features.
@@ -56,7 +56,6 @@ check_cairo(rcairo_options)
56
56
  setup_win32(module_name, base_dir)
57
57
 
58
58
  PKGConfig.have_package(package_id) or exit 1
59
- PKGConfig.have_package('poppler-cairo')
60
59
 
61
60
  unless have_macro("POPPLER_MAJOR_VERSION", ["poppler.h"])
62
61
  make_version_header("POPPLER", package_id, ".")
@@ -58,7 +58,7 @@ action_ ## type ## _ ## name (VALUE self) \
58
58
  }
59
59
 
60
60
  #define DEFINE_ACCESSOR(prefix, target, name) \
61
- rb_define_method(target, G_STRINGIFY(name), prefix ## _ ## name, 0);
61
+ rbg_define_method(target, G_STRINGIFY(name), prefix ## _ ## name, 0);
62
62
 
63
63
  #define DEFINE_ACTION_ACCESSOR(target, type, name) \
64
64
  DEFINE_ACCESSOR(action_ ## type, target, name)
@@ -165,7 +165,7 @@ Init_poppler_action(VALUE mPoppler)
165
165
  cAction = G_DEF_CLASS(POPPLER_TYPE_ACTION, "Action", mPoppler);
166
166
 
167
167
  cActionAny = rb_define_class_under(mPoppler, "ActionAny", cAction);
168
- rb_define_method(cActionAny, "type", action_any_type, 0);
168
+ rbg_define_method(cActionAny, "type", action_any_type, 0);
169
169
  DEFINE_ACTION_ACCESSOR(cActionAny, any, title);
170
170
 
171
171
  cActionGotoDest = rb_define_class_under(mPoppler, "ActionGotoDest",
@@ -197,21 +197,12 @@ Init_poppler_action(VALUE mPoppler)
197
197
  actions[POPPLER_ACTION_NAMED] = cActionNamed;
198
198
  actions[POPPLER_ACTION_MOVIE] = cActionMovie;
199
199
 
200
- G_DEF_SETTERS(cAction);
201
- G_DEF_SETTERS(cActionAny);
202
- G_DEF_SETTERS(cActionGotoDest);
203
- G_DEF_SETTERS(cActionGotoRemote);
204
- G_DEF_SETTERS(cActionLaunch);
205
- G_DEF_SETTERS(cActionUri);
206
- G_DEF_SETTERS(cActionNamed);
207
- G_DEF_SETTERS(cActionMovie);
208
-
209
200
  G_DEF_CLASS(POPPLER_TYPE_ACTION_TYPE, "ActionType", mPoppler);
210
201
  G_DEF_CLASS(POPPLER_TYPE_DEST_TYPE, "DestType", mPoppler);
211
202
 
212
203
  cDest = G_DEF_CLASS(POPPLER_TYPE_DEST, "Dest", mPoppler);
213
204
 
214
- rb_define_method(cDest, "type", dest_get_type, 0);
205
+ rbg_define_method(cDest, "type", dest_get_type, 0);
215
206
  DEFINE_DEST_ACCESSOR(cDest, page_num);
216
207
  DEFINE_DEST_ACCESSOR(cDest, left);
217
208
  DEFINE_DEST_ACCESSOR(cDest, bottom);
@@ -222,5 +213,4 @@ Init_poppler_action(VALUE mPoppler)
222
213
  DEFINE_DEST_ACCESSOR(cDest, change_left);
223
214
  DEFINE_DEST_ACCESSOR(cDest, change_top);
224
215
  DEFINE_DEST_ACCESSOR(cDest, change_zoom);
225
- G_DEF_SETTERS(cDest);
226
216
  }
@@ -94,37 +94,35 @@ Init_poppler_annotationcalloutline(VALUE mPoppler)
94
94
 
95
95
  RG_DEF_METHOD(initialize, 7);
96
96
 
97
- rb_define_method(RG_TARGET_NAMESPACE, "multiline?",
97
+ rbg_define_method(RG_TARGET_NAMESPACE, "multiline?",
98
98
  annot_callout_line_get_multiline, 0);
99
- rb_define_method(RG_TARGET_NAMESPACE, "set_multiline",
99
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_multiline",
100
100
  annot_callout_line_set_multiline, 1);
101
- rb_define_method(RG_TARGET_NAMESPACE, "x1",
101
+ rbg_define_method(RG_TARGET_NAMESPACE, "x1",
102
102
  annot_callout_line_get_x1, 0);
103
- rb_define_method(RG_TARGET_NAMESPACE, "set_x1",
103
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_x1",
104
104
  annot_callout_line_set_x1, 1);
105
- rb_define_method(RG_TARGET_NAMESPACE, "y1",
105
+ rbg_define_method(RG_TARGET_NAMESPACE, "y1",
106
106
  annot_callout_line_get_y1, 0);
107
- rb_define_method(RG_TARGET_NAMESPACE, "set_y1",
107
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_y1",
108
108
  annot_callout_line_set_y1, 1);
109
- rb_define_method(RG_TARGET_NAMESPACE, "x2",
109
+ rbg_define_method(RG_TARGET_NAMESPACE, "x2",
110
110
  annot_callout_line_get_x2, 0);
111
- rb_define_method(RG_TARGET_NAMESPACE, "set_x2",
111
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_x2",
112
112
  annot_callout_line_set_x2, 2);
113
- rb_define_method(RG_TARGET_NAMESPACE, "y2",
113
+ rbg_define_method(RG_TARGET_NAMESPACE, "y2",
114
114
  annot_callout_line_get_y2, 0);
115
- rb_define_method(RG_TARGET_NAMESPACE, "set_y2",
115
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_y2",
116
116
  annot_callout_line_set_y2, 2);
117
- rb_define_method(RG_TARGET_NAMESPACE, "x3",
117
+ rbg_define_method(RG_TARGET_NAMESPACE, "x3",
118
118
  annot_callout_line_get_x3, 0);
119
- rb_define_method(RG_TARGET_NAMESPACE, "set_x3",
119
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_x3",
120
120
  annot_callout_line_set_x3, 3);
121
- rb_define_method(RG_TARGET_NAMESPACE, "y3",
121
+ rbg_define_method(RG_TARGET_NAMESPACE, "y3",
122
122
  annot_callout_line_get_y3, 0);
123
- rb_define_method(RG_TARGET_NAMESPACE, "set_y3",
123
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_y3",
124
124
  annot_callout_line_set_y3, 3);
125
125
 
126
126
  RG_DEF_METHOD(to_a, 0);
127
127
  RG_DEF_METHOD(inspect, 0);
128
-
129
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
130
128
  }
@@ -64,12 +64,10 @@ Init_poppler_annotationmapping(VALUE mPoppler)
64
64
 
65
65
  RG_DEF_METHOD(initialize, -1);
66
66
 
67
- rb_define_method(RG_TARGET_NAMESPACE, "area", annot_mapping_get_area, 0);
68
- rb_define_method(RG_TARGET_NAMESPACE, "annotation",
67
+ rbg_define_method(RG_TARGET_NAMESPACE, "area", annot_mapping_get_area, 0);
68
+ rbg_define_method(RG_TARGET_NAMESPACE, "annotation",
69
69
  annot_mapping_get_annotation, 0);
70
70
 
71
- rb_define_method(RG_TARGET_NAMESPACE, "set_area", annot_mapping_set_area, 1);
71
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_area", annot_mapping_set_area, 1);
72
72
  RG_DEF_METHOD(set_annotation, 1);
73
-
74
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
75
73
  }
@@ -28,7 +28,7 @@ static ID id_call;
28
28
 
29
29
  static gboolean
30
30
  attachment_save_func(const gchar *buf, gsize count, gpointer data,
31
- GError **error)
31
+ G_GNUC_UNUSED GError **error)
32
32
  {
33
33
  VALUE result;
34
34
  VALUE callback = (VALUE)data;
@@ -121,6 +121,4 @@ Init_poppler_attachment(VALUE mPoppler)
121
121
  RG_DEF_METHOD(mtime, 0);
122
122
  RG_DEF_METHOD(ctime, 0);
123
123
  RG_DEF_METHOD(checksum, 0);
124
-
125
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
126
124
  }
@@ -53,6 +53,4 @@ Init_poppler_button_field(VALUE mPoppler, VALUE cFormField)
53
53
  RG_DEF_METHOD(type, 0);
54
54
  RG_DEF_METHOD_P(active, 0);
55
55
  RG_DEF_METHOD(set_active, 1);
56
-
57
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
58
56
  }
@@ -128,6 +128,4 @@ Init_poppler_choice_field(VALUE mPoppler, VALUE cFormField)
128
128
  RG_DEF_METHOD(toggle, 1);
129
129
  RG_DEF_METHOD(text, 0);
130
130
  RG_DEF_METHOD(set_text, 1);
131
-
132
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
133
131
  }
@@ -108,15 +108,13 @@ Init_poppler_color(VALUE mPoppler)
108
108
  RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_COLOR, "Color", mPoppler);
109
109
 
110
110
  RG_DEF_METHOD(initialize, 3);
111
- rb_define_method(RG_TARGET_NAMESPACE, "red", color_get_red, 0);
112
- rb_define_method(RG_TARGET_NAMESPACE, "green", color_get_green, 0);
113
- rb_define_method(RG_TARGET_NAMESPACE, "blue", color_get_blue, 0);
114
- rb_define_method(RG_TARGET_NAMESPACE, "set_red", color_set_red, 1);
115
- rb_define_method(RG_TARGET_NAMESPACE, "set_green", color_set_green, 1);
116
- rb_define_method(RG_TARGET_NAMESPACE, "set_blue", color_set_blue, 1);
111
+ rbg_define_method(RG_TARGET_NAMESPACE, "red", color_get_red, 0);
112
+ rbg_define_method(RG_TARGET_NAMESPACE, "green", color_get_green, 0);
113
+ rbg_define_method(RG_TARGET_NAMESPACE, "blue", color_get_blue, 0);
114
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_red", color_set_red, 1);
115
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_green", color_set_green, 1);
116
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_blue", color_set_blue, 1);
117
117
  RG_DEF_METHOD(to_a, 0);
118
118
  RG_DEF_METHOD(inspect, 0);
119
-
120
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
121
119
  #endif
122
120
  }
@@ -221,6 +221,4 @@ Init_poppler_document(VALUE mPoppler)
221
221
 
222
222
  RG_DEF_METHOD(index_iter, 0);
223
223
  RG_DEF_METHOD(font_info, 0);
224
-
225
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
226
224
  }
@@ -19,7 +19,7 @@
19
19
  * MA 02110-1301 USA
20
20
  */
21
21
 
22
- #include "rbpoppler.h"
22
+ #include "rbpoppler-private.h"
23
23
 
24
24
  #define RG_TARGET_NAMESPACE cFontInfo
25
25
 
@@ -61,6 +61,5 @@ Init_poppler_fontinfo(VALUE mPoppler)
61
61
  #if POPPLER_CHECK_VERSION(0, 6, 0)
62
62
  RG_DEF_METHOD(initialize, 1);
63
63
  RG_DEF_METHOD(scan, 1);
64
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
65
64
  #endif
66
65
  }
@@ -125,6 +125,4 @@ Init_poppler_fontsiter(VALUE mPoppler)
125
125
 
126
126
  RG_DEF_METHOD_P(valid, 0);
127
127
  RG_DEF_METHOD(each, 0);
128
-
129
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
130
128
  }
@@ -88,8 +88,6 @@ Init_poppler_form_field(VALUE mPoppler)
88
88
  RG_DEF_METHOD(font_size, 0);
89
89
  RG_DEF_METHOD_P(read_only, 0);
90
90
 
91
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
92
-
93
91
  Init_poppler_button_field(mPoppler, RG_TARGET_NAMESPACE);
94
92
  Init_poppler_text_field(mPoppler, RG_TARGET_NAMESPACE);
95
93
  Init_poppler_choice_field(mPoppler, RG_TARGET_NAMESPACE);
@@ -34,14 +34,12 @@ Init_poppler_formfieldmapping(VALUE mPoppler)
34
34
  VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_FORM_FIELD_MAPPING,
35
35
  "FormFieldMapping", mPoppler);
36
36
 
37
- rb_define_method(RG_TARGET_NAMESPACE, "area", form_field_mapping_get_area, 0);
38
- rb_define_method(RG_TARGET_NAMESPACE, "field", form_field_mapping_get_field,
37
+ rbg_define_method(RG_TARGET_NAMESPACE, "area", form_field_mapping_get_area, 0);
38
+ rbg_define_method(RG_TARGET_NAMESPACE, "field", form_field_mapping_get_field,
39
39
  0);
40
40
 
41
- rb_define_method(RG_TARGET_NAMESPACE, "set_area",
41
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_area",
42
42
  form_field_mapping_set_area, 1);
43
- rb_define_method(RG_TARGET_NAMESPACE, "set_field",
43
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_field",
44
44
  form_field_mapping_set_field, 1);
45
-
46
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
47
45
  }
@@ -41,15 +41,13 @@ Init_poppler_imagemapping(VALUE mPoppler)
41
41
  VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_IMAGE_MAPPING,
42
42
  "ImageMapping", mPoppler);
43
43
 
44
- rb_define_method(RG_TARGET_NAMESPACE, "area", image_mapping_get_area, 0);
45
- rb_define_method(RG_TARGET_NAMESPACE, "image_id", image_mapping_get_image_id, 0);
44
+ rbg_define_method(RG_TARGET_NAMESPACE, "area", image_mapping_get_area, 0);
45
+ rbg_define_method(RG_TARGET_NAMESPACE, "image_id", image_mapping_get_image_id, 0);
46
46
  #ifdef RB_POPPLER_CAIRO_AVAILABLE
47
47
  RG_DEF_METHOD(image, 0);
48
48
  #endif
49
49
 
50
- rb_define_method(RG_TARGET_NAMESPACE, "set_area", image_mapping_set_area, 1);
51
- rb_define_method(RG_TARGET_NAMESPACE, "set_image_id",
50
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_area", image_mapping_set_area, 1);
51
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_image_id",
52
52
  image_mapping_set_image_id, 1);
53
-
54
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
55
53
  }
@@ -59,6 +59,7 @@ rg_child(VALUE self)
59
59
  CHECK_IITER_IS_VALID(self);
60
60
  child = poppler_index_iter_get_child(RVAL2POPPLERINDEXITER(self));
61
61
  rb_child = POPPLERINDEXITER2RVAL(child);
62
+ rb_ivar_set(rb_child, id_valid, CBOOL2RVAL(child));
62
63
  poppler_index_iter_free(child);
63
64
  return rb_child;
64
65
  }
@@ -125,6 +126,4 @@ Init_poppler_indexiter(VALUE mPoppler)
125
126
 
126
127
  RG_DEF_METHOD_P(valid, 0);
127
128
  RG_DEF_METHOD(each, 0);
128
-
129
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
130
129
  }
@@ -40,11 +40,9 @@ Init_poppler_linkmapping(VALUE mPoppler)
40
40
  VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_LINK_MAPPING, "LinkMapping",
41
41
  mPoppler);
42
42
 
43
- rb_define_method(RG_TARGET_NAMESPACE, "area", link_mapping_get_area, 0);
44
- rb_define_method(RG_TARGET_NAMESPACE, "action", link_mapping_get_action, 0);
43
+ rbg_define_method(RG_TARGET_NAMESPACE, "area", link_mapping_get_area, 0);
44
+ rbg_define_method(RG_TARGET_NAMESPACE, "action", link_mapping_get_action, 0);
45
45
 
46
- rb_define_method(RG_TARGET_NAMESPACE, "set_area", link_mapping_set_area, 1);
47
- rb_define_method(RG_TARGET_NAMESPACE, "set_action", link_mapping_set_action, 1);
48
-
49
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
46
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_area", link_mapping_set_area, 1);
47
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_action", link_mapping_set_action, 1);
50
48
  }
@@ -278,16 +278,16 @@ rg_get_text(int argc, VALUE *argv, VALUE self)
278
278
  rb_scan_args(argc, argv, "02", &arg1, &arg2);
279
279
 
280
280
  page = SELF(self);
281
- if (NIL_P(arg1)) {
282
- rb_rect = arg2;
283
- } else {
284
- if (RTEST(rb_obj_is_kind_of(arg2, cRectangle))) {
285
- rb_rect = arg2;
281
+ rb_rect = Qnil;
282
+ if (!NIL_P(arg1)) {
283
+ if (RTEST(rb_obj_is_kind_of(arg1, cRectangle))) {
284
+ rb_rect = arg1;
286
285
  } else {
287
- rb_rect = Qnil;
288
- if (!NIL_P(arg2)) {
289
- style = RVAL2POPPLERSELECTIONSTYLE(arg2);
290
- }
286
+ rb_raise(rb_eArgError, "wrong first arrument. selection rectangle is expected.");
287
+ }
288
+
289
+ if (!NIL_P(arg2)) {
290
+ style = RVAL2POPPLERSELECTIONSTYLE(arg2);
291
291
  }
292
292
  }
293
293
 
@@ -323,6 +323,31 @@ rg_get_text(int argc, VALUE *argv, VALUE self)
323
323
  return rb_text;
324
324
  }
325
325
 
326
+ #if POPPLER_CHECK_VERSION(0, 16, 0)
327
+ static VALUE
328
+ rg_text_layout(VALUE self)
329
+ {
330
+ PopplerRectangle *rectangles;
331
+ guint n_rectangles;
332
+
333
+ if (poppler_page_get_text_layout(SELF(self), &rectangles, &n_rectangles)) {
334
+ VALUE *rb_list, *p;
335
+ VALUE ary;
336
+ guint i;
337
+ rb_list = p = ALLOC_N(VALUE, n_rectangles);
338
+ for (i = 0; i < n_rectangles; i++, p++) {
339
+ *p = POPPLERRECTANGLE2RVAL(&rectangles[i]);
340
+ }
341
+ ary = rb_ary_new4(n_rectangles, rb_list);
342
+ free(rb_list);
343
+ free(rectangles);
344
+ return ary;
345
+ } else {
346
+ return Qnil;
347
+ }
348
+ }
349
+ #endif
350
+
326
351
  static VALUE
327
352
  rg_get_selection_region(VALUE self, VALUE scale, VALUE style, VALUE selection)
328
353
  {
@@ -418,6 +443,9 @@ Init_poppler_page(VALUE mPoppler)
418
443
  RG_DEF_METHOD(thumbnail_size, 0);
419
444
  RG_DEF_METHOD(find_text, 1);
420
445
  RG_DEF_METHOD(get_text, -1);
446
+ #if POPPLER_CHECK_VERSION(0, 16, 0)
447
+ RG_DEF_METHOD(text_layout, 0);
448
+ #endif
421
449
  RG_DEF_METHOD(get_selection_region, 3);
422
450
  RG_DEF_METHOD(link_mapping, 0);
423
451
  RG_DEF_METHOD(image_mapping, 0);
@@ -429,6 +457,4 @@ Init_poppler_page(VALUE mPoppler)
429
457
  RG_DEF_METHOD(annotation_mapping, 0);
430
458
  RG_DEF_METHOD(render_selection, -1);
431
459
  RG_DEF_METHOD(crop_box, 0);
432
-
433
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
434
460
  }
@@ -37,26 +37,24 @@ Init_poppler_pagetransition(VALUE mPoppler)
37
37
  VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_PAGE_TRANSITION,
38
38
  "PageTransition", mPoppler);
39
39
 
40
- rb_define_method(RG_TARGET_NAMESPACE, "type", page_trans_get_type, 0);
41
- rb_define_method(RG_TARGET_NAMESPACE, "alignment", page_trans_get_alignment, 0);
42
- rb_define_method(RG_TARGET_NAMESPACE, "direction", page_trans_get_direction, 0);
43
- rb_define_method(RG_TARGET_NAMESPACE, "duration", page_trans_get_duration, 0);
44
- rb_define_method(RG_TARGET_NAMESPACE, "angle", page_trans_get_angle, 0);
45
- rb_define_method(RG_TARGET_NAMESPACE, "scale", page_trans_get_scale, 0);
46
- rb_define_method(RG_TARGET_NAMESPACE, "rectangular",
40
+ rbg_define_method(RG_TARGET_NAMESPACE, "type", page_trans_get_type, 0);
41
+ rbg_define_method(RG_TARGET_NAMESPACE, "alignment", page_trans_get_alignment, 0);
42
+ rbg_define_method(RG_TARGET_NAMESPACE, "direction", page_trans_get_direction, 0);
43
+ rbg_define_method(RG_TARGET_NAMESPACE, "duration", page_trans_get_duration, 0);
44
+ rbg_define_method(RG_TARGET_NAMESPACE, "angle", page_trans_get_angle, 0);
45
+ rbg_define_method(RG_TARGET_NAMESPACE, "scale", page_trans_get_scale, 0);
46
+ rbg_define_method(RG_TARGET_NAMESPACE, "rectangular",
47
47
  page_trans_get_rectangular, 0);
48
48
 
49
- rb_define_method(RG_TARGET_NAMESPACE, "set_type", page_trans_set_type, 1);
50
- rb_define_method(RG_TARGET_NAMESPACE, "set_alignment",
49
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_type", page_trans_set_type, 1);
50
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_alignment",
51
51
  page_trans_set_alignment, 1);
52
- rb_define_method(RG_TARGET_NAMESPACE, "set_direction",
52
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_direction",
53
53
  page_trans_set_direction, 1);
54
- rb_define_method(RG_TARGET_NAMESPACE, "set_duration",
54
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_duration",
55
55
  page_trans_set_duration, 1);
56
- rb_define_method(RG_TARGET_NAMESPACE, "set_angle", page_trans_set_angle, 1);
57
- rb_define_method(RG_TARGET_NAMESPACE, "set_scale", page_trans_set_scale, 1);
58
- rb_define_method(RG_TARGET_NAMESPACE, "set_rectangular",
56
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_angle", page_trans_set_angle, 1);
57
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_scale", page_trans_set_scale, 1);
58
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_rectangular",
59
59
  page_trans_set_rectangular, 1);
60
-
61
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
62
60
  }
@@ -64,6 +64,4 @@ Init_poppler_psfile(VALUE mPoppler)
64
64
  RG_DEF_METHOD(initialize, 4);
65
65
  RG_DEF_METHOD(set_paper_size, 2);
66
66
  RG_DEF_METHOD(set_duplex, 1);
67
-
68
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
69
67
  }
@@ -79,16 +79,14 @@ Init_poppler_rectangle(VALUE mPoppler)
79
79
  RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_RECTANGLE, "Rectangle", mPoppler);
80
80
 
81
81
  RG_DEF_METHOD(initialize, 4);
82
- rb_define_method(RG_TARGET_NAMESPACE, "x1", rectangle_get_x1, 0);
83
- rb_define_method(RG_TARGET_NAMESPACE, "y1", rectangle_get_y1, 0);
84
- rb_define_method(RG_TARGET_NAMESPACE, "x2", rectangle_get_x2, 0);
85
- rb_define_method(RG_TARGET_NAMESPACE, "y2", rectangle_get_y2, 0);
86
- rb_define_method(RG_TARGET_NAMESPACE, "set_x1", rectangle_set_x1, 1);
87
- rb_define_method(RG_TARGET_NAMESPACE, "set_y1", rectangle_set_y1, 1);
88
- rb_define_method(RG_TARGET_NAMESPACE, "set_x2", rectangle_set_x2, 1);
89
- rb_define_method(RG_TARGET_NAMESPACE, "set_y2", rectangle_set_y2, 1);
82
+ rbg_define_method(RG_TARGET_NAMESPACE, "x1", rectangle_get_x1, 0);
83
+ rbg_define_method(RG_TARGET_NAMESPACE, "y1", rectangle_get_y1, 0);
84
+ rbg_define_method(RG_TARGET_NAMESPACE, "x2", rectangle_get_x2, 0);
85
+ rbg_define_method(RG_TARGET_NAMESPACE, "y2", rectangle_get_y2, 0);
86
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_x1", rectangle_set_x1, 1);
87
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_y1", rectangle_set_y1, 1);
88
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_x2", rectangle_set_x2, 1);
89
+ rbg_define_method(RG_TARGET_NAMESPACE, "set_y2", rectangle_set_y2, 1);
90
90
  RG_DEF_METHOD(to_a, 0);
91
91
  RG_DEF_METHOD(inspect, 0);
92
-
93
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
94
92
  }
@@ -88,6 +88,4 @@ Init_poppler_text_field(VALUE mPoppler, VALUE cFormField)
88
88
  RG_DEF_METHOD_P(scroll, 0);
89
89
  RG_DEF_METHOD_P(rich_text, 0);
90
90
  RG_DEF_METHOD_P(password, 0);
91
-
92
- G_DEF_SETTERS(RG_TARGET_NAMESPACE);
93
91
  }
@@ -26,19 +26,19 @@ extern void Init_poppler(void);
26
26
  #define RG_TARGET_NAMESPACE mPoppler
27
27
 
28
28
  static VALUE
29
- rg_m_backend(VALUE self)
29
+ rg_s_backend(G_GNUC_UNUSED VALUE self)
30
30
  {
31
31
  return POPPLERBACKEND2RVAL(poppler_get_backend());
32
32
  }
33
33
 
34
34
  static VALUE
35
- rg_m_version(VALUE self)
35
+ rg_s_version(G_GNUC_UNUSED VALUE self)
36
36
  {
37
37
  return CSTR2RVAL(poppler_get_version());
38
38
  }
39
39
 
40
40
  static VALUE
41
- rg_m_cairo_available_p(VALUE self)
41
+ rg_s_cairo_available_p(G_GNUC_UNUSED VALUE self)
42
42
  {
43
43
  #ifdef RB_POPPLER_CAIRO_AVAILABLE
44
44
  return Qtrue;
@@ -91,9 +91,9 @@ Init_poppler(void)
91
91
 
92
92
  G_DEF_CLASS(POPPLER_TYPE_BACKEND, "Backend", RG_TARGET_NAMESPACE);
93
93
 
94
- RG_DEF_MODFUNC(backend, 0);
95
- RG_DEF_MODFUNC(version, 0);
96
- RG_DEF_MODFUNC_P(cairo_available, 0);
94
+ RG_DEF_SMETHOD(backend, 0);
95
+ RG_DEF_SMETHOD(version, 0);
96
+ RG_DEF_SMETHOD_P(cairo_available, 0);
97
97
 
98
98
  Init_poppler_indexiter(RG_TARGET_NAMESPACE);
99
99
  Init_poppler_fontinfo(RG_TARGET_NAMESPACE);
Binary file
Binary file
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: poppler
3
3
  version: !ruby/object:Gem::Version
4
- hash: 23
4
+ hash: 21
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 1
9
- - 2
10
- version: 1.1.2
9
+ - 3
10
+ version: 1.1.3
11
11
  platform: x86-mingw32
12
12
  authors:
13
13
  - The Ruby-GNOME2 Project Team
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-01-15 00:00:00 Z
18
+ date: 2012-04-08 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  name: gtk2
@@ -25,12 +25,12 @@ dependencies:
25
25
  requirements:
26
26
  - - ">="
27
27
  - !ruby/object:Gem::Version
28
- hash: 23
28
+ hash: 21
29
29
  segments:
30
30
  - 1
31
31
  - 1
32
- - 2
33
- version: 1.1.2
32
+ - 3
33
+ version: 1.1.3
34
34
  type: :runtime
35
35
  version_requirements: *id001
36
36
  description: Ruby/Poppler is a Ruby binding of poppler-glib.
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
214
214
  requirements: []
215
215
 
216
216
  rubyforge_project:
217
- rubygems_version: 1.8.12
217
+ rubygems_version: 1.8.15
218
218
  signing_key:
219
219
  specification_version: 3
220
220
  summary: Ruby/Poppler is a Ruby binding of poppler-glib.