[poppler] 2 commits - utils/HtmlOutputDev.cc utils/pdftohtml.cc

[Albert Astals Cid]

 utils/HtmlOutputDev.cc |    9 ---------
 utils/pdftohtml.cc     |   16 ++++------------
 2 files changed, 4 insertions(+), 21 deletions(-)

New commits:
commit edf6c47feb5b7658e585bcce196e465245e1dc98
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Dec 16 22:56:40 2010 +0000

    kill useless code

diff --git a/utils/pdftohtml.cc b/utils/pdftohtml.cc
index 2c7630f..5e43f51 100644
--- a/utils/pdftohtml.cc
+++ b/utils/pdftohtml.cc
@@ -424,14 +424,6 @@ int main(int argc, char *argv[]) {
       splashOut->startDoc(doc->getXRef());
 
       for (int pg = firstPage; pg <= lastPage; ++pg) {
-        int pg_w = doc->getPageMediaWidth(pg) / scale;
-        int pg_h = doc->getPageMediaHeight(pg) / scale;
-        if ((doc->getPageRotate(pg) == 90) || (doc->getPageRotate(pg) == 270)) {
-          int tmp = pg_w;
-          pg_w = pg_h;
-          pg_h = tmp;
-        }
-
         doc->displayPage(splashOut, pg,
                          resolution, resolution,
                          0, gTrue, gFalse, gFalse);
commit 185a2f81485e19f96393a431be5523a277747b94
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Dec 16 22:56:15 2010 +0000

    static-ify some vars

diff --git a/utils/HtmlOutputDev.cc b/utils/HtmlOutputDev.cc
index 1e3a3ef..ede5700 100644
--- a/utils/HtmlOutputDev.cc
+++ b/utils/HtmlOutputDev.cc
@@ -64,7 +64,6 @@ int HtmlPage::pgNum=0;
 int HtmlOutputDev::imgNum=1;
 GooList *HtmlOutputDev::imgList=new GooList();
 
-extern double scale;
 extern GBool complexMode;
 extern GBool singleHtml;
 extern GBool ignore;
@@ -1041,14 +1040,6 @@ HtmlOutputDev::HtmlOutputDev(char *fileName, char *title,
 }
 
 HtmlOutputDev::~HtmlOutputDev() {
-  /*if (mode&&!xml){
-    int h=xoutRound(pages->pageHeight/scale);
-    int w=xoutRound(pages->pageWidth/scale);
-    fprintf(tin,"%s=%03d\n","PAPER_WIDTH",w);
-    fprintf(tin,"%s=%03d\n","PAPER_HEIGHT",h);
-    fclose(tin);
-    }*/
-
     HtmlFont::clear(); 
     
     delete Docname;
diff --git a/utils/pdftohtml.cc b/utils/pdftohtml.cc
index 3723b44..2c7630f 100644
--- a/utils/pdftohtml.cc
+++ b/utils/pdftohtml.cc
@@ -70,10 +70,10 @@ GBool printHtml = gFalse;
 GBool complexMode=gFalse;
 GBool singleHtml=gFalse; // singleHtml
 GBool ignore=gFalse;
-GBool useSplash=gTrue;
-char extension[5]="png";
-double scale=1.5;
-int resolution=72;
+static GBool useSplash=gTrue;
+static char extension[5]="png";
+static double scale=1.5;
+static int resolution=72;
 GBool noframes=gFalse;
 GBool stout=gFalse;
 GBool xml=gFalse;