poppler/Gfx.cc | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)
New commits: commit de1501d87549269f9214c9e3fba4cbf39960826e Author: Albert Astals Cid <aa...@kde.org> Date: Wed Oct 13 19:18:36 2010 +0100 remove windows eol diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc index ed9accc..4f4510a 100644 --- a/poppler/Gfx.cc +++ b/poppler/Gfx.cc @@ -1262,8 +1262,8 @@ void Gfx::doSoftMask(Object *str, GBool alpha, if (obj1.isArray()) { for (i = 0; i < 6; ++i) { obj1.arrayGet(i, &obj2); - if (likely(obj2.isNum())) m[i] = obj2.getNum(); - else m[i] = 0; + if (likely(obj2.isNum())) m[i] = obj2.getNum(); + else m[i] = 0; obj2.free(); } } else { @@ -3400,21 +3400,21 @@ void Gfx::opSetTextLeading(Object args[], int numArgs) { void Gfx::opSetTextRender(Object args[], int numArgs) { int rm = state->getRender(); state->setRender(args[0].getInt()); - if ((args[0].getInt() & 4) && textHaveCSPattern && drawText) { - GBool needFill = out->deviceHasTextClip(state); - out->endTextObject(state); - if (needFill) { - doPatternFill(gTrue); - } - out->restoreState(state); - out->beginTextObject(state); - out->updateTextMat(state); - out->updateTextPos(state); - textHaveCSPattern = gFalse; - } else if ((rm & 4) && !(args[0].getInt() & 4) && out->supportTextCSPattern(state) && drawText) { - out->beginTextObject(state); - textHaveCSPattern = gTrue; - } + if ((args[0].getInt() & 4) && textHaveCSPattern && drawText) { + GBool needFill = out->deviceHasTextClip(state); + out->endTextObject(state); + if (needFill) { + doPatternFill(gTrue); + } + out->restoreState(state); + out->beginTextObject(state); + out->updateTextMat(state); + out->updateTextPos(state); + textHaveCSPattern = gFalse; + } else if ((rm & 4) && !(args[0].getInt() & 4) && out->supportTextCSPattern(state) && drawText) { + out->beginTextObject(state); + textHaveCSPattern = gTrue; + } out->updateRender(state); } @@ -4265,8 +4265,8 @@ void Gfx::doForm(Object *str) { if (matrixObj.isArray()) { for (i = 0; i < 6; ++i) { matrixObj.arrayGet(i, &obj1); - if (likely(obj1.isNum())) m[i] = obj1.getNum(); - else m[i] = 0; + if (likely(obj1.isNum())) m[i] = obj1.getNum(); + else m[i] = 0; obj1.free(); } } else { _______________________________________________ poppler mailing list poppler@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/poppler