[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2 [master] fix parameter extraction in method get_text of Page class.

[<nu...@co...>]

Andrey Kutejko	2012-01-27 22:22:24 +0900 (Fri, 27 Jan 2012)

  New Revision: b4ed529c072fa180de0b9a7ab5f906a9863667e9

  Merged 4ac8a68: Merge pull request #97 from andy128k/master

  Log:
    fix parameter extraction in method get_text of Page class.

  Modified files:
    poppler/ext/poppler/rbpoppler-page.c

  Modified: poppler/ext/poppler/rbpoppler-page.c (+9 -9)
===================================================================
--- poppler/ext/poppler/rbpoppler-page.c    2012-01-27 18:39:28 +0900 (e0a9514)
+++ poppler/ext/poppler/rbpoppler-page.c    2012-01-27 22:22:24 +0900 (4b3a584)
@@ -278,16 +278,16 @@ rg_get_text(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "02", &arg1, &arg2);
 
     page = SELF(self);
-    if (NIL_P(arg1)) {
-        rb_rect = arg2;
-    } else {
-        if (RTEST(rb_obj_is_kind_of(arg2, cRectangle))) {
-            rb_rect = arg2;
+    rb_rect = Qnil;
+    if (!NIL_P(arg1)) {
+        if (RTEST(rb_obj_is_kind_of(arg1, cRectangle))) {
+            rb_rect = arg1;
         } else {
-            rb_rect = Qnil;
-            if (!NIL_P(arg2)) {
-                style = RVAL2POPPLERSELECTIONSTYLE(arg2);
-            }
+            rb_raise(rb_eArgError, "wrong first arrument. selection rectangle is expected.");
+        }
+
+        if (!NIL_P(arg2)) {
+            style = RVAL2POPPLERSELECTIONSTYLE(arg2);
         }
     }