Merge branch 'master' into xpdf303merge

Conflicts:
	poppler/CairoOutputDev.cc
	poppler/CairoOutputDev.h
	poppler/FontInfo.cc
	poppler/GfxFont.cc
	poppler/GfxState.cc
	poppler/GlobalParams.cc
	poppler/GlobalParams.h
	poppler/Lexer.cc

1 files changed, 11 insertions, 0 deletions

diff --git a/utils/parseargs.cc b/utils/parseargs.cc
index 5d6769ef..df1c8ede 100644
--- a/utils/parseargs.cc
+++ b/utils/parseargs.cc
@@ -30,6 +30,7 @@
 #include "parseargs.h"
 
 #include "goo/gstrtod.h"
+#include "goo/GooString.h"
 
 static const ArgDesc *findArg(const ArgDesc *args, char *arg);
 static GBool grabArg(const ArgDesc *arg, int i, int *argc, char *argv[]);
@@ -87,6 +88,7 @@ void printUsage(const char *program, const char *otherArgs, const ArgDesc *args)
       break;
     case argString:
     case argStringDummy:
+    case argGooString:
       typ = " <string>";
       break;
     case argFlag:
@@ -152,6 +154,15 @@ static GBool grabArg(const ArgDesc *arg, int i, int *argc, char *argv[]) {
       n = 1;
     }
     break;
+  case argGooString:
+    if (i + 1 < *argc) {
+      ((GooString*)arg->val)->Set(argv[i+1]);
+      n = 2;
+    } else {
+      ok = gFalse;
+      n = 1;
+    }
+    break;
   default:
     fprintf(stderr, "Internal error in arg table\n");
     n = 1;