Changeset 41

Timestamp:

12/25/08 17:24:35 (3 years ago)

Author:

mirko

Message:

Fixed a localization bug in command line parting, updated the poppler version dependency

Files:

• branches/pdfcube-0.0.4 (deleted)
• trunk/configure.ac (modified) (2 diffs)
• trunk/src/pdfcube.cc (modified) (5 diffs)

trunk/configure.ac

@@ -20 +20 @@
 AC_PROG_CC
 AC_PROG_CXX
-AM_PROG_LIBTOOL
+dnl AM_PROG_LIBTOOL
 AM_SANITY_CHECK
 
@@ -41 +41 @@
 AC_SUBST(gtkglext_LIBS)
 
-PKG_CHECK_MODULES(poppler, poppler >= 0.4.5)
+PKG_CHECK_MODULES(poppler, poppler >= 0.5.4)
 AC_SUBST(poppler_CFLAGS)
 AC_SUBST(poppler_LIBS)

trunk/src/pdfcube.cc

@@ -30 +30 @@
 #include <cmath>
 #include <sstream>
+
+// Removing GTK+ dependencies to ease portability.
 // Gtk+ (pkg-config gtk+-2.0)
 #include <gtk/gtk.h>
@@ -1864 +1866 @@
      "Version information")
     ("bgcolor,b", po::value<std::string>(),
-     "Background color is 'r,g,b' with real values between 0.0 and 1.0, no spaces.")
+     "Background color is 'r:g:b' with real values between 0.0 and 1.0, no spaces.")
     ("top-color,t", po::value<std::string>(),
-     "Cube top color in 'r,g,b' format again with reals in [0,1].")
+     "Cube top color in 'r:g:b' format again with reals in [0,1].")
     ("transitions,c", po::value<std::vector<int> >()->multitoken(), 
      "Pages at wich to do a cube transition by default eg. 2 4 7\nMust be the last option on the command line.")
@@ -1892 +1894 @@
     cout << "Usage examples:" << endl;
     cout << "  $ pdfcube presentation.pdf" << endl;
-    cout << "  $ pdfcube presentation.pdf --bgcolor 0,0,0 --top-color 0.6,0.2,0.2 --transitions 1 5 7"
+    cout << "  $ pdfcube presentation.pdf --bgcolor 0:0:0 --top-color 0.6:0.2:0.2 --transitions 1 5 7"
+         << endl 
+         << "  (floating point numbers are locale aware on some C libraries)"
          << endl << endl << endl;
     return 0;
@@ -1926 +1930 @@
     string v;
     std::istringstream iss(vm["bgcolor"].as<std::string>());
-    while(getline(iss, v, ',')) cc.push_back(::atof(v.c_str())); 
+    while(getline(iss, v, ':')) cc.push_back(::atof(v.c_str())); 
     if(cc.size() != 3)
       {
@@ -1939 +1943 @@
     string v;
     std::istringstream iss(vm["top-color"].as<std::string>());
-    while(getline(iss, v, ',')) tc.push_back(::atof(v.c_str())); 
+    while(getline(iss, v, ':')) tc.push_back(::atof(v.c_str())); 
     if(tc.size() != 3)
       {