summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/qpdf/xpdf/Gfx.cc2
-rw-r--r--noncore/unsupported/qpdf/xpdf/Object.cc2
-rw-r--r--noncore/unsupported/qpdf/xpdf/Page.cc4
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
@@ -1803,129 +1803,129 @@ void Gfx::doRadialShFill(GfxRadialShading *shading) {
1803 ra = rb; 1803 ra = rb;
1804 colorA = colorB; 1804 colorA = colorB;
1805 } 1805 }
1806} 1806}
1807 1807
1808void Gfx::doEndPath() { 1808void Gfx::doEndPath() {
1809 if (state->isPath() && clip != clipNone) { 1809 if (state->isPath() && clip != clipNone) {
1810 state->clip(); 1810 state->clip();
1811 if (clip == clipNormal) { 1811 if (clip == clipNormal) {
1812 out->clip(state); 1812 out->clip(state);
1813 } else { 1813 } else {
1814 out->eoClip(state); 1814 out->eoClip(state);
1815 } 1815 }
1816 } 1816 }
1817 clip = clipNone; 1817 clip = clipNone;
1818 state->clearPath(); 1818 state->clearPath();
1819} 1819}
1820 1820
1821//------------------------------------------------------------------------ 1821//------------------------------------------------------------------------
1822// path clipping operators 1822// path clipping operators
1823//------------------------------------------------------------------------ 1823//------------------------------------------------------------------------
1824 1824
1825void Gfx::opClip(Object args[], int numArgs) { 1825void Gfx::opClip(Object args[], int numArgs) {
1826 clip = clipNormal; 1826 clip = clipNormal;
1827} 1827}
1828 1828
1829void Gfx::opEOClip(Object args[], int numArgs) { 1829void Gfx::opEOClip(Object args[], int numArgs) {
1830 clip = clipEO; 1830 clip = clipEO;
1831} 1831}
1832 1832
1833//------------------------------------------------------------------------ 1833//------------------------------------------------------------------------
1834// text object operators 1834// text object operators
1835//------------------------------------------------------------------------ 1835//------------------------------------------------------------------------
1836 1836
1837void Gfx::opBeginText(Object args[], int numArgs) { 1837void Gfx::opBeginText(Object args[], int numArgs) {
1838 state->setTextMat(1, 0, 0, 1, 0, 0); 1838 state->setTextMat(1, 0, 0, 1, 0, 0);
1839 state->textMoveTo(0, 0); 1839 state->textMoveTo(0, 0);
1840 out->updateTextMat(state); 1840 out->updateTextMat(state);
1841 out->updateTextPos(state); 1841 out->updateTextPos(state);
1842 fontChanged = gTrue; 1842 fontChanged = gTrue;
1843} 1843}
1844 1844
1845void Gfx::opEndText(Object args[], int numArgs) { 1845void Gfx::opEndText(Object args[], int numArgs) {
1846} 1846}
1847 1847
1848//------------------------------------------------------------------------ 1848//------------------------------------------------------------------------
1849// text state operators 1849// text state operators
1850//------------------------------------------------------------------------ 1850//------------------------------------------------------------------------
1851 1851
1852void Gfx::opSetCharSpacing(Object args[], int numArgs) { 1852void Gfx::opSetCharSpacing(Object args[], int numArgs) {
1853 state->setCharSpace(args[0].getNum()); 1853 state->setCharSpace(args[0].getNum());
1854 out->updateCharSpace(state); 1854 out->updateCharSpace(state);
1855} 1855}
1856 1856
1857void Gfx::opSetFont(Object args[], int numArgs) { 1857void Gfx::opSetFont(Object args[], int numArgs) {
1858 GfxFont *font; 1858 GfxFont *font;
1859 1859
1860 if (!(font = res->lookupFont(args[0].getName()))) { 1860 if (!(font = res->lookupFont(args[0].getName()))) {
1861 return; 1861 return;
1862 } 1862 }
1863 if (printCommands) { 1863 if (printCommands) {
1864 printf(" font: tag=%s name='%s' %g\n", 1864 printf(" font: tag=%s name='%s' %g\n",
1865 font->getTag()->getCString(), 1865 font->getTag()->getCString(),
1866 font->getName() ? font->getName()->getCString() : "???", 1866 font->getName() ? font->getName()->getCString() : "???",
1867 args[1].getNum()); 1867 static_cast<double>(args[1].getNum()));
1868 fflush(stdout); 1868 fflush(stdout);
1869 } 1869 }
1870 state->setFont(font, args[1].getNum()); 1870 state->setFont(font, args[1].getNum());
1871 fontChanged = gTrue; 1871 fontChanged = gTrue;
1872} 1872}
1873 1873
1874void Gfx::opSetTextLeading(Object args[], int numArgs) { 1874void Gfx::opSetTextLeading(Object args[], int numArgs) {
1875 state->setLeading(args[0].getNum()); 1875 state->setLeading(args[0].getNum());
1876} 1876}
1877 1877
1878void Gfx::opSetTextRender(Object args[], int numArgs) { 1878void Gfx::opSetTextRender(Object args[], int numArgs) {
1879 state->setRender(args[0].getInt()); 1879 state->setRender(args[0].getInt());
1880 out->updateRender(state); 1880 out->updateRender(state);
1881} 1881}
1882 1882
1883void Gfx::opSetTextRise(Object args[], int numArgs) { 1883void Gfx::opSetTextRise(Object args[], int numArgs) {
1884 state->setRise(args[0].getNum()); 1884 state->setRise(args[0].getNum());
1885 out->updateRise(state); 1885 out->updateRise(state);
1886} 1886}
1887 1887
1888void Gfx::opSetWordSpacing(Object args[], int numArgs) { 1888void Gfx::opSetWordSpacing(Object args[], int numArgs) {
1889 state->setWordSpace(args[0].getNum()); 1889 state->setWordSpace(args[0].getNum());
1890 out->updateWordSpace(state); 1890 out->updateWordSpace(state);
1891} 1891}
1892 1892
1893void Gfx::opSetHorizScaling(Object args[], int numArgs) { 1893void Gfx::opSetHorizScaling(Object args[], int numArgs) {
1894 state->setHorizScaling(args[0].getNum()); 1894 state->setHorizScaling(args[0].getNum());
1895 out->updateHorizScaling(state); 1895 out->updateHorizScaling(state);
1896 fontChanged = gTrue; 1896 fontChanged = gTrue;
1897} 1897}
1898 1898
1899//------------------------------------------------------------------------ 1899//------------------------------------------------------------------------
1900// text positioning operators 1900// text positioning operators
1901//------------------------------------------------------------------------ 1901//------------------------------------------------------------------------
1902 1902
1903void Gfx::opTextMove(Object args[], int numArgs) { 1903void Gfx::opTextMove(Object args[], int numArgs) {
1904 fouble tx, ty; 1904 fouble tx, ty;
1905 1905
1906 tx = state->getLineX() + args[0].getNum(); 1906 tx = state->getLineX() + args[0].getNum();
1907 ty = state->getLineY() + args[1].getNum(); 1907 ty = state->getLineY() + args[1].getNum();
1908 state->textMoveTo(tx, ty); 1908 state->textMoveTo(tx, ty);
1909 out->updateTextPos(state); 1909 out->updateTextPos(state);
1910} 1910}
1911 1911
1912void Gfx::opTextMoveSet(Object args[], int numArgs) { 1912void Gfx::opTextMoveSet(Object args[], int numArgs) {
1913 fouble tx, ty; 1913 fouble tx, ty;
1914 1914
1915 tx = state->getLineX() + args[0].getNum(); 1915 tx = state->getLineX() + args[0].getNum();
1916 ty = args[1].getNum(); 1916 ty = args[1].getNum();
1917 state->setLeading(-ty); 1917 state->setLeading(-ty);
1918 ty += state->getLineY(); 1918 ty += state->getLineY();
1919 state->textMoveTo(tx, ty); 1919 state->textMoveTo(tx, ty);
1920 out->updateTextPos(state); 1920 out->updateTextPos(state);
1921} 1921}
1922 1922
1923void Gfx::opSetTextMatrix(Object args[], int numArgs) { 1923void Gfx::opSetTextMatrix(Object args[], int numArgs) {
1924 state->setTextMat(args[0].getNum(), args[1].getNum(), 1924 state->setTextMat(args[0].getNum(), args[1].getNum(),
1925 args[2].getNum(), args[3].getNum(), 1925 args[2].getNum(), args[3].getNum(),
1926 args[4].getNum(), args[5].getNum()); 1926 args[4].getNum(), args[5].getNum());
1927 state->textMoveTo(0, 0); 1927 state->textMoveTo(0, 0);
1928 out->updateTextMat(state); 1928 out->updateTextMat(state);
1929 out->updateTextPos(state); 1929 out->updateTextPos(state);
1930 fontChanged = gTrue; 1930 fontChanged = gTrue;
1931} 1931}
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
@@ -88,129 +88,129 @@ Object *Object::copy(Object *obj) {
88 break; 88 break;
89 } 89 }
90#ifdef DEBUG_MEM 90#ifdef DEBUG_MEM
91 ++numAlloc[type]; 91 ++numAlloc[type];
92#endif 92#endif
93 return obj; 93 return obj;
94} 94}
95 95
96Object *Object::fetch(XRef *xref, Object *obj) { 96Object *Object::fetch(XRef *xref, Object *obj) {
97 return (type == objRef && xref) ? 97 return (type == objRef && xref) ?
98 xref->fetch(ref.num, ref.gen, obj) : copy(obj); 98 xref->fetch(ref.num, ref.gen, obj) : copy(obj);
99} 99}
100 100
101void Object::free() { 101void Object::free() {
102 switch (type) { 102 switch (type) {
103 case objString: 103 case objString:
104 delete string; 104 delete string;
105 break; 105 break;
106 case objName: 106 case objName:
107 gfree(name); 107 gfree(name);
108 break; 108 break;
109 case objArray: 109 case objArray:
110 if (!array->decRef()) { 110 if (!array->decRef()) {
111 delete array; 111 delete array;
112 } 112 }
113 break; 113 break;
114 case objDict: 114 case objDict:
115 if (!dict->decRef()) { 115 if (!dict->decRef()) {
116 delete dict; 116 delete dict;
117 } 117 }
118 break; 118 break;
119 case objStream: 119 case objStream:
120 if (!stream->decRef()) { 120 if (!stream->decRef()) {
121 delete stream; 121 delete stream;
122 } 122 }
123 break; 123 break;
124 case objCmd: 124 case objCmd:
125 gfree(cmd); 125 gfree(cmd);
126 break; 126 break;
127 default: 127 default:
128 break; 128 break;
129 } 129 }
130#ifdef DEBUG_MEM 130#ifdef DEBUG_MEM
131 --numAlloc[type]; 131 --numAlloc[type];
132#endif 132#endif
133 type = objNone; 133 type = objNone;
134} 134}
135 135
136char *Object::getTypeName() { 136char *Object::getTypeName() {
137 return objTypeNames[type]; 137 return objTypeNames[type];
138} 138}
139 139
140void Object::print(FILE *f) { 140void Object::print(FILE *f) {
141 Object obj; 141 Object obj;
142 int i; 142 int i;
143 143
144 switch (type) { 144 switch (type) {
145 case objBool: 145 case objBool:
146 fprintf(f, "%s", booln ? "true" : "false"); 146 fprintf(f, "%s", booln ? "true" : "false");
147 break; 147 break;
148 case objInt: 148 case objInt:
149 fprintf(f, "%d", intg); 149 fprintf(f, "%d", intg);
150 break; 150 break;
151 case objReal: 151 case objReal:
152 fprintf(f, "%g", real); 152 fprintf(f, "%g", static_cast<double>(real));
153 break; 153 break;
154 case objString: 154 case objString:
155 fprintf(f, "("); 155 fprintf(f, "(");
156 fwrite(string->getCString(), 1, string->getLength(), stdout); 156 fwrite(string->getCString(), 1, string->getLength(), stdout);
157 fprintf(f, ")"); 157 fprintf(f, ")");
158 break; 158 break;
159 case objName: 159 case objName:
160 fprintf(f, "/%s", name); 160 fprintf(f, "/%s", name);
161 break; 161 break;
162 case objNull: 162 case objNull:
163 fprintf(f, "null"); 163 fprintf(f, "null");
164 break; 164 break;
165 case objArray: 165 case objArray:
166 fprintf(f, "["); 166 fprintf(f, "[");
167 for (i = 0; i < arrayGetLength(); ++i) { 167 for (i = 0; i < arrayGetLength(); ++i) {
168 if (i > 0) 168 if (i > 0)
169 fprintf(f, " "); 169 fprintf(f, " ");
170 arrayGetNF(i, &obj); 170 arrayGetNF(i, &obj);
171 obj.print(f); 171 obj.print(f);
172 obj.free(); 172 obj.free();
173 } 173 }
174 fprintf(f, "]"); 174 fprintf(f, "]");
175 break; 175 break;
176 case objDict: 176 case objDict:
177 fprintf(f, "<<"); 177 fprintf(f, "<<");
178 for (i = 0; i < dictGetLength(); ++i) { 178 for (i = 0; i < dictGetLength(); ++i) {
179 fprintf(f, " /%s ", dictGetKey(i)); 179 fprintf(f, " /%s ", dictGetKey(i));
180 dictGetValNF(i, &obj); 180 dictGetValNF(i, &obj);
181 obj.print(f); 181 obj.print(f);
182 obj.free(); 182 obj.free();
183 } 183 }
184 fprintf(f, " >>"); 184 fprintf(f, " >>");
185 break; 185 break;
186 case objStream: 186 case objStream:
187 fprintf(f, "<stream>"); 187 fprintf(f, "<stream>");
188 break; 188 break;
189 case objRef: 189 case objRef:
190 fprintf(f, "%d %d R", ref.num, ref.gen); 190 fprintf(f, "%d %d R", ref.num, ref.gen);
191 break; 191 break;
192 case objCmd: 192 case objCmd:
193 fprintf(f, "%s", cmd); 193 fprintf(f, "%s", cmd);
194 break; 194 break;
195 case objError: 195 case objError:
196 fprintf(f, "<error>"); 196 fprintf(f, "<error>");
197 break; 197 break;
198 case objEOF: 198 case objEOF:
199 fprintf(f, "<EOF>"); 199 fprintf(f, "<EOF>");
200 break; 200 break;
201 case objNone: 201 case objNone:
202 fprintf(f, "<none>"); 202 fprintf(f, "<none>");
203 break; 203 break;
204 } 204 }
205} 205}
206 206
207void Object::memCheck(FILE *f) { 207void Object::memCheck(FILE *f) {
208#ifdef DEBUG_MEM 208#ifdef DEBUG_MEM
209 int i; 209 int i;
210 int t; 210 int t;
211 211
212 t = 0; 212 t = 0;
213 for (i = 0; i < numObjTypes; ++i) 213 for (i = 0; i < numObjTypes; ++i)
214 t += numAlloc[i]; 214 t += numAlloc[i];
215 if (t > 0) { 215 if (t > 0) {
216 fprintf(f, "Allocated objects:\n"); 216 fprintf(f, "Allocated objects:\n");
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
@@ -169,113 +169,113 @@ GBool PageAttrs::readBox(Dict *dict, char *key, PDFRectangle *box) {
169//------------------------------------------------------------------------ 169//------------------------------------------------------------------------
170// Page 170// Page
171//------------------------------------------------------------------------ 171//------------------------------------------------------------------------
172 172
173Page::Page(XRef *xrefA, int numA, Dict *pageDict, PageAttrs *attrsA, 173Page::Page(XRef *xrefA, int numA, Dict *pageDict, PageAttrs *attrsA,
174 GBool printCommandsA) { 174 GBool printCommandsA) {
175 175
176 ok = gTrue; 176 ok = gTrue;
177 xref = xrefA; 177 xref = xrefA;
178 num = numA; 178 num = numA;
179 printCommands = printCommandsA; 179 printCommands = printCommandsA;
180 180
181 // get attributes 181 // get attributes
182 attrs = attrsA; 182 attrs = attrsA;
183 183
184 // annotations 184 // annotations
185 pageDict->lookupNF("Annots", &annots); 185 pageDict->lookupNF("Annots", &annots);
186 if (!(annots.isRef() || annots.isArray() || annots.isNull())) { 186 if (!(annots.isRef() || annots.isArray() || annots.isNull())) {
187 error(-1, "Page annotations object (page %d) is wrong type (%s)", 187 error(-1, "Page annotations object (page %d) is wrong type (%s)",
188 num, annots.getTypeName()); 188 num, annots.getTypeName());
189 annots.free(); 189 annots.free();
190 goto err2; 190 goto err2;
191 } 191 }
192 192
193 // contents 193 // contents
194 pageDict->lookupNF("Contents", &contents); 194 pageDict->lookupNF("Contents", &contents);
195 if (!(contents.isRef() || contents.isArray() || 195 if (!(contents.isRef() || contents.isArray() ||
196 contents.isNull())) { 196 contents.isNull())) {
197 error(-1, "Page contents object (page %d) is wrong type (%s)", 197 error(-1, "Page contents object (page %d) is wrong type (%s)",
198 num, contents.getTypeName()); 198 num, contents.getTypeName());
199 contents.free(); 199 contents.free();
200 goto err1; 200 goto err1;
201 } 201 }
202 202
203 return; 203 return;
204 204
205 err2: 205 err2:
206 annots.initNull(); 206 annots.initNull();
207 err1: 207 err1:
208 contents.initNull(); 208 contents.initNull();
209 ok = gFalse; 209 ok = gFalse;
210} 210}
211 211
212Page::~Page() { 212Page::~Page() {
213 delete attrs; 213 delete attrs;
214 annots.free(); 214 annots.free();
215 contents.free(); 215 contents.free();
216} 216}
217 217
218void Page::display(OutputDev *out, fouble dpi, int rotate, 218void Page::display(OutputDev *out, fouble dpi, int rotate,
219 Links *links, Catalog *catalog) { 219 Links *links, Catalog *catalog) {
220#ifndef PDF_PARSER_ONLY 220#ifndef PDF_PARSER_ONLY
221 PDFRectangle *box, *cropBox; 221 PDFRectangle *box, *cropBox;
222 Gfx *gfx; 222 Gfx *gfx;
223 Object obj; 223 Object obj;
224 Link *link; 224 Link *link;
225 int i; 225 int i;
226 Annots *annotList; 226 Annots *annotList;
227 227
228 box = getBox(); 228 box = getBox();
229 cropBox = getCropBox(); 229 cropBox = getCropBox();
230 230
231 if (printCommands) { 231 if (printCommands) {
232 printf("***** MediaBox = ll:%g,%g ur:%g,%g\n", 232 printf("***** MediaBox = ll:%g,%g ur:%g,%g\n",
233 box->x1, box->y1, box->x2, box->y2); 233 static_cast<double>(box->x1), static_cast<double>(box->y1), static_cast<double>(box->x2), static_cast<double>(box->y2));
234 if (isCropped()) { 234 if (isCropped()) {
235 printf("***** CropBox = ll:%g,%g ur:%g,%g\n", 235 printf("***** CropBox = ll:%g,%g ur:%g,%g\n",
236 cropBox->x1, cropBox->y1, cropBox->x2, cropBox->y2); 236 static_cast<double>(cropBox->x1), static_cast<double>(cropBox->y1), static_cast<double>(cropBox->x2), static_cast<double>(cropBox->y2));
237 } 237 }
238 printf("***** Rotate = %d\n", attrs->getRotate()); 238 printf("***** Rotate = %d\n", attrs->getRotate());
239 } 239 }
240 240
241 rotate += getRotate(); 241 rotate += getRotate();
242 if (rotate >= 360) { 242 if (rotate >= 360) {
243 rotate -= 360; 243 rotate -= 360;
244 } else if (rotate < 0) { 244 } else if (rotate < 0) {
245 rotate += 360; 245 rotate += 360;
246 } 246 }
247 gfx = new Gfx(xref, out, num, attrs->getResourceDict(), 247 gfx = new Gfx(xref, out, num, attrs->getResourceDict(),
248 dpi, box, isCropped(), cropBox, rotate, printCommands); 248 dpi, box, isCropped(), cropBox, rotate, printCommands);
249 contents.fetch(xref, &obj); 249 contents.fetch(xref, &obj);
250 if (!obj.isNull()) { 250 if (!obj.isNull()) {
251 gfx->display(&obj); 251 gfx->display(&obj);
252 } 252 }
253 obj.free(); 253 obj.free();
254 254
255 // draw links 255 // draw links
256 if (links) { 256 if (links) {
257 for (i = 0; i < links->getNumLinks(); ++i) { 257 for (i = 0; i < links->getNumLinks(); ++i) {
258 link = links->getLink(i); 258 link = links->getLink(i);
259 out->drawLink(link, catalog); 259 out->drawLink(link, catalog);
260 } 260 }
261 out->dump(); 261 out->dump();
262 } 262 }
263 263
264 // draw non-link annotations 264 // draw non-link annotations
265 //~ need to reset CTM ??? 265 //~ need to reset CTM ???
266 annotList = new Annots(xref, annots.fetch(xref, &obj)); 266 annotList = new Annots(xref, annots.fetch(xref, &obj));
267 obj.free(); 267 obj.free();
268 if (annotList->getNumAnnots() > 0) { 268 if (annotList->getNumAnnots() > 0) {
269 if (printCommands) { 269 if (printCommands) {
270 printf("***** Annotations\n"); 270 printf("***** Annotations\n");
271 } 271 }
272 for (i = 0; i < annotList->getNumAnnots(); ++i) { 272 for (i = 0; i < annotList->getNumAnnots(); ++i) {
273 annotList->getAnnot(i)->draw(gfx); 273 annotList->getAnnot(i)->draw(gfx);
274 } 274 }
275 out->dump(); 275 out->dump();
276 } 276 }
277 delete annotList; 277 delete annotList;
278 278
279 delete gfx; 279 delete gfx;
280#endif 280#endif
281} 281}