Completely synched with Xpdf 0.90

doc changes (version numbers), typo fixes

7 files changed, 12 insertions, 12 deletions

diff --git a/pdf/xpdf/CMapInfo.h b/pdf/xpdf/CMapInfo.h
index 7a1d8e4..4842ee1 100644
--- a/pdf/xpdf/CMapInfo.h
+++ b/pdf/xpdf/CMapInfo.h
@@ -1367,7 +1367,7 @@ static GfxFontEncoding16 japan1278EUCVEnc16 = {
     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1 },
-  { 0x0000, 0x0000, 0x0000( 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+  { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -2062,7 +2062,7 @@ static GfxFontEncoding16 japan1278HEnc16 = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000( 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
diff --git a/pdf/xpdf/FontFile.h b/pdf/xpdf/FontFile.h
index 29f8ffb..ec625ef 100644
--- a/pdf/xpdf/FontFile.h
+++ b/pdf/xpdf/FontFile.h
@@ -18,7 +18,7 @@
 #include "GString.h"
 #include "FontEncoding.h"
 
-//-----------------------------------------------)------------------------
+//------------------------------------------------------------------------
 // FontFile
 //------------------------------------------------------------------------
 
diff --git a/pdf/xpdf/Object.h b/pdf/xpdf/Object.h
index b362575..789cd5f 100644
--- a/pdf/xpdf/Object.h
+++ b/pdf/xpdf/Object.h
@@ -22,7 +22,6 @@
 class Array;
 class Dict;
 class Stream;
-class XRef;
 
 //------------------------------------------------------------------------
 // Ref
@@ -293,6 +292,4 @@ inline void Object::streamSetPos(int pos)
 inline Dict *Object::streamGetDict()
   { return stream->getDict(); }
 
-#include "XRef.h"
-
 #endif
diff --git a/pdf/xpdf/PSOutputDev.cc b/pdf/xpdf/PSOutputDev.cc
index fa7c13e..edff5cd 100644
--- a/pdf/xpdf/PSOutputDev.cc
+++ b/pdf/xpdf/PSOutputDev.cc
@@ -481,12 +481,12 @@ void PSOutputDev::setupFont(GfxFont *font) {
   writePS("/F%d_%d /%s %g\n",
 	  font->getID().num, font->getID().gen, psName, scale);
   for (i = 0; i < 256; i += 8) {
-    writePS((i == 0) ? (char *)"[ " : (char *)"  ");
+    writePS((i == 0) ? "[ " : "  ");
     for (j = 0; j < 8; ++j) {
       charName = font->getCharName(i+j);
-      writePS("/%s", charName ? charName : (char *)".notdef");
+      writePS("/%s", charName ? charName : ".notdef");
     }
-    writePS((i == 256-8) ? (char *)"]\n" : (char *)"\n");
+    writePS((i == 256-8) ? "]\n" : "\n");
   }
   writePS("pdfMakeFont\n");
 }
diff --git a/pdf/xpdf/XOutputFontInfo.h b/pdf/xpdf/XOutputFontInfo.h
index c33453a..864cb7b 100644
--- a/pdf/xpdf/XOutputFontInfo.h
+++ b/pdf/xpdf/XOutputFontInfo.h
@@ -511,7 +511,7 @@ static char *isoLatin2EncodingNames[isoLatin2EncodingSize] = {
   "zacute",
   "hungarumlaut",
   "zcaron",
-  "zdotaccenp",
+  "zdotaccent",
   "Racute",
   "Aacute",
   "Acircumflex",
diff --git a/pdf/xpdf/xpdf-ltk.h b/pdf/xpdf/xpdf-ltk.h
index bc06ee8..3c2f053 100644
--- a/pdf/xpdf/xpdf-ltk.h
+++ b/pdf/xpdf/xpdf-ltk.h
@@ -17,7 +17,10 @@ LTKWindow *makeWindow(LTKApp *a) {
           new LTKEmpty()
         )
       ),
-      new LTKBox(NULL, 14, 1, 0, 0, 0, 0, ltkBorderNone, 1, 0,
+      new LTKBox(NULL, 15, 1, 0, 0, 0, 0, ltkBorderNone, 1, 0,
+        new LTKBox(NULL, 1, 1, 2, 2, 2, 2, ltkBorderNone, 0, 0,
+          new LTKButton(NULL, 0, backArrow_bits, backArrow_width, backArrow_height, ltkButtonClick, &backCbk)
+        ),
         new LTKBox(NULL, 1, 1, 2, 2, 2, 2, ltkBorderNone, 0, 0,
           new LTKButton(NULL, 0, dblLeftArrow_bits, dblLeftArrow_width, dblLeftArrow_height, ltkButtonClick, &prevTenPageCbk)
         ),
diff --git a/pdf/xpdf/xpdf.cc b/pdf/xpdf/xpdf.cc
index dd31b94..4e5a2a8 100644
--- a/pdf/xpdf/xpdf.cc
+++ b/pdf/xpdf/xpdf.cc
@@ -779,7 +779,7 @@ static void displayPage(int page1, int zoom1, int rotate1, GBool addToHist) {
   } else {
     dpi = zoomDPI[zoom - minZoom];
   }
-  doc->displayPage(out, page, (double)dpi, rotate, gTrue);
+  doc->displayPage(out, page, dpi, rotate, gTrue);
   updateScrollbars();
 
   // update page number display