Changeset 60 for trunk/src

Timestamp:

09/27/10 09:32:36 (20 months ago)

Author:

mirko

Message:

A quick fix for ubuntu 10.04 and ArchLinux?, I can't test it on previous releases.

Files:

• trunk/src/pdfcube.cc (modified) (8 diffs)

trunk/src/pdfcube.cc

@@ -670 +670 @@
         forward(widget);
         current_face = next_face();
-        //          quick_reset(widget);
+        quick_reset(widget);
         break;
       case CUBE_PREV:
@@ -678 +678 @@
         backward(widget);
         current_face = prev_face();
-        //          quick_reset(widget);
+        quick_reset(widget);
         break;
       case SWITCH_FW:
@@ -686 +686 @@
         forward(widget);
         current_face = next_face();
+        quick_reset(widget);
         break;
       case SWITCH_BW:
@@ -693 +694 @@
         backward(widget);
         current_face = prev_face();
+        quick_reset(widget);
         break;
       case ZOOM0:
@@ -737 +739 @@
   // Prev face of the cube in [0..3]
   int prev_face() {
-    if (current_face - 1 < 0)
-      return 3;
-    else
-      return current_face - 1;
+    return (current_face+3) % 4;
   }
 
   // Next face of the cube in [0..3]
   int next_face() {
-    if (current_face + 1 > 3)
-      return 0;
-    else
-      return current_face + 1;
+    return (current_face+1) % 4;
   }
 
@@ -911 +907 @@
   void
   quick_reset(GtkWidget * widget) {
+    // update_textures(widget);
     animating = FALSE;
     frame = 0;
@@ -922 +919 @@
     angle = 0.0;
     current_face = 0;
-    active_animation = ANIM_NONE;
+    // active_animation = ANIM_NONE;
     previous_animation = ANIM_NONE;
     last_animation = ANIM_NONE;
@@ -1973 +1970 @@
     cerr << "File name error." << endl;
   }
+  clog << "Opening: " << filename_uri << endl;
+  GError *error = NULL;
   PopplerDocument *
-    document = poppler_document_new_from_file(filename_uri, NULL, NULL);
+    document = poppler_document_new_from_file(filename_uri, NULL, &error);
 
   if (document == NULL) {
-    cerr << "Invaild PDF file." << endl;
+    cerr << "Invaild PDF file." << error->message << endl;
     exit(1);
   }