- a couple of fixes like this one:

-    fprintf(f, "%g", real);
+    fprintf(f, "%g", static_cast<double>(real));

with 'real' being a fouble object. as fprintf is a c function with variable
arguments one cannot pass non-primitive objects through it and there is
no way for the compiler to figure out the right conversion operator, so
we give it a helping hand :)

3 files changed, 4 insertions, 4 deletions

diff --git a/noncore/unsupported/qpdf/xpdf/Gfx.cc b/noncore/unsupported/qpdf/xpdf/Gfx.cc
index 17d613e..f016c0e 100644
--- a/noncore/unsupported/qpdf/xpdf/Gfx.cc
+++ b/noncore/unsupported/qpdf/xpdf/Gfx.cc
@@ -843,1918 +843,1918 @@ void Gfx::opSetFillColorSpace(Object args[], int numArgs) {
   }
   for (i = 0; i < gfxColorMaxComps; ++i) {
     color.c[i] = 0;
   }
   state->setFillColor(&color);
   out->updateFillColor(state);
 }
 
 void Gfx::opSetStrokeColorSpace(Object args[], int numArgs) {
   Object obj;
   GfxColorSpace *colorSpace;
   GfxColor color;
   int i;
 
   state->setStrokePattern(NULL);
   res->lookupColorSpace(args[0].getName(), &obj);
   if (obj.isNull()) {
     colorSpace = GfxColorSpace::parse(&args[0]);
   } else {
     colorSpace = GfxColorSpace::parse(&obj);
   }
   obj.free();
   if (colorSpace) {
     state->setStrokeColorSpace(colorSpace);
   } else {
     error(getPos(), "Bad color space (stroke)");
   }
   for (i = 0; i < gfxColorMaxComps; ++i) {
     color.c[i] = 0;
   }
   state->setStrokeColor(&color);
   out->updateStrokeColor(state);
 }
 
 void Gfx::opSetFillColor(Object args[], int numArgs) {
   GfxColor color;
   int i;
 
   state->setFillPattern(NULL);
   for (i = 0; i < numArgs; ++i) {
     color.c[i] = args[i].getNum();
   }
   state->setFillColor(&color);
   out->updateFillColor(state);
 }
 
 void Gfx::opSetStrokeColor(Object args[], int numArgs) {
   GfxColor color;
   int i;
 
   state->setStrokePattern(NULL);
   for (i = 0; i < numArgs; ++i) {
     color.c[i] = args[i].getNum();
   }
   state->setStrokeColor(&color);
   out->updateStrokeColor(state);
 }
 
 void Gfx::opSetFillColorN(Object args[], int numArgs) {
   GfxColor color;
   GfxPattern *pattern;
   int i;
 
   if (state->getFillColorSpace()->getMode() == csPattern) {
     if (numArgs > 1) {
       for (i = 0; i < numArgs && i < 4; ++i) {
         if (args[i].isNum()) {
           color.c[i] = args[i].getNum();
         }
       }
       state->setFillColor(&color);
       out->updateFillColor(state);
     }
     if (args[numArgs-1].isName() &&
         (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
       state->setFillPattern(pattern);
     }
 
   } else {
     state->setFillPattern(NULL);
     for (i = 0; i < numArgs && i < 4; ++i) {
       if (args[i].isNum()) {
         color.c[i] = args[i].getNum();
       }
     }
     state->setFillColor(&color);
     out->updateFillColor(state);
   }
 }
 
 void Gfx::opSetStrokeColorN(Object args[], int numArgs) {
   GfxColor color;
   GfxPattern *pattern;
   int i;
 
   if (state->getStrokeColorSpace()->getMode() == csPattern) {
     if (numArgs > 1) {
       for (i = 0; i < numArgs && i < 4; ++i) {
         if (args[i].isNum()) {
           color.c[i] = args[i].getNum();
         }
       }
       state->setStrokeColor(&color);
       out->updateStrokeColor(state);
     }
     if (args[numArgs-1].isName() &&
         (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
       state->setStrokePattern(pattern);
     }
 
   } else {
     state->setStrokePattern(NULL);
     for (i = 0; i < numArgs && i < 4; ++i) {
       if (args[i].isNum()) {
         color.c[i] = args[i].getNum();
       }
     }
     state->setStrokeColor(&color);
     out->updateStrokeColor(state);
   }
 }
 
 //------------------------------------------------------------------------
 // path segment operators
 //------------------------------------------------------------------------
 
 void Gfx::opMoveTo(Object args[], int numArgs) {
   state->moveTo(args[0].getNum(), args[1].getNum());
 }
 
 void Gfx::opLineTo(Object args[], int numArgs) {
   if (!state->isCurPt()) {
     error(getPos(), "No current point in lineto");
     return;
   }
   state->lineTo(args[0].getNum(), args[1].getNum());
 }
 
 void Gfx::opCurveTo(Object args[], int numArgs) {
   fouble x1, y1, x2, y2, x3, y3;
 
   if (!state->isCurPt()) {
     error(getPos(), "No current point in curveto");
     return;
   }
   x1 = args[0].getNum();
   y1 = args[1].getNum();
   x2 = args[2].getNum();
   y2 = args[3].getNum();
   x3 = args[4].getNum();
   y3 = args[5].getNum();
   state->curveTo(x1, y1, x2, y2, x3, y3);
 }
 
 void Gfx::opCurveTo1(Object args[], int numArgs) {
   fouble x1, y1, x2, y2, x3, y3;
 
   if (!state->isCurPt()) {
     error(getPos(), "No current point in curveto1");
     return;
   }
   x1 = state->getCurX();
   y1 = state->getCurY();
   x2 = args[0].getNum();
   y2 = args[1].getNum();
   x3 = args[2].getNum();
   y3 = args[3].getNum();
   state->curveTo(x1, y1, x2, y2, x3, y3);
 }
 
 void Gfx::opCurveTo2(Object args[], int numArgs) {
   fouble x1, y1, x2, y2, x3, y3;
 
   if (!state->isCurPt()) {
     error(getPos(), "No current point in curveto2");
     return;
   }
   x1 = args[0].getNum();
   y1 = args[1].getNum();
   x2 = args[2].getNum();
   y2 = args[3].getNum();
   x3 = x2;
   y3 = y2;
   state->curveTo(x1, y1, x2, y2, x3, y3);
 }
 
 void Gfx::opRectangle(Object args[], int numArgs) {
   fouble x, y, w, h;
 
   x = args[0].getNum();
   y = args[1].getNum();
   w = args[2].getNum();
   h = args[3].getNum();
   state->moveTo(x, y);
   state->lineTo(x + w, y);
   state->lineTo(x + w, y + h);
   state->lineTo(x, y + h);
   state->closePath();
 }
 
 void Gfx::opClosePath(Object args[], int numArgs) {
   if (!state->isCurPt()) {
     error(getPos(), "No current point in closepath");
     return;
   }
   state->closePath();
 }
 
 //------------------------------------------------------------------------
 // path painting operators
 //------------------------------------------------------------------------
 
 void Gfx::opEndPath(Object args[], int numArgs) {
   doEndPath();
 }
 
 void Gfx::opStroke(Object args[], int numArgs) {
   if (!state->isCurPt()) {
     //error(getPos(), "No path in stroke");
     return;
   }
   if (state->isPath())
     out->stroke(state);
   doEndPath();
 }
 
 void Gfx::opCloseStroke(Object args[], int numArgs) {
   if (!state->isCurPt()) {
     //error(getPos(), "No path in closepath/stroke");
     return;
   }
   if (state->isPath()) {
     state->closePath();
     out->stroke(state);
   }
   doEndPath();
 }
 
 void Gfx::opFill(Object args[], int numArgs) {
   if (!state->isCurPt()) {
     //error(getPos(), "No path in fill");
     return;
   }
   if (state->isPath()) {
     if (state->getFillColorSpace()->getMode() == csPattern) {
       doPatternFill(gFalse);
     } else {
       out->fill(state);
     }
   }
   doEndPath();
 }
 
 void Gfx::opEOFill(Object args[], int numArgs) {
   if (!state->isCurPt()) {
     //error(getPos(), "No path in eofill");
     return;
   }
   if (state->isPath()) {
     if (state->getFillColorSpace()->getMode() == csPattern) {
       doPatternFill(gTrue);
     } else {
       out->eoFill(state);
     }
   }
   doEndPath();
 }
 
 void Gfx::opFillStroke(Object args[], int numArgs) {
   if (!state->isCurPt()) {
     //error(getPos(), "No path in fill/stroke");
     return;
   }
   if (state->isPath()) {
     if (state->getFillColorSpace()->getMode() == csPattern) {
       doPatternFill(gFalse);
     } else {
       out->fill(state);
     }
     out->stroke(state);
   }
   doEndPath();
 }
 
 void Gfx::opCloseFillStroke(Object args[], int numArgs) {
   if (!state->isCurPt()) {
     //error(getPos(), "No path in closepath/fill/stroke");
     return;
   }
   if (state->isPath()) {
     state->closePath();
     if (state->getFillColorSpace()->getMode() == csPattern) {
       doPatternFill(gFalse);
     } else {
       out->fill(state);
     }
     out->stroke(state);
   }
   doEndPath();
 }
 
 void Gfx::opEOFillStroke(Object args[], int numArgs) {
   if (!state->isCurPt()) {
     //error(getPos(), "No path in eofill/stroke");
     return;
   }
   if (state->isPath()) {
     if (state->getFillColorSpace()->getMode() == csPattern) {
       doPatternFill(gTrue);
     } else {
       out->eoFill(state);
     }
     out->stroke(state);
   }
   doEndPath();
 }
 
 void Gfx::opCloseEOFillStroke(Object args[], int numArgs) {
   if (!state->isCurPt()) {
     //error(getPos(), "No path in closepath/eofill/stroke");
     return;
   }
   if (state->isPath()) {
     state->closePath();
     if (state->getFillColorSpace()->getMode() == csPattern) {
       doPatternFill(gTrue);
     } else {
       out->eoFill(state);
     }
     out->stroke(state);
   }
   doEndPath();
 }
 
 void Gfx::doPatternFill(GBool eoFill) {
   GfxPatternColorSpace *patCS;
   GfxPattern *pattern;
   GfxTilingPattern *tPat;
   GfxColorSpace *cs;
   fouble xMin, yMin, xMax, yMax, x, y, x1, y1;
   fouble cxMin, cyMin, cxMax, cyMax;
   int xi0, yi0, xi1, yi1, xi, yi;
   fouble *ctm, *btm, *ptm;
   fouble m[6], ictm[6], m1[6], imb[6];
   fouble det;
   fouble xstep, ystep;
   int i;
 
   // this is a bit of a kludge -- patterns can be really slow, so we
   // skip them if we're only doing text extraction, since they almost
   // certainly don't contain any text
   if (!out->needNonText()) {
     return;
   }
 
   // get color space
   patCS = (GfxPatternColorSpace *)state->getFillColorSpace();
 
   // get pattern
   if (!(pattern = state->getFillPattern())) {
     return;
   }
   if (pattern->getType() != 1) {
     return;
   }
   tPat = (GfxTilingPattern *)pattern;
 
   // construct a (pattern space) -> (current space) transform matrix
   ctm = state->getCTM();
   btm = baseMatrix;
   ptm = tPat->getMatrix();
   // iCTM = invert CTM
   det = 1 / (ctm[0] * ctm[3] - ctm[1] * ctm[2]);
   ictm[0] = ctm[3] * det;
   ictm[1] = -ctm[1] * det;
   ictm[2] = -ctm[2] * det;
   ictm[3] = ctm[0] * det;
   ictm[4] = (ctm[2] * ctm[5] - ctm[3] * ctm[4]) * det;
   ictm[5] = (ctm[1] * ctm[4] - ctm[0] * ctm[5]) * det;
   // m1 = PTM * BTM = PTM * base transform matrix
   m1[0] = ptm[0] * btm[0] + ptm[1] * btm[2];
   m1[1] = ptm[0] * btm[1] + ptm[1] * btm[3];
   m1[2] = ptm[2] * btm[0] + ptm[3] * btm[2];
   m1[3] = ptm[2] * btm[1] + ptm[3] * btm[3];
   m1[4] = ptm[4] * btm[0] + ptm[5] * btm[2] + btm[4];
   m1[5] = ptm[4] * btm[1] + ptm[5] * btm[3] + btm[5];
   // m = m1 * iCTM = (PTM * BTM) * (iCTM)
   m[0] = m1[0] * ictm[0] + m1[1] * ictm[2];
   m[1] = m1[0] * ictm[1] + m1[1] * ictm[3];
   m[2] = m1[2] * ictm[0] + m1[3] * ictm[2];
   m[3] = m1[2] * ictm[1] + m1[3] * ictm[3];
   m[4] = m1[4] * ictm[0] + m1[5] * ictm[2] + ictm[4];
   m[5] = m1[4] * ictm[1] + m1[5] * ictm[3] + ictm[5];
 
   // construct a (base space) -> (pattern space) transform matrix
   det = 1 / (m1[0] * m1[3] - m1[1] * m1[2]);
   imb[0] = m1[3] * det;
   imb[1] = -m1[1] * det;
   imb[2] = -m1[2] * det;
   imb[3] = m1[0] * det;
   imb[4] = (m1[2] * m1[5] - m1[3] * m1[4]) * det;
   imb[5] = (m1[1] * m1[4] - m1[0] * m1[5]) * det;
 
   // save current graphics state
   out->saveState(state);
   state = state->save();
 
   // set underlying color space (for uncolored tiling patterns)
   if (tPat->getPaintType() == 2 && (cs = patCS->getUnder())) {
     state->setFillColorSpace(cs->copy());
   } else {
     state->setFillColorSpace(new GfxDeviceGrayColorSpace());
   }
   state->setFillPattern(NULL);
   out->updateFillColor(state);
 
   // clip to current path
   state->clip();
   if (eoFill) {
     out->eoClip(state);
   } else {
     out->clip(state);
   }
   state->clearPath();
 
   // transform clip region bbox to pattern space
   state->getClipBBox(&cxMin, &cyMin, &cxMax, &cyMax);
   xMin = xMax = cxMin * imb[0] + cyMin * imb[2] + imb[4];
   yMin = yMax = cxMin * imb[1] + cyMin * imb[3] + imb[5];
   x1 = cxMin * imb[0] + cyMax * imb[2] + imb[4];
   y1 = cxMin * imb[1] + cyMax * imb[3] + imb[5];
   if (x1 < xMin) {
     xMin = x1;
   } else if (x1 > xMax) {
     xMax = x1;
   }
   if (y1 < yMin) {
     yMin = y1;
   } else if (y1 > yMax) {
     yMax = y1;
   }
   x1 = cxMax * imb[0] + cyMin * imb[2] + imb[4];
   y1 = cxMax * imb[1] + cyMin * imb[3] + imb[5];
   if (x1 < xMin) {
     xMin = x1;
   } else if (x1 > xMax) {
     xMax = x1;
   }
   if (y1 < yMin) {
     yMin = y1;
   } else if (y1 > yMax) {
     yMax = y1;
   }
   x1 = cxMax * imb[0] + cyMax * imb[2] + imb[4];
   y1 = cxMax * imb[1] + cyMax * imb[3] + imb[5];
   if (x1 < xMin) {
     xMin = x1;
   } else if (x1 > xMax) {
     xMax = x1;
   }
   if (y1 < yMin) {
     yMin = y1;
   } else if (y1 > yMax) {
     yMax = y1;
   }
 
   // draw the pattern
   //~ this should treat negative steps differently -- start at right/top
   //~ edge instead of left/bottom (?)
   xstep = fabs(tPat->getXStep());
   ystep = fabs(tPat->getYStep());
   xi0 = (int)floor(xMin / xstep);
   xi1 = (int)ceil(xMax / xstep);
   yi0 = (int)floor(yMin / ystep);
   yi1 = (int)ceil(yMax / ystep);
   for (i = 0; i < 4; ++i) {
     m1[i] = m[i];
   }
   for (yi = yi0; yi < yi1; ++yi) {
     for (xi = xi0; xi < xi1; ++xi) {
       x = xi * xstep;
       y = yi * ystep;
       m1[4] = x * m[0] + y * m[2] + m[4];
       m1[5] = x * m[1] + y * m[3] + m[5];
       doForm1(tPat->getContentStream(), tPat->getResDict(),
               m1, tPat->getBBox());
     }
   }
 
   // restore graphics state
   state = state->restore();
   out->restoreState(state);
 }
 
 void Gfx::opShFill(Object args[], int numArgs) {
   GfxShading *shading;
   fouble xMin, yMin, xMax, yMax;
 
   if (!(shading = res->lookupShading(args[0].getName()))) {
     return;
   }
 
   // save current graphics state
   out->saveState(state);
   state = state->save();
 
   // clip to bbox
   if (shading->getHasBBox()) {
     shading->getBBox(&xMin, &yMin, &xMax, &yMax);
     state->moveTo(xMin, yMin);
     state->lineTo(xMax, yMin);
     state->lineTo(xMax, yMax);
     state->lineTo(xMin, yMax);
     state->closePath();
     state->clip();
     out->clip(state);
     state->clearPath();
   }
 
   // set the color space
   state->setFillColorSpace(shading->getColorSpace()->copy());
 
   // do shading type-specific operations
   switch (shading->getType()) {
   case 2:
     doAxialShFill((GfxAxialShading *)shading);
     break;
   case 3:
     doRadialShFill((GfxRadialShading *)shading);
     break;
   }
 
   // restore graphics state
   state = state->restore();
   out->restoreState(state);
 
   delete shading;
 }
 
 void Gfx::doAxialShFill(GfxAxialShading *shading) {
   fouble xMin, yMin, xMax, yMax;
   fouble x0, y0, x1, y1;
   fouble dx, dy, mul;
   fouble tMin, tMax, t, tx, ty;
   fouble s[4], sMin, sMax, tmp;
   fouble ux0, uy0, ux1, uy1, vx0, vy0, vx1, vy1;
   fouble t0, t1, tt;
   fouble ta[axialMaxSplits + 1];
   int next[axialMaxSplits + 1];
   GfxColor color0, color1;
   int nComps;
   int i, j, k, kk;
 
   // get the clip region bbox
   state->getUserClipBBox(&xMin, &yMin, &xMax, &yMax);
 
   // compute min and max t values, based on the four corners of the
   // clip region bbox
   shading->getCoords(&x0, &y0, &x1, &y1);
   dx = x1 - x0;
   dy = y1 - y0;
   mul = 1 / (dx * dx + dy * dy);
   tMin = tMax = ((xMin - x0) * dx + (yMin - y0) * dy) * mul;
   t = ((xMin - x0) * dx + (yMax - y0) * dy) * mul;
   if (t < tMin) {
     tMin = t;
   } else if (t > tMax) {
     tMax = t;
   }
   t = ((xMax - x0) * dx + (yMin - y0) * dy) * mul;
   if (t < tMin) {
     tMin = t;
   } else if (t > tMax) {
     tMax = t;
   }
   t = ((xMax - x0) * dx + (yMax - y0) * dy) * mul;
   if (t < tMin) {
     tMin = t;
   } else if (t > tMax) {
     tMax = t;
   }
   if (tMin < 0 && !shading->getExtend0()) {
     tMin = 0;
   }
   if (tMax > 1 && !shading->getExtend1()) {
     tMax = 1;
   }
 
   // get the function domain
   t0 = shading->getDomain0();
   t1 = shading->getDomain1();
 
   // Traverse the t axis and do the shading.
   //
   // For each point (tx, ty) on the t axis, consider a line through
   // that point perpendicular to the t axis:
   //
   //     x(s) = tx + s * -dy   -->   s = (x - tx) / -dy
   //     y(s) = ty + s * dx    -->   s = (y - ty) / dx
   //
   // Then look at the intersection of this line with the bounding box
   // (xMin, yMin, xMax, yMax).  In the general case, there are four
   // intersection points:
   //
   //     s0 = (xMin - tx) / -dy
   //     s1 = (xMax - tx) / -dy
   //     s2 = (yMin - ty) / dx
   //     s3 = (yMax - ty) / dx
   //
   // and we want the middle two s values.
   //
   // In the case where dx = 0, take s0 and s1; in the case where dy =
   // 0, take s2 and s3.
   //
   // Each filled polygon is bounded by two of these line segments
   // perpdendicular to the t axis.
   //
   // The t axis is bisected into smaller regions until the color
   // difference across a region is small enough, and then the region
   // is painted with a single color.
 
   // set up
   nComps = shading->getColorSpace()->getNComps();
   ta[0] = tMin;
   ta[axialMaxSplits] = tMax;
   next[0] = axialMaxSplits;
 
   // compute the color at t = tMin
   if (tMin < 0) {
     tt = t0;
   } else if (tMin > 1) {
     tt = t1;
   } else {
     tt = t0 + (t1 - t0) * tMin;
   }
   shading->getColor(tt, &color0);
 
   // compute the coordinates of the point on the t axis at t = tMin;
   // then compute the intersection of the perpendicular line with the
   // bounding box
   tx = x0 + tMin * dx;
   ty = y0 + tMin * dy;
   if (dx == 0 && dy == 0) {
     sMin = sMax = 0;
   } if (dx == 0) {
     sMin = (xMin - tx) / -dy;
     sMax = (xMax - tx) / -dy;
     if (sMin > sMax) { tmp = sMin; sMin = sMax; sMax = tmp; }
   } else if (dy == 0) {
     sMin = (yMin - ty) / dx;
     sMax = (yMax - ty) / dx;
     if (sMin > sMax) { tmp = sMin; sMin = sMax; sMax = tmp; }
   } else {
     s[0] = (yMin - ty) / dx;
     s[1] = (yMax - ty) / dx;
     s[2] = (xMin - tx) / -dy;
     s[3] = (xMax - tx) / -dy;
     for (j = 0; j < 3; ++j) {
       kk = j;
       for (k = j + 1; k < 4; ++k) {
         if (s[k] < s[kk]) {
           kk = k;
         }
       }
       tmp = s[j]; s[j] = s[kk]; s[kk] = tmp;
     }
     sMin = s[1];
     sMax = s[2];
   }
   ux0 = tx - sMin * dy;
   uy0 = ty + sMin * dx;
   vx0 = tx - sMax * dy;
   vy0 = ty + sMax * dx;
 
   i = 0;
   while (i < axialMaxSplits) {
 
     // bisect until color difference is small enough or we hit the
     // bisection limit
     j = next[i];
     while (j > i + 1) {
       if (ta[j] < 0) {
         tt = t0;
       } else if (ta[j] > 1) {
         tt = t1;
       } else {
         tt = t0 + (t1 - t0) * ta[j];
       }
       shading->getColor(tt, &color1);
       for (k = 0; k < nComps; ++k) {
         if (fabs(color1.c[k] - color0.c[k]) > axialColorDelta) {
           break;
         }
       }
       if (k == nComps) {
         break;
       }
       k = (i + j) / 2;
       ta[k] = 0.5 * (ta[i] + ta[j]);
       next[i] = k;
       next[k] = j;
       j = k;
     }
 
     // use the average of the colors of the two sides of the region
     for (k = 0; k < nComps; ++k) {
       color0.c[k] = 0.5 * (color0.c[k] + color1.c[k]);
     }
 
     // compute the coordinates of the point on the t axis; then
     // compute the intersection of the perpendicular line with the
     // bounding box
     tx = x0 + ta[j] * dx;
     ty = y0 + ta[j] * dy;
     if (dx == 0 && dy == 0) {
       sMin = sMax = 0;
     } if (dx == 0) {
       sMin = (xMin - tx) / -dy;
       sMax = (xMax - tx) / -dy;
       if (sMin > sMax) { tmp = sMin; sMin = sMax; sMax = tmp; }
     } else if (dy == 0) {
       sMin = (yMin - ty) / dx;
       sMax = (yMax - ty) / dx;
       if (sMin > sMax) { tmp = sMin; sMin = sMax; sMax = tmp; }
     } else {
       s[0] = (yMin - ty) / dx;
       s[1] = (yMax - ty) / dx;
       s[2] = (xMin - tx) / -dy;
       s[3] = (xMax - tx) / -dy;
       for (j = 0; j < 3; ++j) {
         kk = j;
         for (k = j + 1; k < 4; ++k) {
           if (s[k] < s[kk]) {
             kk = k;
           }
         }
         tmp = s[j]; s[j] = s[kk]; s[kk] = tmp;
       }
       sMin = s[1];
       sMax = s[2];
     }
     ux1 = tx - sMin * dy;
     uy1 = ty + sMin * dx;
     vx1 = tx - sMax * dy;
     vy1 = ty + sMax * dx;
 
     // set the color
     state->setFillColor(&color0);
     out->updateFillColor(state);
 
     // fill the region
     state->moveTo(ux0, uy0);
     state->lineTo(vx0, vy0);
     state->lineTo(vx1, vy1);
     state->lineTo(ux1, uy1);
     state->closePath();
     out->fill(state);
     state->clearPath();
 
     // set up for next region
     ux0 = ux1;
     uy0 = uy1;
     vx0 = vx1;
     vy0 = vy1;
     color0 = color1;
     i = next[i];
   }
 }
 
 void Gfx::doRadialShFill(GfxRadialShading *shading) {
   fouble sMin, sMax, xMin, yMin, xMax, yMax;
   fouble x0, y0, r0, x1, y1, r1, t0, t1;
   int nComps;
   GfxColor colorA, colorB;
   fouble xa, ya, xb, yb, ra, rb;
   fouble ta, tb, sa, sb;
   int ia, ib, k, n;
   fouble *ctm;
   fouble angle, t;
 
   // get the shading info
   shading->getCoords(&x0, &y0, &r0, &x1, &y1, &r1);
   t0 = shading->getDomain0();
   t1 = shading->getDomain1();
   nComps = shading->getColorSpace()->getNComps();
 
   // compute the (possibly extended) s range
   sMin = 0;
   sMax = 1;
   if (shading->getExtend0()) {
     if (r0 < r1) {
       // extend the smaller end
       sMin = -r0 / (r1 - r0);
     } else {
       // extend the larger end
       //~ this computes the diagonal of the bounding box -- we should
       //~ really compute the intersection of the moving/expanding
       //~ circles with each of the four corners and look for the max
       //~ radius
       state->getUserClipBBox(&xMin, &yMin, &xMax, &yMax);
       sMin = (sqrt((xMax - xMin) * (xMax - xMin) +
                    (yMax - yMin) * (yMax - yMin)) - r0) / (r1 - r0);
       if (sMin > 0) {
         sMin = 0;
       } else if (sMin < -20) {
         // sanity check
         sMin = -20;
       }
     }
   }
   if (shading->getExtend1()) {
     if (r1 < r0) {
       // extend the smaller end
       sMax = -r0 / (r1 - r0);
     } else if (r1 > r0) {
       // extend the larger end
       state->getUserClipBBox(&xMin, &yMin, &xMax, &yMax);
       sMax = (sqrt((xMax - xMin) * (xMax - xMin) +
                    (yMax - yMin) * (yMax - yMin)) - r0) / (r1 - r0);
       if (sMax < 1) {
         sMin = 1;
       } else if (sMax > 20) {
         // sanity check
         sMax = 20;
       }
     }
   }
 
   // compute the number of steps into which circles must be divided to
   // achieve a curve flatness of 0.1 pixel in device space for the
   // largest circle (note that "device space" is 72 dpi when generating
   // PostScript, hence the relatively small 0.1 pixel accuracy)
   ctm = state->getCTM();
   t = fabs(ctm[0]);
   if (fabs(ctm[1]) > t) {
     t = fabs(ctm[1]);
   }
   if (fabs(ctm[2]) > t) {
     t = fabs(ctm[2]);
   }
   if (fabs(ctm[3]) > t) {
     t = fabs(ctm[3]);
   }
   if (r0 > r1) {
     t *= r0;
   } else {
     t *= r1;
   }
   if (t < 1) {
     n = 3;
   } else {
     n = (int)(M_PI / acos(1 - 0.1 / t));
     if (n < 3) {
       n = 3;
     } else if (n > 200) {
       n = 200;
     }
   }
 
   // Traverse the t axis and do the shading.
   //
   // This generates and fills a series of rings.  Each ring is defined
   // by two circles:
   //   sa, ta, xa, ya, ra, colorA
   //   sb, tb, xb, yb, rb, colorB
   //
   // The s/t axis is divided into radialMaxSplits parts; these parts
   // are combined as much as possible while respecting the
   // radialColorDelta parameter.
 
   // setup for the start circle
   ia = 0;
   sa = sMin;
   ta = t0 + sa * (t1 - t0);
   xa = x0 + sa * (x1 - x0);
   ya = y0 + sa * (y1 - y0);
   ra = r0 + sa * (r1 - r0);
   if (ta < t0) {
     shading->getColor(t0, &colorA);
   } else if (ta > t1) {
     shading->getColor(t1, &colorA);
   } else {
     shading->getColor(ta, &colorA);
   }
 
   while (ia < radialMaxSplits) {
 
     // go as far along the t axis (toward t1) as we can, such that the
     // color difference is within the tolerance (radialColorDelta) --
     // this uses bisection (between the current value, t, and t1),
     // limited to radialMaxSplits points along the t axis
     ib = radialMaxSplits;
     sb = sMin + ((fouble)ib / (fouble)radialMaxSplits) * (sMax - sMin);
     tb = t0 + sb * (t1 - t0);
     if (tb < t0) {
       shading->getColor(t0, &colorB);
     } else if (tb > t1) {
       shading->getColor(t1, &colorB);
     } else {
       shading->getColor(tb, &colorB);
     }
     while (ib - ia > 1) {
       for (k = 0; k < nComps; ++k) {
         if (fabs(colorB.c[k] - colorA.c[k]) > radialColorDelta) {
           break;
         }
       }
       if (k == nComps) {
         break;
       }
       ib = (ia + ib) / 2;
       sb = sMin + ((fouble)ib / (fouble)radialMaxSplits) * (sMax - sMin);
       tb = t0 + sb * (t1 - t0);
       if (tb < t0) {
         shading->getColor(t0, &colorB);
       } else if (tb > t1) {
         shading->getColor(t1, &colorB);
       } else {
         shading->getColor(tb, &colorB);
       }
     }
 
     // compute center and radius of the circle
     xb = x0 + sb * (x1 - x0);
     yb = y0 + sb * (y1 - y0);
     rb = r0 + sb * (r1 - r0);
 
     // use the average of the colors at the two circles
     for (k = 0; k < nComps; ++k) {
       colorA.c[k] = 0.5 * (colorA.c[k] + colorB.c[k]);
     }
     state->setFillColor(&colorA);
     out->updateFillColor(state);
 
     // construct path for first circle
     state->moveTo(xa + ra, ya);
     for (k = 1; k < n; ++k) {
       angle = ((fouble)k / (fouble)n) * 2 * M_PI;
       state->lineTo(xa + ra * cos(angle), ya + ra * sin(angle));
     }
     state->closePath();
 
     // construct and append path for second circle
     state->moveTo(xb + rb, yb);
     for (k = 1; k < n; ++k) {
       angle = ((fouble)k / (fouble)n) * 2 * M_PI;
       state->lineTo(xb + rb * cos(angle), yb + rb * sin(angle));
     }
     state->closePath();
 
     // fill the ring
     out->eoFill(state);
     state->clearPath();
 
     // step to the next value of t
     ia = ib;
     sa = sb;
     ta = tb;
     xa = xb;
     ya = yb;
     ra = rb;
     colorA = colorB;
   }
 }
 
 void Gfx::doEndPath() {
   if (state->isPath() && clip != clipNone) {
     state->clip();
     if (clip == clipNormal) {
       out->clip(state);
     } else {
       out->eoClip(state);
     }
   }
   clip = clipNone;
   state->clearPath();
 }
 
 //------------------------------------------------------------------------
 // path clipping operators
 //------------------------------------------------------------------------
 
 void Gfx::opClip(Object args[], int numArgs) {
   clip = clipNormal;
 }
 
 void Gfx::opEOClip(Object args[], int numArgs) {
   clip = clipEO;
 }
 
 //------------------------------------------------------------------------
 // text object operators
 //------------------------------------------------------------------------
 
 void Gfx::opBeginText(Object args[], int numArgs) {
   state->setTextMat(1, 0, 0, 1, 0, 0);
   state->textMoveTo(0, 0);
   out->updateTextMat(state);
   out->updateTextPos(state);
   fontChanged = gTrue;
 }
 
 void Gfx::opEndText(Object args[], int numArgs) {
 }
 
 //------------------------------------------------------------------------
 // text state operators
 //------------------------------------------------------------------------
 
 void Gfx::opSetCharSpacing(Object args[], int numArgs) {
   state->setCharSpace(args[0].getNum());
   out->updateCharSpace(state);
 }
 
 void Gfx::opSetFont(Object args[], int numArgs) {
   GfxFont *font;
 
   if (!(font = res->lookupFont(args[0].getName()))) {
     return;
   }
   if (printCommands) {
     printf("  font: tag=%s name='%s' %g\n",
            font->getTag()->getCString(),
            font->getName() ? font->getName()->getCString() : "???",
-           args[1].getNum());
+           static_cast<double>(args[1].getNum()));
     fflush(stdout);
   }
   state->setFont(font, args[1].getNum());
   fontChanged = gTrue;
 }
 
 void Gfx::opSetTextLeading(Object args[], int numArgs) {
   state->setLeading(args[0].getNum());
 }
 
 void Gfx::opSetTextRender(Object args[], int numArgs) {
   state->setRender(args[0].getInt());
   out->updateRender(state);
 }
 
 void Gfx::opSetTextRise(Object args[], int numArgs) {
   state->setRise(args[0].getNum());
   out->updateRise(state);
 }
 
 void Gfx::opSetWordSpacing(Object args[], int numArgs) {
   state->setWordSpace(args[0].getNum());
   out->updateWordSpace(state);
 }
 
 void Gfx::opSetHorizScaling(Object args[], int numArgs) {
   state->setHorizScaling(args[0].getNum());
   out->updateHorizScaling(state);
   fontChanged = gTrue;
 }
 
 //------------------------------------------------------------------------
 // text positioning operators
 //------------------------------------------------------------------------
 
 void Gfx::opTextMove(Object args[], int numArgs) {
   fouble tx, ty;
 
   tx = state->getLineX() + args[0].getNum();
   ty = state->getLineY() + args[1].getNum();
   state->textMoveTo(tx, ty);
   out->updateTextPos(state);
 }
 
 void Gfx::opTextMoveSet(Object args[], int numArgs) {
   fouble tx, ty;
 
   tx = state->getLineX() + args[0].getNum();
   ty = args[1].getNum();
   state->setLeading(-ty);
   ty += state->getLineY();
   state->textMoveTo(tx, ty);
   out->updateTextPos(state);
 }
 
 void Gfx::opSetTextMatrix(Object args[], int numArgs) {
   state->setTextMat(args[0].getNum(), args[1].getNum(),
                     args[2].getNum(), args[3].getNum(),
                     args[4].getNum(), args[5].getNum());
   state->textMoveTo(0, 0);
   out->updateTextMat(state);
   out->updateTextPos(state);
   fontChanged = gTrue;
 }
 
 void Gfx::opTextNextLine(Object args[], int numArgs) {
   fouble tx, ty;
 
   tx = state->getLineX();
   ty = state->getLineY() - state->getLeading();
   state->textMoveTo(tx, ty);
   out->updateTextPos(state);
 }
 
 //------------------------------------------------------------------------
 // text string operators
 //------------------------------------------------------------------------
 
 void Gfx::opShowText(Object args[], int numArgs) {
   if (!state->getFont()) {
     error(getPos(), "No font in show");
     return;
   }
   doShowText(args[0].getString());
 }
 
 void Gfx::opMoveShowText(Object args[], int numArgs) {
   fouble tx, ty;
 
   if (!state->getFont()) {
     error(getPos(), "No font in move/show");
     return;
   }
   tx = state->getLineX();
   ty = state->getLineY() - state->getLeading();
   state->textMoveTo(tx, ty);
   out->updateTextPos(state);
   doShowText(args[0].getString());
 }
 
 void Gfx::opMoveSetShowText(Object args[], int numArgs) {
   fouble tx, ty;
 
   if (!state->getFont()) {
     error(getPos(), "No font in move/set/show");
     return;
   }
   state->setWordSpace(args[0].getNum());
   state->setCharSpace(args[1].getNum());
   tx = state->getLineX();
   ty = state->getLineY() - state->getLeading();
   state->textMoveTo(tx, ty);
   out->updateWordSpace(state);
   out->updateCharSpace(state);
   out->updateTextPos(state);
   doShowText(args[2].getString());
 }
 
 void Gfx::opShowSpaceText(Object args[], int numArgs) {
   Array *a;
   Object obj;
   int wMode;
   int i;
 
   if (!state->getFont()) {
     error(getPos(), "No font in show/space");
     return;
   }
   wMode = state->getFont()->getWMode();
   a = args[0].getArray();
   for (i = 0; i < a->getLength(); ++i) {
     a->get(i, &obj);
     if (obj.isNum()) {
       if (wMode) {
         state->textShift(0, -obj.getNum() * 0.001 * state->getFontSize());
       } else {
         state->textShift(-obj.getNum() * 0.001 * state->getFontSize(), 0);
       }
       out->updateTextShift(state, obj.getNum());
     } else if (obj.isString()) {
       doShowText(obj.getString());
     } else {
       error(getPos(), "Element of show/space array must be number or string");
     }
     obj.free();
   }
 }
 
 void Gfx::doShowText(GString *s) {
   GfxFont *font;
   int wMode;
   fouble riseX, riseY;
   CharCode code;
   Unicode u[8];
   fouble x, y, dx, dy, dx2, dy2, curX, curY, tdx, tdy;
   fouble originX, originY, tOriginX, tOriginY;
   fouble oldCTM[6], newCTM[6];
   fouble *mat;
   Object charProc;
   Dict *resDict;
   Parser *oldParser;
   char *p;
   int len, n, uLen, nChars, nSpaces, i;
 
   if (fontChanged) {
     out->updateFont(state);
     fontChanged = gFalse;
   }
   font = state->getFont();
   wMode = font->getWMode();
 
   if (out->useDrawChar()) {
     out->beginString(state, s);
   }
 
   // handle a Type 3 char
   if (font->getType() == fontType3 && out->interpretType3Chars()) {
     mat = state->getCTM();
     for (i = 0; i < 6; ++i) {
       oldCTM[i] = mat[i];
     }
     mat = state->getTextMat();
     newCTM[0] = mat[0] * oldCTM[0] + mat[1] * oldCTM[2];
     newCTM[1] = mat[0] * oldCTM[1] + mat[1] * oldCTM[3];
     newCTM[2] = mat[2] * oldCTM[0] + mat[3] * oldCTM[2];
     newCTM[3] = mat[2] * oldCTM[1] + mat[3] * oldCTM[3];
     mat = font->getFontMatrix();
     newCTM[0] = mat[0] * newCTM[0] + mat[1] * newCTM[2];
     newCTM[1] = mat[0] * newCTM[1] + mat[1] * newCTM[3];
     newCTM[2] = mat[2] * newCTM[0] + mat[3] * newCTM[2];
     newCTM[3] = mat[2] * newCTM[1] + mat[3] * newCTM[3];
     newCTM[0] *= state->getFontSize();
     newCTM[3] *= state->getFontSize();
     newCTM[0] *= state->getHorizScaling();
     newCTM[2] *= state->getHorizScaling();
     state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
     curX = state->getCurX();
     curY = state->getCurY();
     oldParser = parser;
     p = s->getCString();
     len = s->getLength();
     while (len > 0) {
       n = font->getNextChar(p, len, &code,
                             u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
                             &dx, &dy, &originX, &originY);
       dx = dx * state->getFontSize() + state->getCharSpace();
       if (n == 1 && *p == ' ') {
         dx += state->getWordSpace();
       }
       dx *= state->getHorizScaling();
       dy *= state->getFontSize();
       state->textTransformDelta(dx, dy, &tdx, &tdy);
       state->transform(curX + riseX, curY + riseY, &x, &y);
       out->saveState(state);
       state = state->save();
       state->setCTM(newCTM[0], newCTM[1], newCTM[2], newCTM[3], x, y);
       //~ out->updateCTM(???)
       if (!out->beginType3Char(state, code, u, uLen)) {
         ((Gfx8BitFont *)font)->getCharProc(code, &charProc);
         if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
           pushResources(resDict);
         }
         if (charProc.isStream()) {
           display(&charProc, gFalse);
         } else {
           error(getPos(), "Missing or bad Type3 CharProc entry");
         }
         out->endType3Char(state);
         if (resDict) {
           popResources();
         }
         charProc.free();
       }
       state = state->restore();
       out->restoreState(state);
       // GfxState::restore() does *not* restore the current position,
       // so we track it here with (curX, curY)
       curX += tdx;
       curY += tdy;
       state->moveTo(curX, curY);
       p += n;
       len -= n;
     }
     parser = oldParser;
 
   } else if (out->useDrawChar()) {
     state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
     p = s->getCString();
     len = s->getLength();
     while (len > 0) {
       n = font->getNextChar(p, len, &code,
                             u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
                             &dx, &dy, &originX, &originY);
       if (wMode) {
         dx *= state->getFontSize();
         dy = dy * state->getFontSize() + state->getCharSpace();
         if (n == 1 && *p == ' ') {
           dy += state->getWordSpace();
         }
       } else {
         dx = dx * state->getFontSize() + state->getCharSpace();
         if (n == 1 && *p == ' ') {
           dx += state->getWordSpace();
         }
         dx *= state->getHorizScaling();
         dy *= state->getFontSize();
       }
       state->textTransformDelta(dx, dy, &tdx, &tdy);
       originX *= state->getFontSize();
       originY *= state->getFontSize();
       state->textTransformDelta(originX, originY, &tOriginX, &tOriginY);
       out->drawChar(state, state->getCurX() + riseX, state->getCurY() + riseY,
                     tdx, tdy, tOriginX, tOriginY, code, u, uLen);
       state->shift(tdx, tdy);
       p += n;
       len -= n;
     }
 
   } else {
     dx = dy = 0;
     p = s->getCString();
     len = s->getLength();
     nChars = nSpaces = 0;
     while (len > 0) {
       n = font->getNextChar(p, len, &code,
                             u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
                             &dx2, &dy2, &originX, &originY);
       dx += dx2;
       dy += dy2;
       if (n == 1 && *p == ' ') {
         ++nSpaces;
       }
       ++nChars;
       p += n;
       len -= n;
     }
     if (wMode) {
       dx *= state->getFontSize();
       dy = dy * state->getFontSize()
            + nChars * state->getCharSpace()
            + nSpaces * state->getWordSpace();
     } else {
       dx = dx * state->getFontSize()
            + nChars * state->getCharSpace()
            + nSpaces * state->getWordSpace();
       dx *= state->getHorizScaling();
       dy *= state->getFontSize();
     }
     state->textTransformDelta(dx, dy, &tdx, &tdy);
     out->drawString(state, s);
     state->shift(tdx, tdy);
   }
 
   if (out->useDrawChar()) {
     out->endString(state);
   }
 
   updateLevel += 10 * s->getLength();
 }
 
 //------------------------------------------------------------------------
 // XObject operators
 //------------------------------------------------------------------------
 
 void Gfx::opXObject(Object args[], int numArgs) {
   Object obj1, obj2, obj3, refObj;
 #if OPI_SUPPORT
   Object opiDict;
 #endif
 
   if (!res->lookupXObject(args[0].getName(), &obj1)) {
     return;
   }
   if (!obj1.isStream()) {
     error(getPos(), "XObject '%s' is wrong type", args[0].getName());
     obj1.free();
     return;
   }
 #if OPI_SUPPORT
   obj1.streamGetDict()->lookup("OPI", &opiDict);
   if (opiDict.isDict()) {
     out->opiBegin(state, opiDict.getDict());
   }
 #endif
   obj1.streamGetDict()->lookup("Subtype", &obj2);
   if (obj2.isName("Image")) {
     res->lookupXObjectNF(args[0].getName(), &refObj);
     doImage(&refObj, obj1.getStream(), gFalse);
     refObj.free();
   } else if (obj2.isName("Form")) {
     doForm(&obj1);
   } else if (obj2.isName("PS")) {
     obj1.streamGetDict()->lookup("Level1", &obj3);
     out->psXObject(obj1.getStream(),
                    obj3.isStream() ? obj3.getStream() : (Stream *)NULL);
   } else if (obj2.isName()) {
     error(getPos(), "Unknown XObject subtype '%s'", obj2.getName());
   } else {
     error(getPos(), "XObject subtype is missing or wrong type");
   }
   obj2.free();
 #if OPI_SUPPORT
   if (opiDict.isDict()) {
     out->opiEnd(state, opiDict.getDict());
   }
   opiDict.free();
 #endif
   obj1.free();
 }
 
 void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
   Dict *dict;
   int width, height;
   int bits;
   GBool mask;
   GBool invert;
   GfxColorSpace *colorSpace;
   GfxImageColorMap *colorMap;
   Object maskObj;
   GBool haveMask;
   int maskColors[2*gfxColorMaxComps];
   Object obj1, obj2;
   int i;
 
   // get stream dict
   dict = str->getDict();
 
   // get size
   dict->lookup("Width", &obj1);
   if (obj1.isNull()) {
     obj1.free();
     dict->lookup("W", &obj1);
   }
   if (!obj1.isInt())
     goto err2;
   width = obj1.getInt();
   obj1.free();
   dict->lookup("Height", &obj1);
   if (obj1.isNull()) {
     obj1.free();
     dict->lookup("H", &obj1);
   }
   if (!obj1.isInt())
     goto err2;
   height = obj1.getInt();
   obj1.free();
 
   // image or mask?
   dict->lookup("ImageMask", &obj1);
   if (obj1.isNull()) {
     obj1.free();
     dict->lookup("IM", &obj1);
   }
   mask = gFalse;
   if (obj1.isBool())
     mask = obj1.getBool();
   else if (!obj1.isNull())
     goto err2;
   obj1.free();
 
   // bit depth
   dict->lookup("BitsPerComponent", &obj1);
   if (obj1.isNull()) {
     obj1.free();
     dict->lookup("BPC", &obj1);
   }
   if (!obj1.isInt())
     goto err2;
   bits = obj1.getInt();
   obj1.free();
 
   // display a mask
   if (mask) {
 
     // check for inverted mask
     if (bits != 1)
       goto err1;
     invert = gFalse;
     dict->lookup("Decode", &obj1);
     if (obj1.isNull()) {
       obj1.free();
       dict->lookup("D", &obj1);
     }
     if (obj1.isArray()) {
       obj1.arrayGet(0, &obj2);
       if (obj2.isInt() && obj2.getInt() == 1)
         invert = gTrue;
       obj2.free();
     } else if (!obj1.isNull()) {
       goto err2;
     }
     obj1.free();
 
     // draw it
     out->drawImageMask(state, ref, str, width, height, invert, inlineImg);
 
   } else {
 
     // get color space and color map
     dict->lookup("ColorSpace", &obj1);
     if (obj1.isNull()) {
       obj1.free();
       dict->lookup("CS", &obj1);
     }
     if (obj1.isName()) {
       res->lookupColorSpace(obj1.getName(), &obj2);
       if (!obj2.isNull()) {
         obj1.free();
         obj1 = obj2;
       } else {
         obj2.free();
       }
     }
     colorSpace = GfxColorSpace::parse(&obj1);
     obj1.free();
     if (!colorSpace) {
       goto err1;
     }
     dict->lookup("Decode", &obj1);
     if (obj1.isNull()) {
       obj1.free();
       dict->lookup("D", &obj1);
     }
     colorMap = new GfxImageColorMap(bits, &obj1, colorSpace);
     obj1.free();
     if (!colorMap->isOk()) {
       delete colorMap;
       goto err1;
     }
 
     // get the mask
     haveMask = gFalse;
     dict->lookup("Mask", &maskObj);
     if (maskObj.isArray()) {
       for (i = 0; i < maskObj.arrayGetLength(); ++i) {
         maskObj.arrayGet(i, &obj1);
         maskColors[i] = obj1.getInt();
         obj1.free();
       }
       haveMask = gTrue;
     }
 
     // draw it
     out->drawImage(state, ref, str, width, height, colorMap,
                    haveMask ? maskColors : (int *)NULL,  inlineImg);
     delete colorMap;
 
     maskObj.free();
   }
 
   if ((i = width * height) > 1000) {
     i = 1000;
   }
   updateLevel += i;
 
   return;
 
  err2:
   obj1.free();
  err1:
   error(getPos(), "Bad image parameters");
 }
 
 void Gfx::doForm(Object *str) {
   Dict *dict;
   Object matrixObj, bboxObj;
   fouble m[6], bbox[6];
   Object resObj;
   Dict *resDict;
   Object obj1;
   int i;
 
   // get stream dict
   dict = str->streamGetDict();
 
   // check form type
   dict->lookup("FormType", &obj1);
   if (!(obj1.isInt() && obj1.getInt() == 1)) {
     error(getPos(), "Unknown form type");
   }
   obj1.free();
 
   // get bounding box
   dict->lookup("BBox", &bboxObj);
   if (!bboxObj.isArray()) {
     matrixObj.free();
     bboxObj.free();
     error(getPos(), "Bad form bounding box");
     return;
   }
   for (i = 0; i < 4; ++i) {
     bboxObj.arrayGet(i, &obj1);
     bbox[i] = obj1.getNum();
     obj1.free();
   }
   bboxObj.free();
 
   // get matrix
   dict->lookup("Matrix", &matrixObj);
   if (matrixObj.isArray()) {
     for (i = 0; i < 6; ++i) {
       matrixObj.arrayGet(i, &obj1);
       m[i] = obj1.getNum();
       obj1.free();
     }
   } else {
     m[0] = 1; m[1] = 0;
     m[2] = 0; m[3] = 1;
     m[4] = 0; m[5] = 0;
   }
   matrixObj.free();
 
   // get resources
   dict->lookup("Resources", &resObj);
   resDict = resObj.isDict() ? resObj.getDict() : (Dict *)NULL;
 
   // draw it
   doForm1(str, resDict, m, bbox);
 
   resObj.free();
 }
 
 void Gfx::doAnnot(Object *str, fouble xMin, fouble yMin,
                   fouble xMax, fouble yMax) {
   Dict *dict, *resDict;
   Object matrixObj, bboxObj, resObj;
   Object obj1;
   fouble m[6], bbox[6], ictm[6];
   fouble *ctm;
   fouble formX0, formY0, formX1, formY1;
   fouble annotX0, annotY0, annotX1, annotY1;
   fouble det, x, y, sx, sy;
   int i;
 
   // get stream dict
   dict = str->streamGetDict();
 
   // get the form bounding box
   dict->lookup("BBox", &bboxObj);
   if (!bboxObj.isArray()) {
     bboxObj.free();
     error(getPos(), "Bad form bounding box");
     return;
   }
   for (i = 0; i < 4; ++i) {
     bboxObj.arrayGet(i, &obj1);
     bbox[i] = obj1.getNum();
     obj1.free();
   }
   bboxObj.free();
 
   // get the form matrix
   dict->lookup("Matrix", &matrixObj);
   if (matrixObj.isArray()) {
     for (i = 0; i < 6; ++i) {
       matrixObj.arrayGet(i, &obj1);
       m[i] = obj1.getNum();
       obj1.free();
     }
   } else {
     m[0] = 1; m[1] = 0;
     m[2] = 0; m[3] = 1;
     m[4] = 0; m[5] = 0;
   }
   matrixObj.free();
 
   // transform the form bbox from form space to user space
   formX0 = bbox[0] * m[0] + bbox[1] * m[2] + m[4];
   formY0 = bbox[0] * m[1] + bbox[1] * m[3] + m[5];
   formX1 = bbox[2] * m[0] + bbox[3] * m[2] + m[4];
   formY1 = bbox[2] * m[1] + bbox[3] * m[3] + m[5];
 
   // transform the annotation bbox from default user space to user
   // space: (bbox * baseMatrix) * iCTM
   ctm = state->getCTM();
   det = 1 / (ctm[0] * ctm[3] - ctm[1] * ctm[2]);
   ictm[0] = ctm[3] * det;
   ictm[1] = -ctm[1] * det;
   ictm[2] = -ctm[2] * det;
   ictm[3] = ctm[0] * det;
   ictm[4] = (ctm[2] * ctm[5] - ctm[3] * ctm[4]) * det;
   ictm[5] = (ctm[1] * ctm[4] - ctm[0] * ctm[5]) * det;
   x = baseMatrix[0] * xMin + baseMatrix[2] * yMin + baseMatrix[4];
   y = baseMatrix[1] * xMin + baseMatrix[3] * yMin + baseMatrix[5];
   annotX0 = ictm[0] * x + ictm[2] * y + ictm[4];
   annotY0 = ictm[1] * x + ictm[3] * y + ictm[5];
   x = baseMatrix[0] * xMax + baseMatrix[2] * yMax + baseMatrix[4];
   y = baseMatrix[1] * xMax + baseMatrix[3] * yMax + baseMatrix[5];
   annotX1 = ictm[0] * x + ictm[2] * y + ictm[4];
   annotY1 = ictm[1] * x + ictm[3] * y + ictm[5];
 
   // swap min/max coords
   if (formX0 > formX1) {
     x = formX0; formX0 = formX1; formX1 = x;
   }
   if (formY0 > formY1) {
     y = formY0; formY0 = formY1; formY1 = y;
   }
   if (annotX0 > annotX1) {
     x = annotX0; annotX0 = annotX1; annotX1 = x;
   }
   if (annotY0 > annotY1) {
     y = annotY0; annotY0 = annotY1; annotY1 = y;
   }
 
   // scale the form to fit the annotation bbox
   if (formX1 == formX0) {
     // this shouldn't happen
     sx = 1;
   } else {
     sx = (annotX1 - annotX0) / (formX1 - formX0);
   }
   if (formY1 == formY0) {
     // this shouldn't happen
     sy = 1;
   } else {
     sy = (annotY1 - annotY0) / (formY1 - formY0);
   }
   m[0] *= sx;
   m[2] *= sx;
   m[4] = (m[4] - formX0) * sx + annotX0;
   m[1] *= sy;
   m[3] *= sy;
   m[5] = (m[5] - formY0) * sy + annotY0;
 
   // get resources
   dict->lookup("Resources", &resObj);
   resDict = resObj.isDict() ? resObj.getDict() : (Dict *)NULL;
 
   // draw it
   doForm1(str, resDict, m, bbox);
 
   resObj.free();
   bboxObj.free();
 }
 
 void Gfx::doForm1(Object *str, Dict *resDict, fouble *matrix, fouble *bbox) {
   Parser *oldParser;
   fouble oldBaseMatrix[6];
   int i;
 
   // push new resources on stack
   pushResources(resDict);
 
   // save current graphics state
   out->saveState(state);
   state = state->save();
 
   // save current parser
   oldParser = parser;
 
   // set form transformation matrix
   state->concatCTM(matrix[0], matrix[1], matrix[2],
                    matrix[3], matrix[4], matrix[5]);
   out->updateCTM(state, matrix[0], matrix[1], matrix[2],
                  matrix[3], matrix[4], matrix[5]);
 
   // set new base matrix
   for (i = 0; i < 6; ++i) {
     oldBaseMatrix[i] = baseMatrix[i];
     baseMatrix[i] = state->getCTM()[i];
   }
 
   // set form bounding box
   state->moveTo(bbox[0], bbox[1]);
   state->lineTo(bbox[2], bbox[1]);
   state->lineTo(bbox[2], bbox[3]);
   state->lineTo(bbox[0], bbox[3]);
   state->closePath();
   state->clip();
   out->clip(state);
   state->clearPath();
 
   // draw the form
   display(str, gFalse);
 
   // restore base matrix
   for (i = 0; i < 6; ++i) {
     baseMatrix[i] = oldBaseMatrix[i];
   }
 
   // restore parser
   parser = oldParser;
 
   // restore graphics state
   state = state->restore();
   out->restoreState(state);
 
   // pop resource stack
   popResources();
 
   return;
 }
 
 void Gfx::pushResources(Dict *resDict) {
   res = new GfxResources(xref, resDict, res);
 }
 
 void Gfx::popResources() {
   GfxResources *resPtr;
 
   resPtr = res->getNext();
   delete res;
   res = resPtr;
 }
 
 //------------------------------------------------------------------------
 // in-line image operators
 //------------------------------------------------------------------------
 
 void Gfx::opBeginImage(Object args[], int numArgs) {
   Stream *str;
   int c1, c2;
 
   // build dict/stream
   str = buildImageStream();
 
   // display the image
   if (str) {
     doImage(NULL, str, gTrue);
   
     // skip 'EI' tag
     c1 = str->getBaseStream()->getChar();
     c2 = str->getBaseStream()->getChar();
     while (!(c1 == 'E' && c2 == 'I') && c2 != EOF) {
       c1 = c2;
       c2 = str->getBaseStream()->getChar();
     }
     delete str;
   }
 }
 
 Stream *Gfx::buildImageStream() {
   Object dict;
   Object obj;
   char *key;
   Stream *str;
 
   // build dictionary
   dict.initDict(xref);
   parser->getObj(&obj);
   while (!obj.isCmd("ID") && !obj.isEOF()) {
     if (!obj.isName()) {
       error(getPos(), "Inline image dictionary key must be a name object");
       obj.free();
     } else {
       key = copyString(obj.getName());
       obj.free();
       parser->getObj(&obj);
       if (obj.isEOF() || obj.isError()) {
         gfree(key);
         break;
       }
       dict.dictAdd(key, &obj);
     }
     parser->getObj(&obj);
   }
   if (obj.isEOF()) {
     error(getPos(), "End of file in inline image");
     obj.free();
     dict.free();
     return NULL;
   }
   obj.free();
 
   // make stream
   str = new EmbedStream(parser->getStream(), &dict);
   str = str->addFilters(&dict);
 
   return str;
 }
 
 void Gfx::opImageData(Object args[], int numArgs) {
   error(getPos(), "Internal: got 'ID' operator");
 }
 
 void Gfx::opEndImage(Object args[], int numArgs) {
   error(getPos(), "Internal: got 'EI' operator");
 }
 
 //------------------------------------------------------------------------
 // type 3 font operators
 //------------------------------------------------------------------------
 
 void Gfx::opSetCharWidth(Object args[], int numArgs) {
   out->type3D0(state, args[0].getNum(), args[1].getNum());
 }
 
 void Gfx::opSetCacheDevice(Object args[], int numArgs) {
   out->type3D1(state, args[0].getNum(), args[1].getNum(),
                args[2].getNum(), args[3].getNum(),
                args[4].getNum(), args[5].getNum());
 }
 
 //------------------------------------------------------------------------
 // compatibility operators
 //------------------------------------------------------------------------
 
 void Gfx::opBeginIgnoreUndef(Object args[], int numArgs) {
   ++ignoreUndef;
 }
 
 void Gfx::opEndIgnoreUndef(Object args[], int numArgs) {
   if (ignoreUndef > 0)
     --ignoreUndef;
 }
 
 //------------------------------------------------------------------------
 // marked content operators
 //------------------------------------------------------------------------
 
 void Gfx::opBeginMarkedContent(Object args[], int numArgs) {
   if (printCommands) {
     printf("  marked content: %s ", args[0].getName());
     if (numArgs == 2)
       args[2].print(stdout);
     printf("\n");
     fflush(stdout);
   }
 }
 
 void Gfx::opEndMarkedContent(Object args[], int numArgs) {
 }
 
 void Gfx::opMarkPoint(Object args[], int numArgs) {
   if (printCommands) {
     printf("  mark point: %s ", args[0].getName());
     if (numArgs == 2)
       args[2].print(stdout);
     printf("\n");
     fflush(stdout);
   }
 }
diff --git a/noncore/unsupported/qpdf/xpdf/Object.cc b/noncore/unsupported/qpdf/xpdf/Object.cc
index 6d92c6a..77f1317 100644
--- a/noncore/unsupported/qpdf/xpdf/Object.cc
+++ b/noncore/unsupported/qpdf/xpdf/Object.cc
@@ -1,223 +1,223 @@
 //========================================================================
 //
 // Object.cc
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
 //========================================================================
 
 #ifdef __GNUC__
 #pragma implementation
 #endif
 
 #include <aconf.h>
 #include <stddef.h>
 #include "Object.h"
 #include "Array.h"
 #include "Dict.h"
 #include "Error.h"
 #include "Stream.h"
 #include "XRef.h"
 
 //------------------------------------------------------------------------
 // Object
 //------------------------------------------------------------------------
 
 char *objTypeNames[numObjTypes] = {
   "boolean",
   "integer",
   "real",
   "string",
   "name",
   "null",
   "array",
   "dictionary",
   "stream",
   "ref",
   "cmd",
   "error",
   "eof",
   "none"
 };
 
 #ifdef DEBUG_MEM
 int Object::numAlloc[numObjTypes] =
   {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 #endif
 
 Object *Object::initArray(XRef *xref) {
   initObj(objArray);
   array = new Array(xref);
   return this;
 }
 
 Object *Object::initDict(XRef *xref) {
   initObj(objDict);
   dict = new Dict(xref);
   return this;
 }
 
 Object *Object::initStream(Stream *streamA) {
   initObj(objStream);
   stream = streamA;
   return this;
 }
 
 Object *Object::copy(Object *obj) {
   *obj = *this;
   switch (type) {
   case objString:
     obj->string = string->copy();
     break;
   case objName:
     obj->name = copyString(name);
     break;
   case objArray:
     array->incRef();
     break;
   case objDict:
     dict->incRef();
     break;
   case objStream:
     stream->incRef();
     break;
   case objCmd:
     obj->cmd = copyString(cmd);
     break;
   default:
     break;
   }
 #ifdef DEBUG_MEM
   ++numAlloc[type];
 #endif
   return obj;
 }
 
 Object *Object::fetch(XRef *xref, Object *obj) {
   return (type == objRef && xref) ?
          xref->fetch(ref.num, ref.gen, obj) : copy(obj);
 }
 
 void Object::free() {
   switch (type) {
   case objString:
     delete string;
     break;
   case objName:
     gfree(name);
     break;
   case objArray:
     if (!array->decRef()) {
       delete array;
     }
     break;
   case objDict:
     if (!dict->decRef()) {
       delete dict;
     }
     break;
   case objStream:
     if (!stream->decRef()) {
       delete stream;
     }
     break;
   case objCmd:
     gfree(cmd);
     break;
   default:
     break;
   }
 #ifdef DEBUG_MEM
   --numAlloc[type];
 #endif
   type = objNone;
 }
 
 char *Object::getTypeName() {
   return objTypeNames[type];
 }
 
 void Object::print(FILE *f) {
   Object obj;
   int i;
 
   switch (type) {
   case objBool:
     fprintf(f, "%s", booln ? "true" : "false");
     break;
   case objInt:
     fprintf(f, "%d", intg);
     break;
   case objReal:
-    fprintf(f, "%g", real);
+    fprintf(f, "%g", static_cast<double>(real));
     break;
   case objString:
     fprintf(f, "(");
     fwrite(string->getCString(), 1, string->getLength(), stdout);
     fprintf(f, ")");
     break;
   case objName:
     fprintf(f, "/%s", name);
     break;
   case objNull:
     fprintf(f, "null");
     break;
   case objArray:
     fprintf(f, "[");
     for (i = 0; i < arrayGetLength(); ++i) {
       if (i > 0)
         fprintf(f, " ");
       arrayGetNF(i, &obj);
       obj.print(f);
       obj.free();
     }
     fprintf(f, "]");
     break;
   case objDict:
     fprintf(f, "<<");
     for (i = 0; i < dictGetLength(); ++i) {
       fprintf(f, " /%s ", dictGetKey(i));
       dictGetValNF(i, &obj);
       obj.print(f);
       obj.free();
     }
     fprintf(f, " >>");
     break;
   case objStream:
     fprintf(f, "<stream>");
     break;
   case objRef:
     fprintf(f, "%d %d R", ref.num, ref.gen);
     break;
   case objCmd:
     fprintf(f, "%s", cmd);
     break;
   case objError:
     fprintf(f, "<error>");
     break;
   case objEOF:
     fprintf(f, "<EOF>");
     break;
   case objNone:
     fprintf(f, "<none>");
     break;
   }
 }
 
 void Object::memCheck(FILE *f) {
 #ifdef DEBUG_MEM
   int i;
   int t;
 
   t = 0;
   for (i = 0; i < numObjTypes; ++i)
     t += numAlloc[i];
   if (t > 0) {
     fprintf(f, "Allocated objects:\n");
     for (i = 0; i < numObjTypes; ++i) {
       if (numAlloc[i] > 0)
         fprintf(f, "  %-20s: %6d\n", objTypeNames[i], numAlloc[i]);
     }
   }
 #endif
 }
diff --git a/noncore/unsupported/qpdf/xpdf/Page.cc b/noncore/unsupported/qpdf/xpdf/Page.cc
index 9cc08c4..aead7da 100644
--- a/noncore/unsupported/qpdf/xpdf/Page.cc
+++ b/noncore/unsupported/qpdf/xpdf/Page.cc
@@ -1,281 +1,281 @@
 //========================================================================
 //
 // Page.cc
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
 //========================================================================
 
 #ifdef __GNUC__
 #pragma implementation
 #endif
 
 #include <aconf.h>
 #include <stddef.h>
 #include "Object.h"
 #include "Array.h"
 #include "Dict.h"
 #include "XRef.h"
 #include "Link.h"
 #include "OutputDev.h"
 #ifndef PDF_PARSER_ONLY
 #include "Gfx.h"
 #include "Annot.h"
 #endif
 #include "Error.h"
 #include "Page.h"
 
 //------------------------------------------------------------------------
 // PageAttrs
 //------------------------------------------------------------------------
 
 PageAttrs::PageAttrs(PageAttrs *attrs, Dict *dict) {
   Object obj1;
   fouble w, h;
 
   // get old/default values
   if (attrs) {
     mediaBox = attrs->mediaBox;
     cropBox = attrs->cropBox;
     haveCropBox = attrs->haveCropBox;
     rotate = attrs->rotate;
     attrs->resources.copy(&resources);
   } else {
     // set default MediaBox to 8.5" x 11" -- this shouldn't be necessary
     // but some (non-compliant) PDF files don't specify a MediaBox
     mediaBox.x1 = 0;
     mediaBox.y1 = 0;
     mediaBox.x2 = 612;
     mediaBox.y2 = 792;
     cropBox.x1 = cropBox.y1 = cropBox.x2 = cropBox.y2 = 0;
     haveCropBox = gFalse;
     rotate = 0;
     resources.initNull();
   }
 
   // media box
   readBox(dict, "MediaBox", &mediaBox);
 
   // crop box
   cropBox = mediaBox;
   haveCropBox = readBox(dict, "CropBox", &cropBox);
 
   // if the MediaBox is excessively larger than the CropBox,
   // just use the CropBox
   limitToCropBox = gFalse;
   if (haveCropBox) {
     w = 0.25 * (cropBox.x2 - cropBox.x1);
     h = 0.25 * (cropBox.y2 - cropBox.y1);
     if ((cropBox.x1 - mediaBox.x1) + (mediaBox.x2 - cropBox.x2) > w ||
         (cropBox.y1 - mediaBox.y1) + (mediaBox.y2 - cropBox.y2) > h) {
       limitToCropBox = gTrue;
     }
   }
 
   // other boxes
   bleedBox = cropBox;
   readBox(dict, "BleedBox", &bleedBox);
   trimBox = cropBox;
   readBox(dict, "TrimBox", &trimBox);
   artBox = cropBox;
   readBox(dict, "ArtBox", &artBox);
 
   // rotate
   dict->lookup("Rotate", &obj1);
   if (obj1.isInt()) {
     rotate = obj1.getInt();
   }
   obj1.free();
   while (rotate < 0) {
     rotate += 360;
   }
   while (rotate >= 360) {
     rotate -= 360;
   }
 
   // misc attributes
   dict->lookup("LastModified", &lastModified);
   dict->lookup("BoxColorInfo", &boxColorInfo);
   dict->lookup("Group", &group);
   dict->lookup("Metadata", &metadata);
   dict->lookup("PieceInfo", &pieceInfo);
   dict->lookup("SeparationInfo", &separationInfo);
 
   // resource dictionary
   dict->lookup("Resources", &obj1);
   if (obj1.isDict()) {
     resources.free();
     obj1.copy(&resources);
   }
   obj1.free();
 }
 
 PageAttrs::~PageAttrs() {
   lastModified.free();
   boxColorInfo.free();
   group.free();
   metadata.free();
   pieceInfo.free();
   separationInfo.free();
   resources.free();
 }
 
 GBool PageAttrs::readBox(Dict *dict, char *key, PDFRectangle *box) {
   PDFRectangle tmp;
   Object obj1, obj2;
   GBool ok;
 
   dict->lookup(key, &obj1);
   if (obj1.isArray() && obj1.arrayGetLength() == 4) {
     ok = gTrue;
     obj1.arrayGet(0, &obj2);
     if (obj2.isNum()) {
       tmp.x1 = obj2.getNum();
     } else {
       ok = gFalse;
     }
     obj2.free();
     obj1.arrayGet(1, &obj2);
     if (obj2.isNum()) {
       tmp.y1 = obj2.getNum();
     } else {
       ok = gFalse;
     }
     obj2.free();
     obj1.arrayGet(2, &obj2);
     if (obj2.isNum()) {
       tmp.x2 = obj2.getNum();
     } else {
       ok = gFalse;
     }
     obj2.free();
     obj1.arrayGet(3, &obj2);
     if (obj2.isNum()) {
       tmp.y2 = obj2.getNum();
     } else {
       ok = gFalse;
     }
     obj2.free();
     if (ok) {
       *box = tmp;
     }
   } else {
     ok = gFalse;
   }
   obj1.free();
   return ok;
 }
 
 //------------------------------------------------------------------------
 // Page
 //------------------------------------------------------------------------
 
 Page::Page(XRef *xrefA, int numA, Dict *pageDict, PageAttrs *attrsA,
            GBool printCommandsA) {
 
   ok = gTrue;
   xref = xrefA;
   num = numA;
   printCommands = printCommandsA;
 
   // get attributes
   attrs = attrsA;
 
   // annotations
   pageDict->lookupNF("Annots", &annots);
   if (!(annots.isRef() || annots.isArray() || annots.isNull())) {
     error(-1, "Page annotations object (page %d) is wrong type (%s)",
           num, annots.getTypeName());
     annots.free();
     goto err2;
   }
 
   // contents
   pageDict->lookupNF("Contents", &contents);
   if (!(contents.isRef() || contents.isArray() ||
         contents.isNull())) {
     error(-1, "Page contents object (page %d) is wrong type (%s)",
           num, contents.getTypeName());
     contents.free();
     goto err1;
   }
 
   return;
 
  err2:
   annots.initNull();
  err1:
   contents.initNull();
   ok = gFalse;
 }
 
 Page::~Page() {
   delete attrs;
   annots.free();
   contents.free();
 }
 
 void Page::display(OutputDev *out, fouble dpi, int rotate,
                    Links *links, Catalog *catalog) {
 #ifndef PDF_PARSER_ONLY
   PDFRectangle *box, *cropBox;
   Gfx *gfx;
   Object obj;
   Link *link;
   int i;
   Annots *annotList;
 
   box = getBox();
   cropBox = getCropBox();
 
   if (printCommands) {
     printf("***** MediaBox = ll:%g,%g ur:%g,%g\n",
-           box->x1, box->y1, box->x2, box->y2);
+           static_cast<double>(box->x1), static_cast<double>(box->y1), static_cast<double>(box->x2), static_cast<double>(box->y2));
     if (isCropped()) {
       printf("***** CropBox = ll:%g,%g ur:%g,%g\n",
-             cropBox->x1, cropBox->y1, cropBox->x2, cropBox->y2);
+             static_cast<double>(cropBox->x1), static_cast<double>(cropBox->y1), static_cast<double>(cropBox->x2), static_cast<double>(cropBox->y2));
     }
     printf("***** Rotate = %d\n", attrs->getRotate());
   }
 
   rotate += getRotate();
   if (rotate >= 360) {
     rotate -= 360;
   } else if (rotate < 0) {
     rotate += 360;
   }
   gfx = new Gfx(xref, out, num, attrs->getResourceDict(),
                 dpi, box, isCropped(), cropBox, rotate, printCommands);
   contents.fetch(xref, &obj);
   if (!obj.isNull()) {
     gfx->display(&obj);
   }
   obj.free();
 
   // draw links
   if (links) {
     for (i = 0; i < links->getNumLinks(); ++i) {
       link = links->getLink(i);
       out->drawLink(link, catalog);
     }
     out->dump();
   }
 
   // draw non-link annotations
   //~ need to reset CTM ???
   annotList = new Annots(xref, annots.fetch(xref, &obj));
   obj.free();
   if (annotList->getNumAnnots() > 0) {
     if (printCommands) {
       printf("***** Annotations\n");
     }
     for (i = 0; i < annotList->getNumAnnots(); ++i) {
       annotList->getAnnot(i)->draw(gfx);
     }
     out->dump();
   }
   delete annotList;
 
   delete gfx;
 #endif
 }