--- src/kernel/pdfoperators.cc.orig 2010-04-27 18:42:09 UTC +++ src/kernel/pdfoperators.cc @@ -129,7 +129,7 @@ SimpleGenericOperator::getStringRepresen // // // -shared_ptr +boost::shared_ptr SimpleGenericOperator::clone () { // Clone operands @@ -144,7 +144,7 @@ SimpleGenericOperator::clone () void -SimpleGenericOperator::init_operands (shared_ptr > observer, +SimpleGenericOperator::init_operands (boost::shared_ptr > observer, boost::weak_ptr pdf, IndiRef* rf) { @@ -204,20 +204,20 @@ using namespace utils; } else if (name == "TJ") { - shared_ptr op = ops[0]; + boost::shared_ptr op = ops[0]; if (!isArray(op) || ops.size() != 1) { utilsPrintDbg(debug::DBG_WARN, "Bad operands for TJ operator: ops[type=" << op->getType() <<" size="< opArray = IProperty::getSmartCObjectPtr(op); - std::vector > props; + boost::shared_ptr opArray = IProperty::getSmartCObjectPtr(op); + std::vector > props; opArray->_getAllChildObjects(props); - std::vector >::iterator i; + std::vector >::iterator i; for(i=props.begin(); i!=props.end(); ++i) { - shared_ptr p = *i; + boost::shared_ptr p = *i; // TODO consider spacing coming from values if(!(isString(p))) @@ -264,7 +264,7 @@ TextSimpleOperator::setRawText (std::str } else if (name == "TJ") { - shared_ptr op = ops[0]; + boost::shared_ptr op = ops[0]; if (!isArray(op) || ops.size() != 1) { utilsPrintDbg(debug::DBG_WARN, "Bad operands for TJ operator: ops[type="<< op->getType() <<" size="<getFontTag(); - shared_ptr res = getContentStream()->getResources(); + boost::shared_ptr res = getContentStream()->getResources(); GfxFont* font = res->lookupFont(tag); if(!font) utilsPrintDbg(debug::DBG_ERR, "Unable to get font(name=" @@ -407,10 +407,10 @@ UnknownCompositePdfOperator::getStringRe // // // -shared_ptr +boost::shared_ptr UnknownCompositePdfOperator::clone () { - shared_ptr clone (new UnknownCompositePdfOperator(_opBegin,_opEnd)); + boost::shared_ptr clone (new UnknownCompositePdfOperator(_opBegin,_opEnd)); for (PdfOperators::iterator it = _children.begin(); it != _children.end(); ++it) clone->push_back ((*it)->clone(),getLastOperator(clone)); @@ -482,13 +482,13 @@ InlineImageCompositePdfOperator::getPara // // // -shared_ptr +boost::shared_ptr InlineImageCompositePdfOperator::clone () { // Clone operands - shared_ptr imgclone = IProperty::getSmartCObjectPtr (_inlineimage->clone()); + boost::shared_ptr imgclone = IProperty::getSmartCObjectPtr (_inlineimage->clone()); // Create clone - return shared_ptr (new InlineImageCompositePdfOperator (imgclone, _opBegin, _opEnd)); + return boost::shared_ptr (new InlineImageCompositePdfOperator (imgclone, _opBegin, _opEnd)); } @@ -505,7 +505,7 @@ boost::shared_ptr createOpe const StateUpdater::CheckTypes* chcktp = StateUpdater::findOp (name.c_str()); // Operator not found, create unknown operator if (NULL == chcktp) - return shared_ptr (new SimpleGenericOperator (name ,operands)); + return boost::shared_ptr (new SimpleGenericOperator (name ,operands)); assert (chcktp); utilsPrintDbg (DBG_DBG, "Operator found. " << chcktp->name); @@ -524,13 +524,13 @@ boost::shared_ptr createOpe // If endTag is "" it is a simple operator, composite otherwise // if (isTextOp(*chcktp)) - return shared_ptr (new TextSimpleOperator(chcktp->name, argNum, operands)); + return boost::shared_ptr (new TextSimpleOperator(chcktp->name, argNum, operands)); if (isSimpleOp(*chcktp)) - return shared_ptr (new SimpleGenericOperator (chcktp->name, argNum, operands)); + return boost::shared_ptr (new SimpleGenericOperator (chcktp->name, argNum, operands)); // Composite operator - return shared_ptr (new UnknownCompositePdfOperator (chcktp->name, chcktp->endTag)); + return boost::shared_ptr (new UnknownCompositePdfOperator (chcktp->name, chcktp->endTag)); }