poppler/Function.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
New commits: commit da0eff1aaa31c2bf357a64b6275645100c9629d4 Author: Carlos Garcia Campos <[email protected]> Date: Mon Sep 5 21:12:02 2011 +0200 xpdf303: Fixes in StitchingFunction diff --git a/poppler/Function.cc b/poppler/Function.cc index de9f35a..db390dc 100644 --- a/poppler/Function.cc +++ b/poppler/Function.cc @@ -681,8 +681,8 @@ StitchingFunction::StitchingFunction(Object *funcObj, Dict *dict, std::set<int> if (!(funcs[i] = Function::parse(&obj2, &usedParentsAux))) { goto err2; } - if (i > 0 && (funcs[i]->getInputSize() != 1 || - funcs[i]->getOutputSize() != funcs[0]->getOutputSize())) { + if (funcs[i]->getInputSize() != 1 || + (i > 0 && funcs[i]->getOutputSize() != funcs[0]->getOutputSize())) { error(errSyntaxError, -1, "Incompatible subfunctions in stitching function"); goto err2; @@ -750,8 +750,6 @@ StitchingFunction::StitchingFunction(StitchingFunction *func) { int i; memcpy(this, func, sizeof(StitchingFunction)); - - k = func->k; funcs = (Function **)gmallocn(k, sizeof(Function *)); for (i = 0; i < k; ++i) { funcs[i] = func->funcs[i]->copy(); _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
