summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>2007-09-20 20:57:44 -0700
committerKrzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>2007-09-20 20:57:44 -0700
commit7c406400532d68524a43cf963d894d3c4b269400 (patch)
tree7d16ec90350e23a50f5fdc5935101c938bbda011
parent70f23389c97b1870b7311d97322cdd16b580a79d (diff)
remove unused variables
-rwxr-xr-x[-rw-r--r--]poppler/Catalog.cc1
-rwxr-xr-x[-rw-r--r--]poppler/Form.cc5
-rwxr-xr-x[-rw-r--r--]poppler/GfxFont.cc6
-rwxr-xr-x[-rw-r--r--]poppler/Page.cc2
-rwxr-xr-x[-rw-r--r--]splash/Splash.cc5
5 files changed, 7 insertions, 12 deletions
diff --git a/poppler/Catalog.cc b/poppler/Catalog.cc
index 8702270c..be31bd48 100644..100755
--- a/poppler/Catalog.cc
+++ b/poppler/Catalog.cc
@@ -560,7 +560,6 @@ int NameTree::Entry::cmp(const void *voidKey, const void *voidEntry)
GBool NameTree::lookup(GooString *name, Object *obj)
{
Entry **entry;
- char *cname;
entry = (Entry **) bsearch(name, entries,
length, sizeof(Entry *), Entry::cmp);
diff --git a/poppler/Form.cc b/poppler/Form.cc
index c01e99a1..ffa51b94 100644..100755
--- a/poppler/Form.cc
+++ b/poppler/Form.cc
@@ -140,8 +140,6 @@ FormWidgetButton::FormWidgetButton (XRef *xrefA, Object *aobj, unsigned num, Ref
parent = p;
type = formButton;
onStr = NULL;
- Dict *dict = obj.getDict();
- Object obj1;
state = gFalse;
siblingsID = NULL;
}
@@ -221,7 +219,6 @@ void FormWidgetButton::loadDefaults ()
Dict *tmpDict2 = str->getDict();
Object obj3;
tmpDict2->lookup("Length", &obj3);
- int c;
onStr = new GooString ("D");
}
obj2.free();
@@ -260,7 +257,6 @@ FormWidgetText::FormWidgetText (XRef *xrefA, Object *aobj, unsigned num, Ref ref
{
parent = p;
type = formText;
- Dict *dict = aobj->getDict();
}
void FormWidgetText::loadDefaults ()
@@ -655,7 +651,6 @@ bool FormWidgetSignature::isReadOnly () const
FormField::FormField(XRef* xrefA, Object *aobj, const Ref& aref, Form* aform, FormFieldType ty)
{
- double t;
xref = xrefA;
aobj->copy(&obj);
Dict* dict = obj.getDict();
diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc
index 28f070c9..f890fd7c 100644..100755
--- a/poppler/GfxFont.cc
+++ b/poppler/GfxFont.cc
@@ -1635,7 +1635,7 @@ Gushort *GfxCIDFont::getCodeToGIDMap(FoFiTrueType *ff, int *mapsizep) {
"Adobe-Korea1-UCS2",
adobe_korea1_cmaps,
},
- 0
+ {0, 0, 0, 0}
};
Unicode *humap = 0;
Unicode *vumap = 0;
@@ -1643,7 +1643,6 @@ Gushort *GfxCIDFont::getCodeToGIDMap(FoFiTrueType *ff, int *mapsizep) {
unsigned long n;
int i;
unsigned long code;
- Unicode uBuf[8];
int wmode;
char **cmapName;
CMap *cMap;
@@ -1782,13 +1781,12 @@ Gushort *GfxCIDFont::getCodeToGIDMap(FoFiTrueType *ff, int *mapsizep) {
*mapsizep = n;
if (humap != 0) delete[] humap;
if (vumap != 0) delete[] vumap;
-end_0:
return codeToGID;
}
double GfxCIDFont::getWidth (char* s, int len) {
int nUsed;
- double w, h, vx, vy;
+ double w;
int a, b, m;
CID cid = cMap->getCID(s, len, &nUsed);
diff --git a/poppler/Page.cc b/poppler/Page.cc
index c76569cb..fb145ef1 100644..100755
--- a/poppler/Page.cc
+++ b/poppler/Page.cc
@@ -298,7 +298,6 @@ Page::Page(XRef *xrefA, int numA, Dict *pageDict, PageAttrs *attrsA, Form *form)
return;
- err3:
trans.initNull();
err2:
annots.initNull();
@@ -357,6 +356,7 @@ Gfx *Page::createGfx(OutputDev *out, double hDPI, double vDPI,
makeBox(hDPI, vDPI, rotate, useMediaBox, out->upsideDown(),
sliceX, sliceY, sliceW, sliceH, &box, &crop);
cropBox = getCropBox();
+ mediaBox = getMediaBox();
if (globalParams->getPrintCommands()) {
printf("***** MediaBox = ll:%g,%g ur:%g,%g\n",
diff --git a/splash/Splash.cc b/splash/Splash.cc
index ecb0881b..45eb6fe2 100644..100755
--- a/splash/Splash.cc
+++ b/splash/Splash.cc
@@ -3011,7 +3011,10 @@ SplashError Splash::composite(SplashBitmap *src, int xSrc, int ySrc,
void Splash::compositeBackground(SplashColorPtr color) {
SplashColorPtr p;
Guchar *q;
- Guchar alpha, alpha1, c, color0, color1, color2, color3;
+ Guchar alpha, alpha1, c, color0, color1, color2;
+#if SPLASH_CMYK
+ Guchar color3;
+#endif
int x, y, mask;
switch (bitmap->mode) {