1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
--- src/kernel/pdfoperators.cc.orig 2016-06-11 06:39:28.304555000 +0900
+++ src/kernel/pdfoperators.cc 2016-06-11 06:42:54.331017000 +0900
@@ -129,7 +129,7 @@
//
//
//
-shared_ptr<PdfOperator>
+boost::shared_ptr<PdfOperator>
SimpleGenericOperator::clone ()
{
// Clone operands
@@ -144,7 +144,7 @@
void
-SimpleGenericOperator::init_operands (shared_ptr<observer::IObserver<IProperty> > observer,
+SimpleGenericOperator::init_operands (boost::shared_ptr<observer::IObserver<IProperty> > observer,
boost::weak_ptr<CPdf> pdf,
IndiRef* rf)
{
@@ -204,20 +204,20 @@
}
else if (name == "TJ")
{
- shared_ptr<IProperty> op = ops[0];
+ boost::shared_ptr<IProperty> op = ops[0];
if (!isArray(op) || ops.size() != 1)
{
utilsPrintDbg(debug::DBG_WARN, "Bad operands for TJ operator: ops[type="
<< op->getType() <<" size="<<ops.size()<<"]");
return;
}
- shared_ptr<CArray> opArray = IProperty::getSmartCObjectPtr<CArray>(op);
- std::vector<shared_ptr<IProperty> > props;
+ boost::shared_ptr<CArray> opArray = IProperty::getSmartCObjectPtr<CArray>(op);
+ std::vector<boost::shared_ptr<IProperty> > props;
opArray->_getAllChildObjects(props);
- std::vector<shared_ptr<IProperty> >::iterator i;
+ std::vector<boost::shared_ptr<IProperty> >::iterator i;
for(i=props.begin(); i!=props.end(); ++i)
{
- shared_ptr<IProperty> p = *i;
+ boost::shared_ptr<IProperty> p = *i;
// TODO consider spacing coming from values
if(!(isString(p)))
@@ -264,7 +264,7 @@
}
else if (name == "TJ")
{
- shared_ptr<IProperty> op = ops[0];
+ boost::shared_ptr<IProperty> op = ops[0];
if (!isArray(op) || ops.size() != 1)
{
utilsPrintDbg(debug::DBG_WARN, "Bad operands for TJ operator: ops[type="<< op->getType() <<" size="<<ops.size()<<"]");
@@ -311,7 +311,7 @@
{
assert(fontData);
const char* tag = fontData->getFontTag();
- shared_ptr<GfxResources> res = getContentStream()->getResources();
+ boost::shared_ptr<GfxResources> res = getContentStream()->getResources();
GfxFont* font = res->lookupFont(tag);
if(!font)
utilsPrintDbg(debug::DBG_ERR, "Unable to get font(name="
@@ -407,10 +407,10 @@
//
//
//
-shared_ptr<PdfOperator>
+boost::shared_ptr<PdfOperator>
UnknownCompositePdfOperator::clone ()
{
- shared_ptr<UnknownCompositePdfOperator> clone (new UnknownCompositePdfOperator(_opBegin,_opEnd));
+ boost::shared_ptr<UnknownCompositePdfOperator> 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 @@
//
//
//
-shared_ptr<PdfOperator>
+boost::shared_ptr<PdfOperator>
InlineImageCompositePdfOperator::clone ()
{
// Clone operands
- shared_ptr<CInlineImage> imgclone = IProperty::getSmartCObjectPtr<CInlineImage> (_inlineimage->clone());
+ boost::shared_ptr<CInlineImage> imgclone = IProperty::getSmartCObjectPtr<CInlineImage> (_inlineimage->clone());
// Create clone
- return shared_ptr<PdfOperator> (new InlineImageCompositePdfOperator (imgclone, _opBegin, _opEnd));
+ return boost::shared_ptr<PdfOperator> (new InlineImageCompositePdfOperator (imgclone, _opBegin, _opEnd));
}
@@ -505,7 +505,7 @@
const StateUpdater::CheckTypes* chcktp = StateUpdater::findOp (name.c_str());
// Operator not found, create unknown operator
if (NULL == chcktp)
- return shared_ptr<PdfOperator> (new SimpleGenericOperator (name ,operands));
+ return boost::shared_ptr<PdfOperator> (new SimpleGenericOperator (name ,operands));
assert (chcktp);
utilsPrintDbg (DBG_DBG, "Operator found. " << chcktp->name);
@@ -524,13 +524,13 @@
// If endTag is "" it is a simple operator, composite otherwise
//
if (isTextOp(*chcktp))
- return shared_ptr<PdfOperator> (new TextSimpleOperator(chcktp->name, argNum, operands));
+ return boost::shared_ptr<PdfOperator> (new TextSimpleOperator(chcktp->name, argNum, operands));
if (isSimpleOp(*chcktp))
- return shared_ptr<PdfOperator> (new SimpleGenericOperator (chcktp->name, argNum, operands));
+ return boost::shared_ptr<PdfOperator> (new SimpleGenericOperator (chcktp->name, argNum, operands));
// Composite operator
- return shared_ptr<PdfOperator> (new UnknownCompositePdfOperator (chcktp->name, chcktp->endTag));
+ return boost::shared_ptr<PdfOperator> (new UnknownCompositePdfOperator (chcktp->name, chcktp->endTag));
}
|
