Changeset 10

Timestamp:

11/18/07 20:30:18 (6 years ago)

Author:

mirko

Message:

version 0.0.3 will have customizable cube top image and background color

Location:

branches/pdfcube-0.0.3

Files:

• . (copied) (copied from tags/pdfcube-0.0.2)
• ChangeLog (modified) (1 diff)
• Makefile (modified) (5 diffs)
• debian (copied) (copied from trunk/pdfcube/debian)
• pdfcube.1.txt (copied) (copied from trunk/pdfcube/pdfcube.1.txt)
• src/pdfcube.cc (modified) (5 diffs)

branches/pdfcube-0.0.3/ChangeLog

@@ +1 @@
+2007-01-29  Mirko Maischberger  <mirko.maischberger@gmail.com>
+        * pdfcube.1.txt: added the manpage provided by Alexander Wirt,
+        with few modifications.
+        
+2006-12-24  Mirko Maischberger  <mirko.maischberger@gmail.com>
+        * configure.ac, src/Makefile.am: Removed unneeded glut and libtool
+        dependencies
+        Reported by: Frank Boheme
+        
 2006-12-19  Mirko Maischberger  <mirko.maischberger@gmail.com>
-
+        * debian/: Package debianization.
+        * src/llcube.cc: draft of low level cube code.
+        
+2006-12-19  Mirko Maischberger  <mirko.maischberger@gmail.com>
         * Autotools, release 0.0.2
 
-        
 2006-12-16  Mirko Maischberger  <mirko.maischberger@gmail.com>
-
         * Release 0.0.1
         
 2006-12-09  Mirko Maischberger  <mirko.maischberger@gmail.com>
-
         * Initial import
-

branches/pdfcube-0.0.3/Makefile

@@ -70 +70 @@
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /home/mirko/oss/pdfcube/trunk/pdfcube/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/mirko/oss/pdfcube/branches/pdfcube-0.0.3/missing --run aclocal-1.9
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/mirko/oss/pdfcube/trunk/pdfcube/missing --run tar
+AMTAR = ${SHELL} /home/mirko/oss/pdfcube/branches/pdfcube-0.0.3/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /home/mirko/oss/pdfcube/trunk/pdfcube/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/mirko/oss/pdfcube/trunk/pdfcube/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/mirko/oss/pdfcube/trunk/pdfcube/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/mirko/oss/pdfcube/branches/pdfcube-0.0.3/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/mirko/oss/pdfcube/branches/pdfcube-0.0.3/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/mirko/oss/pdfcube/branches/pdfcube-0.0.3/missing --run automake-1.9
 AWK = gawk
 CC = gcc
@@ -110 +110 @@
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/mirko/oss/pdfcube/trunk/pdfcube/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/mirko/oss/pdfcube/branches/pdfcube-0.0.3/missing --run makeinfo
 OBJEXT = o
 PACKAGE = pdfcube
@@ -151 +151 @@
 glib_LIBS = -lglib-2.0  
 gtk_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12  
-gtk_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
+gtk_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXcomposite -lXdamage -lpango-1.0 -lcairo -lX11 -lXfixes -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
 gtkglext_CFLAGS = -I/usr/local/include/gtkglext-1.0 -I/usr/local/lib/gtkglext-1.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/atk-1.0  
-gtkglext_LIBS = -Wl,--export-dynamic -L/usr/local/lib -lgtkglext-x11-1.0 -lgdkglext-x11-1.0 -lGLU -lGL -lXmu -lXt -lSM -lICE -lgtk-x11-2.0 -lpangox-1.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
+gtkglext_LIBS = -Wl,--export-dynamic -L/usr/local/lib -lgtkglext-x11-1.0 -lgdkglext-x11-1.0 -lGLU -lGL -lXmu -lXt -lSM -lICE -lgtk-x11-2.0 -lpangox-1.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXcomposite -lXdamage -lpango-1.0 -lcairo -lX11 -lXfixes -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
 host = i686-pc-linux-gnu
 host_alias = 
@@ -162 +162 @@
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/mirko/oss/pdfcube/trunk/pdfcube/install-sh
+install_sh = /home/mirko/oss/pdfcube/branches/pdfcube-0.0.3/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
@@ -173 +173 @@
 poppler_CFLAGS = -I/usr/include/poppler  
 poppler_LIBS = -lpoppler  
-poppler_glib_CFLAGS = -I/usr/include/poppler/glib -I/usr/include/poppler -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-poppler_glib_LIBS = -lpoppler-glib -lpoppler -lgdk_pixbuf-2.0 -lm -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
+poppler_glib_CFLAGS = -I/usr/include/poppler/glib -I/usr/include/poppler -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/libpng12  
+poppler_glib_LIBS = -lpoppler-glib -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXcomposite -lXdamage -lpango-1.0 -lcairo -lX11 -lXfixes -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
 prefix = /usr/local
 program_transform_name = s,x,x,

branches/pdfcube-0.0.3/src/pdfcube.cc

@@ -72 +72 @@
 static bool *page_transition;
 
+// TODO: customize background color on command line
+static float bgcolor[] = {0.4, 0.0, 0.0};
+static GdkPixbuf* cube_top = NULL;
+
 //////////////////////////////////////////////////////////////////////////
 // Forward declarations
@@ -150 +154 @@
   initialize(GtkWidget *widget)
   {
-    glClearColor (0.4, 0.0, 0.0, 0.0);
+    glClearColor (bgcolor[0], bgcolor[1], bgcolor[2], 0.0);
     
     // glEnable(GL_NORMALIZE);
@@ -729 +733 @@
   render_page(GdkPixbuf* pm, int i, gint iWidth, gint iHeight)
   {
-    PopplerPage *page;
+    PopplerPage *page = NULL;
     page = poppler_document_get_page(doc, i);
+    assert(page);
     double w, h;
     poppler_page_get_size(page, &w, &h);
@@ -1410 +1415 @@
   glconfig = gdk_gl_config_new_by_mode ((GdkGLConfigMode)
                                         (
-                                         GDK_GL_MODE_RGBA    |
+                                         GDK_GL_MODE_RGBA   |
                                          GDK_GL_MODE_ALPHA  |
                                          GDK_GL_MODE_DEPTH  |
@@ -1496 +1501 @@
       cerr << "Errore nel nome del file" << endl;
     }
+
+  GError* g = NULL;
   PopplerDocument* document = 
-    poppler_document_new_from_file(filename_uri, NULL, NULL);
+    poppler_document_new_from_file(filename_uri, NULL, &g);
+  
+  if(g && g->code)
+    {
+      perror(g->message);
+      exit(2);
+    }
 
   if(document == NULL)