Changeset 62

Timestamp:

11/05/11 11:03:51 (7 months ago)

Author:

mirko

Message:

Using Cairo instead of gdk_pixbuf. This should fix compatibility issues with newer poppler versions.

Location:

trunk

Files:

• README (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• src/pdfcube.cc (modified) (15 diffs)

trunk/README

@@ -45 +45 @@
    libpoppler-dev libpoppler-glib-dev)
  * GtkGlExt (Debian/Ubuntu package: libgtkglext1-dev)
- * OpenGL (freeglut3-dev)
  * Boost C++ Program Option Library
 

trunk/configure.ac

@@ -20 +20 @@
 AC_PROG_CC
 AC_PROG_CXX
-dnl AM_PROG_LIBTOOL
 AM_SANITY_CHECK
 
@@ -45 +44 @@
 AC_SUBST(poppler_glib_LIBS)
 
+PKG_CHECK_MODULES(cairo, cairo >= 0.25)
+AC_SUBST(cairo_CFLAGS)
+AC_SUBST(cairo_LIBS)
+
 AC_CHECK_HEADERS(GL/gl.h)
 AC_CHECK_HEADERS(GL/glu.h)
 AC_CHECK_HEADERS(GL/glx.h)
-AC_CHECK_HEADERS(GL/glut.h)
 
 AX_BOOST_BASE([1.33.1])

trunk/src/pdfcube.cc

@@ -3 +3 @@
 // PDFCube source file - pdfcube.cc
 // 
-// Copyright (C) 2006-2008 
+// Copyright (C) 2006-2011
 //               Mirko Maischberger <mirko.maischberger@gmail.com>
 //               Karol Sokolowski   <sokoow@gmail.com>
@@ -44 +44 @@
 #include <GL/glx.h>
 
-// PDF to GdkPixbuf (pkg-config poppler-glib)
+// PDF to cairo_surface_t using Cairo (pkg-config poppler-glib cairo)
 #include <poppler.h>
+#include <cairo.h>
 
 #include <boost/program_options.hpp>
@@ -124 +125 @@
      frame(0),
      lookposx(0.0), lookposy(0.0), lookposz(3.48),
-     atx(0.0), aty(0.0), atz(0.0), persp(44.0), angle(0.0), pixmap(0) {
+     atx(0.0), aty(0.0), atz(0.0), persp(44.0), angle(0.0), 
+     context(0), pixmap(0) {
     texmap[0] = 0;
     texmap[1] = 1;
     texmap[2] = 2;
     cube_faces=0;
+    PopplerPage *page;
+    double w,h;
+    page = poppler_document_get_page(d, 1);
+    poppler_page_get_size(page, &w, &h);
+    tex_width = 1024;
+    tex_height = 768;
     pixmap =
-      gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, tex_width,
-                     tex_height);
+      cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 
+                                 tex_width,
+                                 tex_height);
+    context = cairo_create(pixmap);
+    cairo_scale(context, tex_width/w, (double)tex_height/h);
+
     steps = new GLfloat[N_FRAMES];
     xsteps = new double[N_FRAMES];
@@ -230 +242 @@
     glEnable(GL_TEXTURE_RECTANGLE_ARB);
 
-    GLfloat mat_ambient[] = { 0.0, 0.0, 0.0, 1.00 };
-    GLfloat mat_specular[] = { 1.0, 1.0, 1.0, 1.00 };
+    GLfloat mat_ambient[] = { 0.0, 0.0, 0.0, 0.00 };
+    GLfloat mat_specular[] = { 1.0, 1.0, 1.0, 0.00 };
     GLfloat mat_shininess[] = { 3.0 };
 
@@ -325 +337 @@
   void
   redraw(GtkWidget * widget) {
-
     double yoffset = 0.1;
     if (animating) {
@@ -726 +737 @@
         0, 0, 0, 127
       };
-      glDrawPixels(1, 1, GL_RGBA, GL_UNSIGNED_BYTE, rcube);
+      glDrawPixels(1, 1, GL_BGRA, GL_UNSIGNED_BYTE, rcube);
 
       active_animation = ANIM_NONE;
@@ -937 +948 @@
       texmap[1] = texmap[0];
       texmap[0] = tmp;
-      render_page(pixmap, next_page(), tex_width, tex_height);
+      render_page(next_page());
     } else {
       current_page = prev_page();
@@ -944 +955 @@
       texmap[1] = texmap[2];
       texmap[2] = tmp;
-      render_page(pixmap, prev_page(), tex_width, tex_height);
+      render_page(prev_page());
     }
 
@@ -955 +966 @@
                  tex_height,
                  0,
-                 GL_RGBA,
-                 GL_UNSIGNED_BYTE, gdk_pixbuf_get_pixels(pixmap));
+                 GL_BGRA,
+                 GL_UNSIGNED_BYTE, cairo_image_surface_get_data(pixmap));
 
     gdk_window_invalidate_rect(widget->window, &widget->allocation,
@@ -968 +979 @@
     assert(current_page >= 0);
     assert(current_page < total_pages);
-    render_page(pixmap, current_page, tex_width, tex_height);
+    render_page(current_page);
     glBindTexture(GL_TEXTURE_RECTANGLE_ARB, textures[texmap[0]]);
     glTexImage2D(GL_TEXTURE_RECTANGLE_ARB,
@@ -976 +987 @@
                  tex_height,
                  0,
-                 GL_RGBA,
-                 GL_UNSIGNED_BYTE, gdk_pixbuf_get_pixels(pixmap));
-
-    render_page(pixmap, prev_page(), tex_width, tex_height);
+                 GL_BGRA,
+                 GL_UNSIGNED_BYTE, cairo_image_surface_get_data(pixmap));
+
+    render_page(prev_page());
     glBindTexture(GL_TEXTURE_RECTANGLE_ARB, textures[texmap[1]]);
     glTexImage2D(GL_TEXTURE_RECTANGLE_ARB,
@@ -987 +998 @@
                  tex_height,
                  0,
-                 GL_RGBA,
-                 GL_UNSIGNED_BYTE, gdk_pixbuf_get_pixels(pixmap));
-
-    render_page(pixmap, next_page(), tex_width, tex_height);
+                 GL_BGRA,
+                 GL_UNSIGNED_BYTE, cairo_image_surface_get_data(pixmap));
+
+    render_page(next_page());
     glBindTexture(GL_TEXTURE_RECTANGLE_ARB, textures[texmap[2]]);
     glTexImage2D(GL_TEXTURE_RECTANGLE_ARB,
@@ -998 +1009 @@
                  tex_height,
                  0,
-                 GL_RGBA,
-                 GL_UNSIGNED_BYTE, gdk_pixbuf_get_pixels(pixmap));
+                 GL_BGRA,
+                 GL_UNSIGNED_BYTE, cairo_image_surface_get_data(pixmap));
 
     gdk_window_invalidate_rect(widget->window, &widget->allocation,
@@ -1015 +1026 @@
   double atx, aty, atz;
   double persp, angle;
-  GdkPixbuf *pixmap;
+  cairo_surface_t *pixmap;
+  cairo_t *context;
   int texmap[3];
 
@@ -1025 +1037 @@
   // ratio is fixed, should instead depend on the 
   // aspect ratio of the pdf page)
-  static const gint tex_width = (gint) (3 * 1024 / 2);
-  static const gint tex_height = (gint) (3 * 768 / 2);
+  gint tex_width; //(gint) (3 * 1024 / 2);
+  gint tex_height; //(gint) (3 * 768 / 2);
 
   // renders the poppler page on a pixmap
   void
-  render_page(GdkPixbuf * pm, int i, gint iWidth, gint iHeight) {
+  render_page(int i) {
     PopplerPage *page;
     page = poppler_document_get_page(doc, i);
-    double w, h;
-    poppler_page_get_size(page, &w, &h);
-    poppler_page_render_to_pixbuf(page, 0, 0, iWidth, iHeight,
-                                  ((double)iWidth)/w, 0, pm);
+    //double w,h;
+    //poppler_page_get_size(page, &w, &h);
+    cairo_save(context);
+    unsigned char* data = cairo_image_surface_get_data(pixmap);
+    std::fill(data, data+4*tex_width*tex_height, 0);
+    cairo_surface_mark_dirty(pixmap);
+    poppler_page_render(page, context);
+    cairo_restore(context);
   }