Scroll at the top of the page when changing page

[evince.git] / pdf / xpdf / PDFDoc.cc

diff --git a/pdf/xpdf/PDFDoc.cc b/pdf/xpdf/PDFDoc.cc
index c92048bd9896392882aec54a8cd6567bf894f946..031ffc50df93beb099d43ba53dfdc1cbd8566d18 100644 (file)
--- a/pdf/xpdf/PDFDoc.cc
+++ b/pdf/xpdf/PDFDoc.cc
@@ -18,7 +18,7 @@
 #include <stddef.h>
 #include <string.h>
 #include "GString.h"
 #include <stddef.h>
 #include <string.h>
 #include "GString.h"

-#include "config.h"
+#include "xpdfconfig.h"

 #include "GlobalParams.h"
 #include "Page.h"
 #include "Catalog.h"
 #include "GlobalParams.h"
 #include "Page.h"
 #include "Catalog.h"


@@ -206,7 +206,7 @@ void PDFDoc::checkHeader() {
 }
 
 void PDFDoc::displayPage(OutputDev *out, int page, double hDPI, double vDPI,
 }
 
 void PDFDoc::displayPage(OutputDev *out, int page, double hDPI, double vDPI,

-                        int rotate, GBool doLinks,
+                        int rotate, GBool crop, GBool doLinks,

                         GBool (*abortCheckCbk)(void *data),
                         void *abortCheckCbkData,
                          GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),
                         GBool (*abortCheckCbk)(void *data),
                         void *abortCheckCbkData,
                          GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),


@@ -223,18 +223,19 @@ void PDFDoc::displayPage(OutputDev *out, int page, double hDPI, double vDPI,
       links = NULL;
     }
     getLinks(p);
       links = NULL;
     }
     getLinks(p);

-    p->display(out, hDPI, vDPI, rotate, links, catalog,
+    p->display(out, hDPI, vDPI, rotate, crop, links, catalog,

               abortCheckCbk, abortCheckCbkData,
                annotDisplayDecideCbk, annotDisplayDecideCbkData);
   } else {
               abortCheckCbk, abortCheckCbkData,
                annotDisplayDecideCbk, annotDisplayDecideCbkData);
   } else {

-    p->display(out, hDPI, vDPI, rotate, NULL, catalog,
+    p->display(out, hDPI, vDPI, rotate, crop, NULL, catalog,

               abortCheckCbk, abortCheckCbkData,
                annotDisplayDecideCbk, annotDisplayDecideCbkData);
   }
 }
 
 void PDFDoc::displayPages(OutputDev *out, int firstPage, int lastPage,
               abortCheckCbk, abortCheckCbkData,
                annotDisplayDecideCbk, annotDisplayDecideCbkData);
   }
 }
 
 void PDFDoc::displayPages(OutputDev *out, int firstPage, int lastPage,

-                         double hDPI, double vDPI, int rotate, GBool doLinks,
+                         double hDPI, double vDPI, int rotate,
+                         GBool crop, GBool doLinks,

                          GBool (*abortCheckCbk)(void *data),
                          void *abortCheckCbkData,
                           GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),
                          GBool (*abortCheckCbk)(void *data),
                          void *abortCheckCbkData,
                           GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),


@@ -242,7 +243,7 @@ void PDFDoc::displayPages(OutputDev *out, int firstPage, int lastPage,
   int page;
 
   for (page = firstPage; page <= lastPage; ++page) {
   int page;
 
   for (page = firstPage; page <= lastPage; ++page) {

-    displayPage(out, page, hDPI, vDPI, rotate, doLinks,
+    displayPage(out, page, hDPI, vDPI, rotate, crop, doLinks,

                abortCheckCbk, abortCheckCbkData,
                 annotDisplayDecideCbk, annotDisplayDecideCbkData);
   }
                abortCheckCbk, abortCheckCbkData,
                 annotDisplayDecideCbk, annotDisplayDecideCbkData);
   }


@@ -250,8 +251,8 @@ void PDFDoc::displayPages(OutputDev *out, int firstPage, int lastPage,
 
 void PDFDoc::displayPageSlice(OutputDev *out, int page,
                              double hDPI, double vDPI,
 
 void PDFDoc::displayPageSlice(OutputDev *out, int page,
                              double hDPI, double vDPI,

-                             int rotate, int sliceX, int sliceY,
-                             int sliceW, int sliceH,
+                             int rotate, GBool crop,
+                             int sliceX, int sliceY, int sliceW, int sliceH,

                              GBool (*abortCheckCbk)(void *data),
                              void *abortCheckCbkData,
                               GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),
                              GBool (*abortCheckCbk)(void *data),
                              void *abortCheckCbkData,
                               GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),


@@ -259,7 +260,8 @@ void PDFDoc::displayPageSlice(OutputDev *out, int page,
   Page *p;
 
   p = catalog->getPage(page);
   Page *p;
 
   p = catalog->getPage(page);

-  p->displaySlice(out, hDPI, vDPI, rotate, sliceX, sliceY, sliceW, sliceH,
+  p->displaySlice(out, hDPI, vDPI, rotate, crop,
+                 sliceX, sliceY, sliceW, sliceH,

                  NULL, catalog,
                   abortCheckCbk, abortCheckCbkData,
                   annotDisplayDecideCbk, annotDisplayDecideCbkData);
                  NULL, catalog,
                   abortCheckCbk, abortCheckCbkData,
                   annotDisplayDecideCbk, annotDisplayDecideCbkData);