| Revision | 49b6e98eb6d1cb0baff777e19c001d369cbffe6d (tree) |
|---|---|
| Zeit | 2021-09-19 08:14:26 |
| Autor | Fojtik |
| Commiter | Fojtik |
Read correctly JPG embedded inside EMF.
trunk/doc/cs.po (diff)
trunk/doc/wp2latex.man (diff)
trunk/sources.cc/atoms/lists.cc (diff) trunk/sources.cc/cp_lib/chars.c_ (diff) trunk/sources.cc/images/ras_img.cc (diff) trunk/sources.cc/images/ras_jpg.cc (diff) trunk/sources.cc/pass1rtf.cc (diff) trunk/sources.cc/pass1wmf.cc (diff)
trunk/sources.cc/word/wvparser.c (diff)
trunk/styles.tex/wp2latex.sty (diff) trunk/test/makefile (diff)| @@ -5,7 +5,7 @@ | ||
| 5 | 5 | msgstr "" |
| 6 | 6 | "Project-Id-Version: WP2LaTeX-3.87\n" |
| 7 | 7 | "Report-Msgid-Bugs-To: \n" |
| 8 | -"POT-Creation-Date: 2021-06-15 11:23+0200\n" | |
| 8 | +"POT-Creation-Date: 2021-09-18 15:36+0200\n" | |
| 9 | 9 | "PO-Revision-Date:\n" |
| 10 | 10 | "Last-Translator: Jaroslav Fojtik\n" |
| 11 | 11 | "Language-Team: Czech <cs@li.org>\n" |
| @@ -13,7 +13,15 @@ | ||
| 13 | 13 | "Content-Type: text/plain; charset=1250\n" |
| 14 | 14 | "Content-Transfer-Encoding: 8-bit\n" |
| 15 | 15 | "Language: cs\n" |
| 16 | -"Language: cs\n" | |
| 16 | + | |
| 17 | +#: ../sources.cc/charactr.cc:62 | |
| 18 | +#, c-format | |
| 19 | +msgid "" | |
| 20 | +"\n" | |
| 21 | +"Warning: Please define /CurrentFontSet for user symbol %u!" | |
| 22 | +msgstr "" | |
| 23 | +"\n" | |
| 24 | +"Varování: Prosím nastavte /CurrentFontSet pro uivatelský symbol %u!" | |
| 17 | 25 | |
| 18 | 26 | #: ../sources.cc/formulas.cc:403 |
| 19 | 27 | #, c-format |
| @@ -48,19 +56,10 @@ | ||
| 48 | 56 | msgid "% Formula error fixed by WP2LaTeX!\n" |
| 49 | 57 | msgstr "% Chyba v rovnici opravena programem WP2LaTeX!\n" |
| 50 | 58 | |
| 51 | -#: ../sources.cc/charactr.cc:62 | |
| 52 | -#, c-format | |
| 53 | -msgid "" | |
| 54 | -"\n" | |
| 55 | -"Warning: Please define /CurrentFontSet for user symbol %u!" | |
| 56 | -msgstr "" | |
| 57 | -"\n" | |
| 58 | -"Varování: Prosím nastavte /CurrentFontSet pro uivatelský symbol %u!" | |
| 59 | - | |
| 60 | 59 | # c-format |
| 61 | 60 | #: ../sources.cc/images.cc:58 ../sources.cc/images.cc:80 |
| 62 | -#: ../sources.cc/pass1abi.cc:409 ../sources.cc/pass1wmf.cc:1570 | |
| 63 | -#: ../sources.cc/pass1wmf.cc:2191 | |
| 61 | +#: ../sources.cc/pass1abi.cc:408 ../sources.cc/pass1wmf.cc:1687 | |
| 62 | +#: ../sources.cc/pass1wmf.cc:3352 | |
| 64 | 63 | #, c-format |
| 65 | 64 | msgid "" |
| 66 | 65 | "\n" |
| @@ -69,7 +68,7 @@ | ||
| 69 | 68 | "\n" |
| 70 | 69 | "Chyba: Nelze uloit soubor: \"%s\"!" |
| 71 | 70 | |
| 72 | -#: ../sources.cc/images.cc:314 | |
| 71 | +#: ../sources.cc/images.cc:308 | |
| 73 | 72 | #, c-format |
| 74 | 73 | msgid "" |
| 75 | 74 | "\n" |
| @@ -78,7 +77,7 @@ | ||
| 78 | 77 | "\n" |
| 79 | 78 | "Varování: Rastr s nulovou velikostí (%dx%d)?" |
| 80 | 79 | |
| 81 | -#: ../sources.cc/images.cc:316 | |
| 80 | +#: ../sources.cc/images.cc:310 | |
| 82 | 81 | #, c-format |
| 83 | 82 | msgid "" |
| 84 | 83 | "\n" |
| @@ -87,7 +86,7 @@ | ||
| 87 | 86 | "\n" |
| 88 | 87 | "Chyba: Nedostatek pamìti pro uloení rastru obrázku (%dx%d)!" |
| 89 | 88 | |
| 90 | -#: ../sources.cc/images.cc:428 | |
| 89 | +#: ../sources.cc/images.cc:423 | |
| 91 | 90 | #, c-format |
| 92 | 91 | msgid "" |
| 93 | 92 | "\n" |
| @@ -96,7 +95,7 @@ | ||
| 96 | 95 | "\n" |
| 97 | 96 | "Chyba: Konverzní modul WP5.x není dostupný v tomto sestavení!" |
| 98 | 97 | |
| 99 | -#: ../sources.cc/images.cc:746 | |
| 98 | +#: ../sources.cc/images.cc:741 | |
| 100 | 99 | #, c-format |
| 101 | 100 | msgid "" |
| 102 | 101 | "\n" |
| @@ -105,7 +104,7 @@ | ||
| 105 | 104 | "\n" |
| 106 | 105 | "Chyba: velikost polygonu %ld nestaèí pro %d prvkù!" |
| 107 | 106 | |
| 108 | -#: ../sources.cc/images.cc:903 | |
| 107 | +#: ../sources.cc/images.cc:898 | |
| 109 | 108 | #, c-format |
| 110 | 109 | msgid "" |
| 111 | 110 | "\n" |
| @@ -114,12 +113,12 @@ | ||
| 114 | 113 | "\n" |
| 115 | 114 | "Chyba: Nepodporovaná pøesnost %d, prosím polete mi obrázek pro analýzu." |
| 116 | 115 | |
| 117 | -#: ../sources.cc/images.cc:1006 | |
| 116 | +#: ../sources.cc/images.cc:1001 | |
| 118 | 117 | #, c-format |
| 119 | 118 | msgid "Error: Unsupported WPG2 compression %d, please report." |
| 120 | 119 | msgstr "Chyba: Nepodporovaná komprese %d uvnitø WPG2, prosím o nahláení." |
| 121 | 120 | |
| 122 | -#: ../sources.cc/images.cc:1030 | |
| 121 | +#: ../sources.cc/images.cc:1025 | |
| 123 | 122 | #, c-format |
| 124 | 123 | msgid "" |
| 125 | 124 | "\n" |
| @@ -128,12 +127,14 @@ | ||
| 128 | 127 | "\n" |
| 129 | 128 | "Chyba: nemohu dekomprimovat aktuální WPG rastr, pøeskakuji!" |
| 130 | 129 | |
| 131 | -#: ../sources.cc/images.cc:1521 | |
| 130 | +#: ../sources.cc/images.cc:1516 | |
| 132 | 131 | #, c-format |
| 133 | -msgid "Warning: Unexpected hatch pattern %d." | |
| 134 | -msgstr "Varování: Neoèekávaný typ rafování %d." | |
| 132 | +msgid "" | |
| 133 | +"\n" | |
| 134 | +"Warning: Unexpected hatch pattern %d." | |
| 135 | +msgstr "\nVarování: Neoèekávaný typ rafování %d." | |
| 135 | 136 | |
| 136 | -#: ../sources.cc/images.cc:1998 | |
| 137 | +#: ../sources.cc/images.cc:1993 | |
| 137 | 138 | #, c-format |
| 138 | 139 | msgid "" |
| 139 | 140 | "\n" |
| @@ -142,7 +143,7 @@ | ||
| 142 | 143 | "\n" |
| 143 | 144 | "Chyba: Nelze zapisovat do souboru %s !" |
| 144 | 145 | |
| 145 | -#: ../sources.cc/images.cc:2058 | |
| 146 | +#: ../sources.cc/images.cc:2053 | |
| 146 | 147 | #, c-format |
| 147 | 148 | msgid "" |
| 148 | 149 | "\n" |
| @@ -151,7 +152,7 @@ | ||
| 151 | 152 | "\n" |
| 152 | 153 | "Chyba: Nelze vyjmout obrázek a uloit do souboru '%s'!" |
| 153 | 154 | |
| 154 | -#: ../sources.cc/images.cc:2082 | |
| 155 | +#: ../sources.cc/images.cc:2077 | |
| 155 | 156 | #, c-format |
| 156 | 157 | msgid "" |
| 157 | 158 | "\n" |
| @@ -160,7 +161,7 @@ | ||
| 160 | 161 | "\n" |
| 161 | 162 | "Chyba: Soubor '%s' má patnou koncovku, mìla by být '%s'!" |
| 162 | 163 | |
| 163 | -#: ../sources.cc/images.cc:2168 | |
| 164 | +#: ../sources.cc/images.cc:2163 | |
| 164 | 165 | #, c-format |
| 165 | 166 | msgid "" |
| 166 | 167 | "\n" |
| @@ -169,7 +170,7 @@ | ||
| 169 | 170 | "\n" |
| 170 | 171 | "Otevírá externí obrázek %s " |
| 171 | 172 | |
| 172 | -#: ../sources.cc/images.cc:2193 | |
| 173 | +#: ../sources.cc/images.cc:2188 | |
| 173 | 174 | #, c-format |
| 174 | 175 | msgid "" |
| 175 | 176 | "\n" |
| @@ -178,7 +179,7 @@ | ||
| 178 | 179 | "\n" |
| 179 | 180 | "Chyba: Vnoøený obrázek na pozici %Xh s délkou %u vyøazen!" |
| 180 | 181 | |
| 181 | -#: ../sources.cc/images.cc:2215 ../sources.cc/images.cc:2447 | |
| 182 | +#: ../sources.cc/images.cc:2210 ../sources.cc/images.cc:2442 | |
| 182 | 183 | #, c-format |
| 183 | 184 | msgid "" |
| 184 | 185 | "\n" |
| @@ -187,7 +188,7 @@ | ||
| 187 | 188 | "\n" |
| 188 | 189 | "Varování: Nemohu otevøít soubor %s pro ètení!" |
| 189 | 190 | |
| 190 | -#: ../sources.cc/images.cc:2271 ../sources.cc/images.cc:2501 | |
| 191 | +#: ../sources.cc/images.cc:2266 ../sources.cc/images.cc:2496 | |
| 191 | 192 | #, c-format |
| 192 | 193 | msgid "" |
| 193 | 194 | "\n" |
| @@ -196,7 +197,7 @@ | ||
| 196 | 197 | "\n" |
| 197 | 198 | "Chyba: Konverzní modul \"%s\" není dostupný k souboru %s!" |
| 198 | 199 | |
| 199 | -#: ../sources.cc/images.cc:2286 ../sources.cc/images.cc:2513 | |
| 200 | +#: ../sources.cc/images.cc:2281 ../sources.cc/images.cc:2508 | |
| 200 | 201 | #, c-format |
| 201 | 202 | msgid "" |
| 202 | 203 | "\n" |
| @@ -205,7 +206,7 @@ | ||
| 205 | 206 | "\n" |
| 206 | 207 | "Chyba: Nelze rozpoznat typ souboru %s!" |
| 207 | 208 | |
| 208 | -#: ../sources.cc/images.cc:2390 | |
| 209 | +#: ../sources.cc/images.cc:2385 | |
| 209 | 210 | #, c-format |
| 210 | 211 | msgid "" |
| 211 | 212 | "\n" |
| @@ -214,13 +215,13 @@ | ||
| 214 | 215 | "\n" |
| 215 | 216 | "Varování: LaTeX nemùe manipulovat se soubory, které obsahují '%c'-> opraveno na '_'!" |
| 216 | 217 | |
| 217 | -#: ../sources.cc/images.cc:2472 ../sources.cc/pass1_6.cc:942 | |
| 218 | +#: ../sources.cc/images.cc:2467 ../sources.cc/pass1_6.cc:941 | |
| 218 | 219 | #: ../sources.cc/pass1ole.cc:95 |
| 219 | 220 | #, c-format |
| 220 | 221 | msgid "[nested \"%s\" %s] " |
| 221 | 222 | msgstr "[vnoøeno \"%s\" %s] " |
| 222 | 223 | |
| 223 | -#: ../sources.cc/images.cc:2478 ../sources.cc/pass1_6.cc:945 | |
| 224 | +#: ../sources.cc/images.cc:2473 ../sources.cc/pass1_6.cc:944 | |
| 224 | 225 | #: ../sources.cc/pass1ole.cc:99 |
| 225 | 226 | #, c-format |
| 226 | 227 | msgid "" |
| @@ -230,7 +231,7 @@ | ||
| 230 | 231 | "\n" |
| 231 | 232 | "[pokraèování] " |
| 232 | 233 | |
| 233 | -#: ../sources.cc/images.cc:2479 ../sources.cc/pass1_6.cc:946 | |
| 234 | +#: ../sources.cc/images.cc:2474 ../sources.cc/pass1_6.cc:945 | |
| 234 | 235 | #: ../sources.cc/pass1ole.cc:100 |
| 235 | 236 | msgid "" |
| 236 | 237 | "\n" |
| @@ -239,7 +240,7 @@ | ||
| 239 | 240 | "\n" |
| 240 | 241 | "--Konec vnoøeného souboru.--\n" |
| 241 | 242 | |
| 242 | -#: ../sources.cc/images.cc:2554 | |
| 243 | +#: ../sources.cc/images.cc:2549 | |
| 243 | 244 | #, c-format |
| 244 | 245 | msgid "" |
| 245 | 246 | "\n" |
| @@ -248,7 +249,7 @@ | ||
| 248 | 249 | "\n" |
| 249 | 250 | "Zdroj 'vnoøený obrázek' je ztracen, vícenásobné scény nejsou podporovány, prosím o opravu." |
| 250 | 251 | |
| 251 | -#: ../sources.cc/images.cc:2602 | |
| 252 | +#: ../sources.cc/images.cc:2597 | |
| 252 | 253 | #, c-format |
| 253 | 254 | msgid "" |
| 254 | 255 | "\n" |
| @@ -257,7 +258,7 @@ | ||
| 257 | 258 | "\n" |
| 258 | 259 | "Chyba: Existující návìtí nelze vloit vzhledem k sekvenci objektù." |
| 259 | 260 | |
| 260 | -#: ../sources.cc/images.cc:2702 | |
| 261 | +#: ../sources.cc/images.cc:2697 | |
| 261 | 262 | #, c-format |
| 262 | 263 | msgid "" |
| 263 | 264 | "\n" |
| @@ -267,7 +268,7 @@ | ||
| 267 | 268 | "\n" |
| 268 | 269 | "Chyba: InputPS.sty nepodporuje rotaci boxù. Pouijte namísto toho graphics.sty, graphicx.sty nebo epsfig.sty." |
| 269 | 270 | |
| 270 | -#: ../sources.cc/images.cc:2771 | |
| 271 | +#: ../sources.cc/images.cc:2766 | |
| 271 | 272 | msgid "First pass WPG:" |
| 272 | 273 | msgstr "První prùchod WPG:" |
| 273 | 274 |
| @@ -316,7 +317,7 @@ | ||
| 316 | 317 | "\n" |
| 317 | 318 | "Varování: Záporná tabelaèní odráka, opraveno!" |
| 318 | 319 | |
| 319 | -#: ../sources.cc/pass1.cc:2307 ../sources.cc/pass1_5.cc:1355 | |
| 320 | +#: ../sources.cc/pass1.cc:2307 ../sources.cc/pass1_5.cc:1349 | |
| 320 | 321 | msgid "List " |
| 321 | 322 | msgstr "Seznam " |
| 322 | 323 |
| @@ -330,305 +331,6 @@ | ||
| 330 | 331 | "\n" |
| 331 | 332 | "Chyba: Nedostatek pamìti." |
| 332 | 333 | |
| 333 | -#: ../sources.cc/pass1_1.cc:155 ../sources.cc/pass1_3.cc:1254 | |
| 334 | -#: ../sources.cc/pass1_4.cc:731 ../sources.cc/pass1_5.cc:1727 | |
| 335 | -#: ../sources.cc/pass1_6.cc:2758 | |
| 336 | -#, c-format | |
| 337 | -msgid "" | |
| 338 | -"\n" | |
| 339 | -"Error: Object %lX:%X consistency check failed. Trying to ignore." | |
| 340 | -msgstr "" | |
| 341 | -"\n" | |
| 342 | -"Chyba: Test konzistence objektu %lX:%X selhal. Zkouím jej ignorovat." | |
| 343 | - | |
| 344 | -#: ../sources.cc/pass1_1.cc:349 ../sources.cc/pass1_4.cc:965 | |
| 345 | -#, c-format | |
| 346 | -msgid "" | |
| 347 | -"\n" | |
| 348 | -"%*sObject type:%3Xh subtype:%3d length:%4u" | |
| 349 | -msgstr "" | |
| 350 | -"\n" | |
| 351 | -"%*sTyp objektu:%3Xh podtyp:%3d délka:%4u" | |
| 352 | - | |
| 353 | -#: ../sources.cc/pass1_1.cc:407 | |
| 354 | -msgid "First pass WP 1.x:" | |
| 355 | -msgstr "První prùchod WP 1.x:" | |
| 356 | - | |
| 357 | -#: ../sources.cc/pass1_3.cc:170 | |
| 358 | -#, c-format | |
| 359 | -msgid "" | |
| 360 | -"\n" | |
| 361 | -"Error: Resource #%d cannot be read!" | |
| 362 | -msgstr "" | |
| 363 | -"\n" | |
| 364 | -"Chyba: Nelze èíst paket #%d !" | |
| 365 | - | |
| 366 | -#: ../sources.cc/pass1_3.cc:204 | |
| 367 | -#, c-format | |
| 368 | -msgid "" | |
| 369 | -"\n" | |
| 370 | -"Wrong resource start offset %lu >= document start %lu." | |
| 371 | -msgstr "" | |
| 372 | -"\n" | |
| 373 | -"patná pozice poèátku 'zdrojového bloku' %lu >= poèátek dokumentu %lu." | |
| 374 | - | |
| 375 | -#: ../sources.cc/pass1_3.cc:212 | |
| 376 | -#, c-format | |
| 377 | -msgid "" | |
| 378 | -"\n" | |
| 379 | -"Wrong resource data size %u." | |
| 380 | -msgstr "" | |
| 381 | -"\n" | |
| 382 | -"Cybná délka 'zdrojového bloku' %u." | |
| 383 | - | |
| 384 | -#: ../sources.cc/pass1_3.cc:236 | |
| 385 | -#, c-format | |
| 386 | -msgid "" | |
| 387 | -"\n" | |
| 388 | -"Wrong resource map start offset %u >= document start %u." | |
| 389 | -msgstr "" | |
| 390 | -"\n" | |
| 391 | -"Chybný poèáteèní offset mapy zdrojových blokù %u >= poèátek dokumentu %u." | |
| 392 | - | |
| 393 | -#: ../sources.cc/pass1_3.cc:243 | |
| 394 | -#, c-format | |
| 395 | -msgid "" | |
| 396 | -"\n" | |
| 397 | -"Wrong resource map data size %u." | |
| 398 | -msgstr "" | |
| 399 | -"\n" | |
| 400 | -"Chybná délka mapy zdrojových blokù %u." | |
| 401 | - | |
| 402 | -#: ../sources.cc/pass1_3.cc:482 | |
| 403 | -#, c-format | |
| 404 | -msgid "" | |
| 405 | -"\n" | |
| 406 | -"Error: 0xC0 is not closed by its counterpart! File position=0x%X" | |
| 407 | -msgstr "" | |
| 408 | -"\n" | |
| 409 | -"Chyba: 0xC0 není ukonèeno párovým znakem! Pozice v souboru=0x%X" | |
| 410 | - | |
| 411 | -#: ../sources.cc/pass1_3.cc:989 ../sources.cc/pass1_5.cc:1500 | |
| 412 | -#, c-format | |
| 413 | -msgid "" | |
| 414 | -"\n" | |
| 415 | -"%*sStart Table" | |
| 416 | -msgstr "" | |
| 417 | -"\n" | |
| 418 | -"%*sZaèátek tabulky" | |
| 419 | - | |
| 420 | -#: ../sources.cc/pass1_3.cc:1151 ../sources.cc/pass1_6.cc:2661 | |
| 421 | -#, c-format | |
| 422 | -msgid "" | |
| 423 | -"\n" | |
| 424 | -"%*sIgnored from undo %d:" | |
| 425 | -msgstr "" | |
| 426 | -"\n" | |
| 427 | -"%*sIgnorováno od undo %d:" | |
| 428 | - | |
| 429 | -#: ../sources.cc/pass1_3.cc:1185 ../sources.cc/pass1_6.cc:2695 | |
| 430 | -#, c-format | |
| 431 | -msgid "" | |
| 432 | -"\n" | |
| 433 | -"Error: Undo/Redo stack is corrupted, Type=%d!" | |
| 434 | -msgstr "" | |
| 435 | -"\n" | |
| 436 | -"Chyba: Zásobník Undo/Redo je pokozen, Typ=%d!" | |
| 437 | - | |
| 438 | -#: ../sources.cc/pass1_3.cc:1215 ../sources.cc/pass1_6.cc:2725 | |
| 439 | -#, c-format | |
| 440 | -msgid "" | |
| 441 | -"\n" | |
| 442 | -"Warning: Strange Undo type:%d!" | |
| 443 | -msgstr "" | |
| 444 | -"\n" | |
| 445 | -"Varování: Podivný typ Undo: %d!" | |
| 446 | - | |
| 447 | -#: ../sources.cc/pass1_3.cc:1593 ../sources.cc/pass1_5.cc:2041 | |
| 448 | -#, c-format | |
| 449 | -msgid "" | |
| 450 | -"\n" | |
| 451 | -"%*sObject type:%3Xh subtype:%3X length:%4u %c" | |
| 452 | -msgstr "" | |
| 453 | -"\n" | |
| 454 | -"%*sTyp objektu:%3Xh podtyp:%3X délka:%4u %c" | |
| 455 | - | |
| 456 | -#: ../sources.cc/pass1_3.cc:1668 | |
| 457 | -msgid "First pass WP MAC 3.x:" | |
| 458 | -msgstr "První prùchod WP MAC 3.x:" | |
| 459 | - | |
| 460 | -#: ../sources.cc/pass1_4.cc:1025 | |
| 461 | -msgid "First pass WP 4.x:" | |
| 462 | -msgstr "První prùchod WP 4.x:" | |
| 463 | - | |
| 464 | -#: ../sources.cc/pass1_5.cc:295 | |
| 465 | -#, c-format | |
| 466 | -msgid "" | |
| 467 | -"\n" | |
| 468 | -"Error: WP prefix area is corrupted (block #%d), attempting to ignore!" | |
| 469 | -msgstr "" | |
| 470 | -"\n" | |
| 471 | -"Chyba: Oblast prefixù WP je pokozena (blok #%d), zkouím ji ignorovat!" | |
| 472 | - | |
| 473 | -#: ../sources.cc/pass1_5.cc:302 | |
| 474 | -#, c-format | |
| 475 | -msgid "" | |
| 476 | -"\n" | |
| 477 | -"Warning: Suspicious size of packet descriptors, skipping packet block %d!" | |
| 478 | -msgstr "" | |
| 479 | -"\n" | |
| 480 | -"Varování: Podezøelá délka popisovaèù paketu, pøeskakuji blok paketù %d!" | |
| 481 | - | |
| 482 | -#: ../sources.cc/pass1_5.cc:320 | |
| 483 | -#, c-format | |
| 484 | -msgid "" | |
| 485 | -"\n" | |
| 486 | -"Warning: Packet #%d inside block #%d has an invalid data pointer!" | |
| 487 | -msgstr "" | |
| 488 | -"\n" | |
| 489 | -"Varování: Paket #%d uvnitø bloku #%d má neplatný ukazatel na data!" | |
| 490 | - | |
| 491 | -#: ../sources.cc/pass1_5.cc:385 | |
| 492 | -#, c-format | |
| 493 | -msgid "" | |
| 494 | -"\n" | |
| 495 | -"Error: Graphics object #%d cannot be read!" | |
| 496 | -msgstr "" | |
| 497 | -"\n" | |
| 498 | -"Chyba: Grafický objekt #%d nelze naèíst!" | |
| 499 | - | |
| 500 | -#: ../sources.cc/pass1_5.cc:697 | |
| 501 | -#, c-format | |
| 502 | -msgid "" | |
| 503 | -"\n" | |
| 504 | -"Warning: The width of the Box is %f, are you sure?" | |
| 505 | -msgstr "" | |
| 506 | -"\n" | |
| 507 | -"Varování: íøka Boxu je %f, myslíte to vánì?" | |
| 508 | - | |
| 509 | -#: ../sources.cc/pass1_5.cc:2122 | |
| 510 | -msgid "First pass WP 5.x:" | |
| 511 | -msgstr "První prùchod WP 5.x:" | |
| 512 | - | |
| 513 | -#: ../sources.cc/pass1_6.cc:145 | |
| 514 | -#, c-format | |
| 515 | -msgid "" | |
| 516 | -"\n" | |
| 517 | -"Warning: Resource #%d seems to be corrupted, its contents will be ignored!" | |
| 518 | -msgstr "" | |
| 519 | -"\n" | |
| 520 | -"Varování: Paket #%d vypadá pokozenì, jeho obsah bude ignorován!" | |
| 521 | - | |
| 522 | -#: ../sources.cc/pass1_6.cc:169 | |
| 523 | -#, c-format | |
| 524 | -msgid "" | |
| 525 | -"\n" | |
| 526 | -"Resource array, # of resources:%u\n" | |
| 527 | -msgstr "" | |
| 528 | -"\n" | |
| 529 | -"Pole paketù, poèet paketù:%u\n" | |
| 530 | - | |
| 531 | -#: ../sources.cc/pass1_6.cc:176 | |
| 532 | -#, c-format | |
| 533 | -msgid "%2d: Start:%4lx, Len:%4lx, Type:%d, Flags:%d, Use:%d, Hidden:%d\n" | |
| 534 | -msgstr "%2d: Zaèátek:%4lx, Délka:%4lx, Typ:%d, Vlajky:%d, Uití:%d, Skryto:%d\n" | |
| 535 | - | |
| 536 | -#: ../sources.cc/pass1_6.cc:241 | |
| 537 | -#, c-format | |
| 538 | -msgid "" | |
| 539 | -"\n" | |
| 540 | -"Warning: Strange content of the resource #%d, it will be ignored!" | |
| 541 | -msgstr "" | |
| 542 | -"\n" | |
| 543 | -"Varování: Pochybný obsah paketu #%d, paket bude ignorován!" | |
| 544 | - | |
| 545 | -#: ../sources.cc/pass1_6.cc:477 | |
| 546 | -#, c-format | |
| 547 | -msgid "" | |
| 548 | -"\n" | |
| 549 | -"Warning: Box contains unexpected amount of resources %d!" | |
| 550 | -msgstr "" | |
| 551 | -"\n" | |
| 552 | -"Varování: Box obsahuje neoèekávaný poèet paketù %d!" | |
| 553 | - | |
| 554 | -#: ../sources.cc/pass1_6.cc:505 | |
| 555 | -#, c-format | |
| 556 | -msgid "" | |
| 557 | -"\n" | |
| 558 | -"Warning: Resource #0 should not be referred from data!" | |
| 559 | -msgstr "" | |
| 560 | -"\n" | |
| 561 | -"Varování: Paket #0 by nemìl být odkazován z dat!" | |
| 562 | - | |
| 563 | -#: ../sources.cc/pass1_6.cc:925 | |
| 564 | -#, c-format | |
| 565 | -msgid "" | |
| 566 | -"\n" | |
| 567 | -"Warning: Incorrect guess of OLE offset. Please send me this file for " | |
| 568 | -"analysis." | |
| 569 | -msgstr "" | |
| 570 | -"\n" | |
| 571 | -"Varování: Chyba v odhadu OLE offsetu. Prosím o zaslání tohoto souboru pro analýzu." | |
| 572 | - | |
| 573 | -#: ../sources.cc/pass1_6.cc:1407 ../sources.cc/pass1_6.cc:1589 | |
| 574 | -#, c-format | |
| 575 | -msgid "" | |
| 576 | -"\n" | |
| 577 | -"Warning: Cannot remove strange Endnote index!" | |
| 578 | -msgstr "" | |
| 579 | -"\n" | |
| 580 | -"Varování: Nelze vyøadit podivný index poznámky na konci!" | |
| 581 | - | |
| 582 | -#: ../sources.cc/pass1_6.cc:2208 | |
| 583 | -#, c-format | |
| 584 | -msgid "" | |
| 585 | -"\n" | |
| 586 | -"Warning: Label contains unexpected amount of resources %d!" | |
| 587 | -msgstr "" | |
| 588 | -"\n" | |
| 589 | -"Varování: Návìtí obsahuje neoèekávaný poèet paketù %d!" | |
| 590 | - | |
| 591 | -#: ../sources.cc/pass1_6.cc:2787 | |
| 592 | -#, c-format | |
| 593 | -msgid "" | |
| 594 | -"\n" | |
| 595 | -"Internal Error: Position skew was detected at 0x%X != 0x%X!" | |
| 596 | -msgstr "" | |
| 597 | -"\n" | |
| 598 | -"Interní chyba: Odchylka pøi urèování pozice v souboru rozdíl 0x%X != 0x%X!" | |
| 599 | - | |
| 600 | -#: ../sources.cc/pass1_6.cc:3195 | |
| 601 | -#, c-format | |
| 602 | -msgid "" | |
| 603 | -"\n" | |
| 604 | -"%*sObject type:%3Xh length:%4u" | |
| 605 | -msgstr "" | |
| 606 | -"\n" | |
| 607 | -"%*styp objektu:%3Xh délka:%4u" | |
| 608 | - | |
| 609 | -#: ../sources.cc/pass1_6.cc:3198 | |
| 610 | -#, c-format | |
| 611 | -msgid "" | |
| 612 | -"\n" | |
| 613 | -"%*sObject type:%3Xh subtype:%3Xh length:%4u" | |
| 614 | -msgstr "" | |
| 615 | -"\n" | |
| 616 | -"%*sTyp objektu:%3Xh podtyp:%3Xh délka:%4u" | |
| 617 | - | |
| 618 | -#: ../sources.cc/pass1_6.cc:3263 | |
| 619 | -#, c-format | |
| 620 | -msgid "" | |
| 621 | -"\n" | |
| 622 | -"Internal Error: Unknown dispatch %d." | |
| 623 | -msgstr "" | |
| 624 | -"\n" | |
| 625 | -"Interní chyba: Neznámý pøíkaz dispatch %d." | |
| 626 | - | |
| 627 | -# | |
| 628 | -#: ../sources.cc/pass1_6.cc:3295 | |
| 629 | -msgid "First pass WP 6.x:" | |
| 630 | -msgstr "První prùchod WP 6.x:" | |
| 631 | - | |
| 632 | 334 | #: ../sources.cc/pass1602.cc:356 |
| 633 | 335 | #, c-format |
| 634 | 336 | msgid "" |
| @@ -646,7 +348,306 @@ | ||
| 646 | 348 | msgid "First pass T602:" |
| 647 | 349 | msgstr "První prùchod T602:" |
| 648 | 350 | |
| 649 | -#: ../sources.cc/pass1abi.cc:359 | |
| 351 | +#: ../sources.cc/pass1_1.cc:151 ../sources.cc/pass1_3.cc:1249 | |
| 352 | +#: ../sources.cc/pass1_4.cc:727 ../sources.cc/pass1_5.cc:1721 | |
| 353 | +#: ../sources.cc/pass1_6.cc:2757 | |
| 354 | +#, c-format | |
| 355 | +msgid "" | |
| 356 | +"\n" | |
| 357 | +"Error: Object %lX:%X consistency check failed. Trying to ignore." | |
| 358 | +msgstr "" | |
| 359 | +"\n" | |
| 360 | +"Chyba: Test konzistence objektu %lX:%X selhal. Zkouím jej ignorovat." | |
| 361 | + | |
| 362 | +#: ../sources.cc/pass1_1.cc:345 ../sources.cc/pass1_4.cc:961 | |
| 363 | +#, c-format | |
| 364 | +msgid "" | |
| 365 | +"\n" | |
| 366 | +"%*sObject type:%3Xh subtype:%3d length:%4u" | |
| 367 | +msgstr "" | |
| 368 | +"\n" | |
| 369 | +"%*sTyp objektu:%3Xh podtyp:%3d délka:%4u" | |
| 370 | + | |
| 371 | +#: ../sources.cc/pass1_1.cc:403 | |
| 372 | +msgid "First pass WP 1.x:" | |
| 373 | +msgstr "První prùchod WP 1.x:" | |
| 374 | + | |
| 375 | +#: ../sources.cc/pass1_3.cc:165 | |
| 376 | +#, c-format | |
| 377 | +msgid "" | |
| 378 | +"\n" | |
| 379 | +"Error: Resource #%d cannot be read!" | |
| 380 | +msgstr "" | |
| 381 | +"\n" | |
| 382 | +"Chyba: Nelze èíst paket #%d !" | |
| 383 | + | |
| 384 | +#: ../sources.cc/pass1_3.cc:199 | |
| 385 | +#, c-format | |
| 386 | +msgid "" | |
| 387 | +"\n" | |
| 388 | +"Wrong resource start offset %lu >= document start %lu." | |
| 389 | +msgstr "" | |
| 390 | +"\n" | |
| 391 | +"patná pozice poèátku 'zdrojového bloku' %lu >= poèátek dokumentu %lu." | |
| 392 | + | |
| 393 | +#: ../sources.cc/pass1_3.cc:207 | |
| 394 | +#, c-format | |
| 395 | +msgid "" | |
| 396 | +"\n" | |
| 397 | +"Wrong resource data size %u." | |
| 398 | +msgstr "" | |
| 399 | +"\n" | |
| 400 | +"Cybná délka 'zdrojového bloku' %u." | |
| 401 | + | |
| 402 | +#: ../sources.cc/pass1_3.cc:231 | |
| 403 | +#, c-format | |
| 404 | +msgid "" | |
| 405 | +"\n" | |
| 406 | +"Wrong resource map start offset %u >= document start %u." | |
| 407 | +msgstr "" | |
| 408 | +"\n" | |
| 409 | +"Chybný poèáteèní offset mapy zdrojových blokù %u >= poèátek dokumentu %u." | |
| 410 | + | |
| 411 | +#: ../sources.cc/pass1_3.cc:238 | |
| 412 | +#, c-format | |
| 413 | +msgid "" | |
| 414 | +"\n" | |
| 415 | +"Wrong resource map data size %u." | |
| 416 | +msgstr "" | |
| 417 | +"\n" | |
| 418 | +"Chybná délka mapy zdrojových blokù %u." | |
| 419 | + | |
| 420 | +#: ../sources.cc/pass1_3.cc:477 | |
| 421 | +#, c-format | |
| 422 | +msgid "" | |
| 423 | +"\n" | |
| 424 | +"Error: 0xC0 is not closed by its counterpart! File position=0x%X" | |
| 425 | +msgstr "" | |
| 426 | +"\n" | |
| 427 | +"Chyba: 0xC0 není ukonèeno párovým znakem! Pozice v souboru=0x%X" | |
| 428 | + | |
| 429 | +#: ../sources.cc/pass1_3.cc:984 ../sources.cc/pass1_5.cc:1494 | |
| 430 | +#, c-format | |
| 431 | +msgid "" | |
| 432 | +"\n" | |
| 433 | +"%*sStart Table" | |
| 434 | +msgstr "" | |
| 435 | +"\n" | |
| 436 | +"%*sZaèátek tabulky" | |
| 437 | + | |
| 438 | +#: ../sources.cc/pass1_3.cc:1146 ../sources.cc/pass1_6.cc:2660 | |
| 439 | +#, c-format | |
| 440 | +msgid "" | |
| 441 | +"\n" | |
| 442 | +"%*sIgnored from undo %d:" | |
| 443 | +msgstr "" | |
| 444 | +"\n" | |
| 445 | +"%*sIgnorováno od undo %d:" | |
| 446 | + | |
| 447 | +#: ../sources.cc/pass1_3.cc:1180 ../sources.cc/pass1_6.cc:2694 | |
| 448 | +#, c-format | |
| 449 | +msgid "" | |
| 450 | +"\n" | |
| 451 | +"Error: Undo/Redo stack is corrupted, Type=%d!" | |
| 452 | +msgstr "" | |
| 453 | +"\n" | |
| 454 | +"Chyba: Zásobník Undo/Redo je pokozen, Typ=%d!" | |
| 455 | + | |
| 456 | +#: ../sources.cc/pass1_3.cc:1210 ../sources.cc/pass1_6.cc:2724 | |
| 457 | +#, c-format | |
| 458 | +msgid "" | |
| 459 | +"\n" | |
| 460 | +"Warning: Strange Undo type:%d!" | |
| 461 | +msgstr "" | |
| 462 | +"\n" | |
| 463 | +"Varování: Podivný typ Undo: %d!" | |
| 464 | + | |
| 465 | +#: ../sources.cc/pass1_3.cc:1588 ../sources.cc/pass1_5.cc:2035 | |
| 466 | +#, c-format | |
| 467 | +msgid "" | |
| 468 | +"\n" | |
| 469 | +"%*sObject type:%3Xh subtype:%3X length:%4u %c" | |
| 470 | +msgstr "" | |
| 471 | +"\n" | |
| 472 | +"%*sTyp objektu:%3Xh podtyp:%3X délka:%4u %c" | |
| 473 | + | |
| 474 | +#: ../sources.cc/pass1_3.cc:1663 | |
| 475 | +msgid "First pass WP MAC 3.x:" | |
| 476 | +msgstr "První prùchod WP MAC 3.x:" | |
| 477 | + | |
| 478 | +#: ../sources.cc/pass1_4.cc:1021 | |
| 479 | +msgid "First pass WP 4.x:" | |
| 480 | +msgstr "První prùchod WP 4.x:" | |
| 481 | + | |
| 482 | +#: ../sources.cc/pass1_5.cc:289 | |
| 483 | +#, c-format | |
| 484 | +msgid "" | |
| 485 | +"\n" | |
| 486 | +"Error: WP prefix area is corrupted (block #%d), attempting to ignore!" | |
| 487 | +msgstr "" | |
| 488 | +"\n" | |
| 489 | +"Chyba: Oblast prefixù WP je pokozena (blok #%d), zkouím ji ignorovat!" | |
| 490 | + | |
| 491 | +#: ../sources.cc/pass1_5.cc:296 | |
| 492 | +#, c-format | |
| 493 | +msgid "" | |
| 494 | +"\n" | |
| 495 | +"Warning: Suspicious size of packet descriptors, skipping packet block %d!" | |
| 496 | +msgstr "" | |
| 497 | +"\n" | |
| 498 | +"Varování: Podezøelá délka popisovaèù paketu, pøeskakuji blok paketù %d!" | |
| 499 | + | |
| 500 | +#: ../sources.cc/pass1_5.cc:314 | |
| 501 | +#, c-format | |
| 502 | +msgid "" | |
| 503 | +"\n" | |
| 504 | +"Warning: Packet #%d inside block #%d has an invalid data pointer!" | |
| 505 | +msgstr "" | |
| 506 | +"\n" | |
| 507 | +"Varování: Paket #%d uvnitø bloku #%d má neplatný ukazatel na data!" | |
| 508 | + | |
| 509 | +#: ../sources.cc/pass1_5.cc:379 | |
| 510 | +#, c-format | |
| 511 | +msgid "" | |
| 512 | +"\n" | |
| 513 | +"Error: Graphics object #%d cannot be read!" | |
| 514 | +msgstr "" | |
| 515 | +"\n" | |
| 516 | +"Chyba: Grafický objekt #%d nelze naèíst!" | |
| 517 | + | |
| 518 | +#: ../sources.cc/pass1_5.cc:691 | |
| 519 | +#, c-format | |
| 520 | +msgid "" | |
| 521 | +"\n" | |
| 522 | +"Warning: The width of the Box is %f, are you sure?" | |
| 523 | +msgstr "" | |
| 524 | +"\n" | |
| 525 | +"Varování: íøka Boxu je %f, myslíte to vánì?" | |
| 526 | + | |
| 527 | +#: ../sources.cc/pass1_5.cc:2116 | |
| 528 | +msgid "First pass WP 5.x:" | |
| 529 | +msgstr "První prùchod WP 5.x:" | |
| 530 | + | |
| 531 | +#: ../sources.cc/pass1_6.cc:145 | |
| 532 | +#, c-format | |
| 533 | +msgid "" | |
| 534 | +"\n" | |
| 535 | +"Warning: Resource #%d seems to be corrupted, its contents will be ignored!" | |
| 536 | +msgstr "" | |
| 537 | +"\n" | |
| 538 | +"Varování: Paket #%d vypadá pokozenì, jeho obsah bude ignorován!" | |
| 539 | + | |
| 540 | +#: ../sources.cc/pass1_6.cc:168 | |
| 541 | +#, c-format | |
| 542 | +msgid "" | |
| 543 | +"\n" | |
| 544 | +"Resource array, # of resources:%u\n" | |
| 545 | +msgstr "" | |
| 546 | +"\n" | |
| 547 | +"Pole paketù, poèet paketù:%u\n" | |
| 548 | + | |
| 549 | +#: ../sources.cc/pass1_6.cc:175 | |
| 550 | +#, c-format | |
| 551 | +msgid "%2d: Start:%4lx, Len:%4lx, Type:%d, Flags:%d, Use:%d, Hidden:%d\n" | |
| 552 | +msgstr "%2d: Zaèátek:%4lx, Délka:%4lx, Typ:%d, Vlajky:%d, Uití:%d, Skryto:%d\n" | |
| 553 | + | |
| 554 | +#: ../sources.cc/pass1_6.cc:240 | |
| 555 | +#, c-format | |
| 556 | +msgid "" | |
| 557 | +"\n" | |
| 558 | +"Warning: Strange content of the resource #%d, it will be ignored!" | |
| 559 | +msgstr "" | |
| 560 | +"\n" | |
| 561 | +"Varování: Pochybný obsah paketu #%d, paket bude ignorován!" | |
| 562 | + | |
| 563 | +#: ../sources.cc/pass1_6.cc:476 | |
| 564 | +#, c-format | |
| 565 | +msgid "" | |
| 566 | +"\n" | |
| 567 | +"Warning: Box contains unexpected amount of resources %d!" | |
| 568 | +msgstr "" | |
| 569 | +"\n" | |
| 570 | +"Varování: Box obsahuje neoèekávaný poèet paketù %d!" | |
| 571 | + | |
| 572 | +#: ../sources.cc/pass1_6.cc:504 | |
| 573 | +#, c-format | |
| 574 | +msgid "" | |
| 575 | +"\n" | |
| 576 | +"Warning: Resource #0 should not be referred from data!" | |
| 577 | +msgstr "" | |
| 578 | +"\n" | |
| 579 | +"Varování: Paket #0 by nemìl být odkazován z dat!" | |
| 580 | + | |
| 581 | +#: ../sources.cc/pass1_6.cc:924 | |
| 582 | +#, c-format | |
| 583 | +msgid "" | |
| 584 | +"\n" | |
| 585 | +"Warning: Incorrect guess of OLE offset. Please send me this file for " | |
| 586 | +"analysis." | |
| 587 | +msgstr "" | |
| 588 | +"\n" | |
| 589 | +"Varování: Chyba v odhadu OLE offsetu. Prosím o zaslání tohoto souboru pro analýzu." | |
| 590 | + | |
| 591 | +#: ../sources.cc/pass1_6.cc:1406 ../sources.cc/pass1_6.cc:1588 | |
| 592 | +#, c-format | |
| 593 | +msgid "" | |
| 594 | +"\n" | |
| 595 | +"Warning: Cannot remove strange Endnote index!" | |
| 596 | +msgstr "" | |
| 597 | +"\n" | |
| 598 | +"Varování: Nelze vyøadit podivný index poznámky na konci!" | |
| 599 | + | |
| 600 | +#: ../sources.cc/pass1_6.cc:2207 | |
| 601 | +#, c-format | |
| 602 | +msgid "" | |
| 603 | +"\n" | |
| 604 | +"Warning: Label contains unexpected amount of resources %d!" | |
| 605 | +msgstr "" | |
| 606 | +"\n" | |
| 607 | +"Varování: Návìtí obsahuje neoèekávaný poèet paketù %d!" | |
| 608 | + | |
| 609 | +#: ../sources.cc/pass1_6.cc:2786 | |
| 610 | +#, c-format | |
| 611 | +msgid "" | |
| 612 | +"\n" | |
| 613 | +"Internal Error: Position skew was detected at 0x%X != 0x%X!" | |
| 614 | +msgstr "" | |
| 615 | +"\n" | |
| 616 | +"Interní chyba: Odchylka pøi urèování pozice v souboru rozdíl 0x%X != 0x%X!" | |
| 617 | + | |
| 618 | +#: ../sources.cc/pass1_6.cc:3194 | |
| 619 | +#, c-format | |
| 620 | +msgid "" | |
| 621 | +"\n" | |
| 622 | +"%*sObject type:%3Xh length:%4u" | |
| 623 | +msgstr "" | |
| 624 | +"\n" | |
| 625 | +"%*styp objektu:%3Xh délka:%4u" | |
| 626 | + | |
| 627 | +#: ../sources.cc/pass1_6.cc:3197 | |
| 628 | +#, c-format | |
| 629 | +msgid "" | |
| 630 | +"\n" | |
| 631 | +"%*sObject type:%3Xh subtype:%3Xh length:%4u" | |
| 632 | +msgstr "" | |
| 633 | +"\n" | |
| 634 | +"%*sTyp objektu:%3Xh podtyp:%3Xh délka:%4u" | |
| 635 | + | |
| 636 | +#: ../sources.cc/pass1_6.cc:3262 | |
| 637 | +#, c-format | |
| 638 | +msgid "" | |
| 639 | +"\n" | |
| 640 | +"Internal Error: Unknown dispatch %d." | |
| 641 | +msgstr "" | |
| 642 | +"\n" | |
| 643 | +"Interní chyba: Neznámý pøíkaz dispatch %d." | |
| 644 | + | |
| 645 | +# | |
| 646 | +#: ../sources.cc/pass1_6.cc:3294 | |
| 647 | +msgid "First pass WP 6.x:" | |
| 648 | +msgstr "První prùchod WP 6.x:" | |
| 649 | + | |
| 650 | +#: ../sources.cc/pass1abi.cc:358 | |
| 650 | 651 | #, c-format |
| 651 | 652 | msgid "" |
| 652 | 653 | "\n" |
| @@ -655,7 +656,7 @@ | ||
| 655 | 656 | "\n" |
| 656 | 657 | "Varování: Neplatný znak '%c' (%d) uvnitø dat kódovaných v base64 bude ignorován!" |
| 657 | 658 | |
| 658 | -#: ../sources.cc/pass1abi.cc:723 ../sources.cc/pass1acc.cc:282 | |
| 659 | +#: ../sources.cc/pass1abi.cc:722 ../sources.cc/pass1acc.cc:282 | |
| 659 | 660 | #: ../sources.cc/pass1dcb.cc:315 ../sources.cc/pass1htm.cc:880 |
| 660 | 661 | #, c-format |
| 661 | 662 | msgid "" |
| @@ -663,7 +664,7 @@ | ||
| 663 | 664 | "%*s [%s %s] " |
| 664 | 665 | msgstr "" |
| 665 | 666 | |
| 666 | -#: ../sources.cc/pass1abi.cc:741 | |
| 667 | +#: ../sources.cc/pass1abi.cc:740 | |
| 667 | 668 | #, c-format |
| 668 | 669 | msgid "" |
| 669 | 670 | "\n" |
| @@ -676,7 +677,7 @@ | ||
| 676 | 677 | " Napsal J.Fojtík (Hostuje ve WP2LaTeXu :))))\n" |
| 677 | 678 | "\n" |
| 678 | 679 | |
| 679 | -#: ../sources.cc/pass1abi.cc:752 | |
| 680 | +#: ../sources.cc/pass1abi.cc:751 | |
| 680 | 681 | msgid "First pass Abiword:" |
| 681 | 682 | msgstr "První prùchod Abiword:" |
| 682 | 683 |
| @@ -924,7 +925,7 @@ | ||
| 924 | 925 | msgid "First pass UTF-8:" |
| 925 | 926 | msgstr "První prùchod UTF-8:" |
| 926 | 927 | |
| 927 | -#: ../sources.cc/pass1wmf.cc:358 | |
| 928 | +#: ../sources.cc/pass1wmf.cc:418 | |
| 928 | 929 | #, c-format |
| 929 | 930 | msgid "" |
| 930 | 931 | "\n" |
| @@ -934,7 +935,7 @@ | ||
| 934 | 935 | "Chyba: pokozený WMF objekt: \"%s\"." |
| 935 | 936 | |
| 936 | 937 | # |
| 937 | -#: ../sources.cc/pass1wmf.cc:384 | |
| 938 | +#: ../sources.cc/pass1wmf.cc:444 | |
| 938 | 939 | #, c-format |
| 939 | 940 | msgid "" |
| 940 | 941 | "\n" |
| @@ -943,7 +944,7 @@ | ||
| 943 | 944 | "\n" |
| 944 | 945 | "Pozn: MTEF formule uvnitø WMF dosud nebyly konvertovány." |
| 945 | 946 | |
| 946 | -#: ../sources.cc/pass1wmf.cc:434 | |
| 947 | +#: ../sources.cc/pass1wmf.cc:494 | |
| 947 | 948 | #, c-format |
| 948 | 949 | msgid "" |
| 949 | 950 | "\n" |
| @@ -952,7 +953,7 @@ | ||
| 952 | 953 | "\n" |
| 953 | 954 | "Chyba: blok WMF %X o délce %d je pøíli malý, oèekáváno %u!" |
| 954 | 955 | |
| 955 | -#: ../sources.cc/pass1wmf.cc:566 | |
| 956 | +#: ../sources.cc/pass1wmf.cc:627 ../sources.cc/pass1wmf.cc:2107 | |
| 956 | 957 | #, c-format |
| 957 | 958 | msgid "" |
| 958 | 959 | "\n" |
| @@ -961,7 +962,7 @@ | ||
| 961 | 962 | "\n" |
| 962 | 963 | "Chyba: Nepodporovaná znaková sada: %X." |
| 963 | 964 | |
| 964 | -#: ../sources.cc/pass1wmf.cc:1160 | |
| 965 | +#: ../sources.cc/pass1wmf.cc:1269 | |
| 965 | 966 | #, c-format |
| 966 | 967 | msgid "" |
| 967 | 968 | "\n" |
| @@ -970,12 +971,12 @@ | ||
| 970 | 971 | "\n" |
| 971 | 972 | "Chyba: text s velikostí %d se nemùe vejít do objektu, zkráceno na %u." |
| 972 | 973 | |
| 973 | -#: ../sources.cc/pass1wmf.cc:1292 | |
| 974 | +#: ../sources.cc/pass1wmf.cc:1403 | |
| 974 | 975 | #, c-format |
| 975 | 976 | msgid "Opening Windows MetaFile:" |
| 976 | 977 | msgstr "Otevírá Windows Metafile:" |
| 977 | 978 | |
| 978 | -#: ../sources.cc/pass1wmf.cc:1299 | |
| 979 | +#: ../sources.cc/pass1wmf.cc:1410 | |
| 979 | 980 | #, c-format |
| 980 | 981 | msgid "" |
| 981 | 982 | "\n" |
| @@ -984,7 +985,7 @@ | ||
| 984 | 985 | "\n" |
| 985 | 986 | "Chyba: Neplatná hlavièka WMF s velikostí %u, oèekávaná velikost=9!" |
| 986 | 987 | |
| 987 | -#: ../sources.cc/pass1wmf.cc:1451 | |
| 988 | +#: ../sources.cc/pass1wmf.cc:1562 | |
| 988 | 989 | #, c-format |
| 989 | 990 | msgid "" |
| 990 | 991 | "\n" |
| @@ -993,7 +994,7 @@ | ||
| 993 | 994 | "\n" |
| 994 | 995 | "%*s{WMF funkce:%3Xh; délka:%4lu; pos:%lXh}" |
| 995 | 996 | |
| 996 | -#: ../sources.cc/pass1wmf.cc:1686 | |
| 997 | +#: ../sources.cc/pass1wmf.cc:1767 | |
| 997 | 998 | #, c-format |
| 998 | 999 | msgid "" |
| 999 | 1000 | "\n" |
| @@ -1003,12 +1004,19 @@ | ||
| 1003 | 1004 | "Varování: Neplatné CRC %X uvnitø WMF, oèekáváno %X." |
| 1004 | 1005 | |
| 1005 | 1006 | # |
| 1006 | -#: ../sources.cc/pass1wmf.cc:1966 | |
| 1007 | +#: ../sources.cc/pass1wmf.cc:3112 | |
| 1007 | 1008 | #, c-format |
| 1008 | 1009 | msgid "Opening Windows Enhanced MetaFile:" |
| 1009 | 1010 | msgstr "Otevírá 'Vylepený' Windows Metafile:" |
| 1010 | 1011 | |
| 1011 | -#: ../sources.cc/pass1wmf.cc:2107 | |
| 1012 | +#: ../sources.cc/pass1wmf.cc:3122 | |
| 1013 | +#, c-format | |
| 1014 | +msgid "" | |
| 1015 | +"\n" | |
| 1016 | +"Warning: EMF parser is still experimental." | |
| 1017 | +msgstr "" | |
| 1018 | + | |
| 1019 | +#: ../sources.cc/pass1wmf.cc:3257 | |
| 1012 | 1020 | #, c-format |
| 1013 | 1021 | msgid "" |
| 1014 | 1022 | "\n" |
| @@ -1712,7 +1720,15 @@ | ||
| 1712 | 1720 | "\n" |
| 1713 | 1721 | "Kritická chyba: Tisk do øetìzcù nefunguje, získáno '%s' oèekáváno '%s'!" |
| 1714 | 1722 | |
| 1715 | -#: ../sources.cc/wp2latex.cc:693 | |
| 1723 | +#: ../sources.cc/wp2latex.cc:629 | |
| 1724 | +#, c-format | |
| 1725 | +msgid "" | |
| 1726 | +"\n" | |
| 1727 | +"Fatal: Compillation has been optimised for pointer size 32bits, pointer size " | |
| 1728 | +"is %ubits!" | |
| 1729 | +msgstr "" | |
| 1730 | + | |
| 1731 | +#: ../sources.cc/wp2latex.cc:701 | |
| 1716 | 1732 | #, c-format |
| 1717 | 1733 | msgid "" |
| 1718 | 1734 | "\n" |
| @@ -1721,7 +1737,7 @@ | ||
| 1721 | 1737 | "\n" |
| 1722 | 1738 | "Chyba: VYNUCENÝ konverzní modul \"%s\" nebyl nalezen!" |
| 1723 | 1739 | |
| 1724 | -#: ../sources.cc/wp2latex.cc:696 | |
| 1740 | +#: ../sources.cc/wp2latex.cc:704 | |
| 1725 | 1741 | #, c-format |
| 1726 | 1742 | msgid "" |
| 1727 | 1743 | "\n" |
| @@ -1731,7 +1747,7 @@ | ||
| 1731 | 1747 | "\n" |
| 1732 | 1748 | "Varování: Konverzní modul %s je VYNUCEN. Autodetekce není moná. Mohou nastat CHYBY!!!" |
| 1733 | 1749 | |
| 1734 | -#: ../sources.cc/wp2latex.cc:707 | |
| 1750 | +#: ../sources.cc/wp2latex.cc:715 | |
| 1735 | 1751 | #, c-format |
| 1736 | 1752 | msgid "" |
| 1737 | 1753 | "\n" |
| @@ -1740,7 +1756,7 @@ | ||
| 1740 | 1756 | "\n" |
| 1741 | 1757 | "Chyba: vynucený konverzní modul \"%s\" nebyl nalezen!" |
| 1742 | 1758 | |
| 1743 | -#: ../sources.cc/wp2latex.cc:708 | |
| 1759 | +#: ../sources.cc/wp2latex.cc:716 | |
| 1744 | 1760 | #, c-format |
| 1745 | 1761 | msgid "" |
| 1746 | 1762 | "\n" |
| @@ -1749,7 +1765,7 @@ | ||
| 1749 | 1765 | "\n" |
| 1750 | 1766 | "Zadejte \"wp2latex -v\" pro výpis seznamu dostupných modulù." |
| 1751 | 1767 | |
| 1752 | -#: ../sources.cc/wp2latex.cc:713 | |
| 1768 | +#: ../sources.cc/wp2latex.cc:721 | |
| 1753 | 1769 | #, c-format |
| 1754 | 1770 | msgid "" |
| 1755 | 1771 | "\n" |
| @@ -1759,7 +1775,7 @@ | ||
| 1759 | 1775 | "\n" |
| 1760 | 1776 | "Varování: Konverzní modul %s je vynucen. Autodetekce není moná. Mohou nastat CHYBY!!!" |
| 1761 | 1777 | |
| 1762 | -#: ../sources.cc/wp2latex.cc:743 | |
| 1778 | +#: ../sources.cc/wp2latex.cc:751 | |
| 1763 | 1779 | #, c-format |
| 1764 | 1780 | msgid "" |
| 1765 | 1781 | "\n" |
| @@ -1769,7 +1785,7 @@ | ||
| 1769 | 1785 | "\n" |
| 1770 | 1786 | "Chyba: Logovací soubor má shodné jméno jako soubor dokumentu. To by zpùsobilo smazání pùvodního dokumentu!" |
| 1771 | 1787 | |
| 1772 | -#: ../sources.cc/wp2latex.cc:751 | |
| 1788 | +#: ../sources.cc/wp2latex.cc:759 | |
| 1773 | 1789 | #, c-format |
| 1774 | 1790 | msgid "" |
| 1775 | 1791 | "\n" |
| @@ -1779,7 +1795,7 @@ | ||
| 1779 | 1795 | "Varování: Nemohu otevøít logovací soubor %s ..." |
| 1780 | 1796 | |
| 1781 | 1797 | # |
| 1782 | -#: ../sources.cc/wp2latex.cc:753 | |
| 1798 | +#: ../sources.cc/wp2latex.cc:761 | |
| 1783 | 1799 | #, c-format |
| 1784 | 1800 | msgid "" |
| 1785 | 1801 | "%% log file for converted file %s, %s ver %u.%u\n" |
| @@ -1788,7 +1804,7 @@ | ||
| 1788 | 1804 | "%% logovací soubor pro konvertovaný soubor %s, %s verze %u.%u\n" |
| 1789 | 1805 | "%% konverzní program WP2LaTex v. %s z %s.\n" |
| 1790 | 1806 | |
| 1791 | -#: ../sources.cc/wp2latex.cc:762 | |
| 1807 | +#: ../sources.cc/wp2latex.cc:770 | |
| 1792 | 1808 | #, c-format |
| 1793 | 1809 | msgid "" |
| 1794 | 1810 | "\n" |
| @@ -1797,7 +1813,7 @@ | ||
| 1797 | 1813 | "\n" |
| 1798 | 1814 | "Konvertuji ...\n" |
| 1799 | 1815 | |
| 1800 | -#: ../sources.cc/wp2latex.cc:766 | |
| 1816 | +#: ../sources.cc/wp2latex.cc:774 | |
| 1801 | 1817 | #, c-format |
| 1802 | 1818 | msgid "" |
| 1803 | 1819 | "\n" |
| @@ -1806,7 +1822,7 @@ | ||
| 1806 | 1822 | "\n" |
| 1807 | 1823 | "Vstupní soubor je prázdný\n" |
| 1808 | 1824 | |
| 1809 | -#: ../sources.cc/wp2latex.cc:794 | |
| 1825 | +#: ../sources.cc/wp2latex.cc:802 | |
| 1810 | 1826 | #, c-format |
| 1811 | 1827 | msgid "" |
| 1812 | 1828 | "\n" |
| @@ -1817,7 +1833,7 @@ | ||
| 1817 | 1833 | "%% první prùchod ukonèen, pokraèuji druhým prùchodem\n" |
| 1818 | 1834 | "\n" |
| 1819 | 1835 | |
| 1820 | -#: ../sources.cc/wp2latex.cc:834 | |
| 1836 | +#: ../sources.cc/wp2latex.cc:842 | |
| 1821 | 1837 | #, c-format |
| 1822 | 1838 | msgid "" |
| 1823 | 1839 | "\n" |
| @@ -1830,12 +1846,12 @@ | ||
| 1830 | 1846 | "%% Bylo nalezeno %ld nezkonvertovaných znakù.\n" |
| 1831 | 1847 | "%% Bylo nalezeno %ld nerozpoznaných/ignorovaných objektù.\n" |
| 1832 | 1848 | |
| 1833 | -#: ../sources.cc/wp2latex.cc:838 | |
| 1849 | +#: ../sources.cc/wp2latex.cc:846 | |
| 1834 | 1850 | #, c-format |
| 1835 | 1851 | msgid "%% There were %ld corrupted objects.\n" |
| 1836 | 1852 | msgstr "%% Vyskytlo se %ld pokozených objektù.\n" |
| 1837 | 1853 | |
| 1838 | -#: ../sources.cc/wp2latex.cc:840 | |
| 1854 | +#: ../sources.cc/wp2latex.cc:848 | |
| 1839 | 1855 | #, c-format |
| 1840 | 1856 | msgid "" |
| 1841 | 1857 | "\n" |
| @@ -1844,12 +1860,12 @@ | ||
| 1844 | 1860 | "\n" |
| 1845 | 1861 | "Chyba: Logovací soubor nebyl zapsán úplnì." |
| 1846 | 1862 | |
| 1847 | -#: ../sources.cc/wp2latex.cc:861 | |
| 1863 | +#: ../sources.cc/wp2latex.cc:869 | |
| 1848 | 1864 | #, c-format |
| 1849 | 1865 | msgid "Note: There are some asynchronous jobs that are still running." |
| 1850 | 1866 | msgstr "Upozornìní: Stále bìí nìjaké asynchronní procesy." |
| 1851 | 1867 | |
| 1852 | -#: ../sources.cc/wp2latex.cc:869 | |
| 1868 | +#: ../sources.cc/wp2latex.cc:877 | |
| 1853 | 1869 | #, c-format |
| 1854 | 1870 | msgid "" |
| 1855 | 1871 | "\n" |
| @@ -249,7 +249,7 @@ | ||
| 249 | 249 | Dirk Lellinger wrote formulas parser, but I had to rewrite it srom scratch. |
| 250 | 250 | Now it works much more better. |
| 251 | 251 | This Program was rewritten by last author Jaroslav Fojtik, Email |
| 252 | -(try one of these): fojtik@penguin.cz, JaFojtik@seznam.cz. | |
| 252 | +(try one of these): fojtik@penguin.cz, JaFojtik@yandex.com. | |
| 253 | 253 | |
| 254 | 254 | There are some other ports of this code. But now I hope, that |
| 255 | 255 | this release is best one. |
| @@ -250,7 +250,7 @@ | ||
| 250 | 250 | if(tmp_list.pstr==NULL) return tmp_list; |
| 251 | 251 | for(i=0;i<l1.number;i++) |
| 252 | 252 | tmp_list.pstr[i]=StrDup(l1.pstr[i]); |
| 253 | - tmp_list.pstr[l1.number]=StrDup(str);; | |
| 253 | + tmp_list.pstr[l1.number]=StrDup(str); | |
| 254 | 254 | tmp_list.number=l1.number+1; |
| 255 | 255 | #else |
| 256 | 256 | temp_list tmp_list(l1); |
| @@ -1738,10 +1738,10 @@ | ||
| 1738 | 1738 | [Feminine Spanish Ordinal] |
| 1739 | 1739 | UseStyle(textcomp, "\\textordfeminine{}") |
| 1740 | 1740 | WP2LaTeXsty+=sty_astrike; |
| 1741 | - return "\\alifted "; | |
| 1741 | + return "\\astrike "; | |
| 1742 | 1742 | [Masculine Spanish Ordinal] |
| 1743 | 1743 | UseStyle(textcomp, "\\textordmasculine{}") |
| 1744 | - return "\\olifted "; | |
| 1744 | + return "\\ostrike "; | |
| 1745 | 1745 | [1/2] |
| 1746 | 1746 | if(OutCodePage == ISO8859_1) return "½"; |
| 1747 | 1747 | UseStyle(textcomp, "\\textonehalf ") |
| @@ -35,6 +35,10 @@ | ||
| 35 | 35 | #include "matrix.h" |
| 36 | 36 | #include "imgsupp.h" |
| 37 | 37 | |
| 38 | +#if SupportJPG>=4 || SupportJPG==2 | |
| 39 | +Raster2DAbstract *LoadFragmentJPG(FILE *F); | |
| 40 | +#endif | |
| 41 | + | |
| 38 | 42 | |
| 39 | 43 | #define Rd_word(f,w) RdWORD_LoEnd(w,f); |
| 40 | 44 | #define Rd_dword(f,d) RdDWORD_LoEnd(d,f); |
| @@ -388,7 +392,10 @@ | ||
| 388 | 392 | BI_RLE4, //An RLE format for bitmaps with 4 bpp. The compression format is a 2-byte format consisting of a count byte followed by two word-length color indexes. |
| 389 | 393 | BI_BITFIELDS, //Specifies that the bitmap is not compressed. The members bV4RedMask, bV4GreenMask, and bV4BlueMask specify the red, green, and blue components for each pixel. This is valid when used with 16- and 32-bpp bitmaps. |
| 390 | 394 | BI_JPEG, //Specifies that the image is compressed using the JPEG file interchange format. JPEG compression trades off compression against loss. |
| 391 | - BI_PNG //Specifies that the image is compressed using the PNG file interchange format. | |
| 395 | + BI_PNG, //Specifies that the image is compressed using the PNG file interchange format. | |
| 396 | + BI_CMYK = 0x0B, //The image is an uncompressed CMYK format. | |
| 397 | + BI_CMYKRLE8 = 0x0C, //A CMYK format that uses RLE compression for bitmaps with 8 bits per pixel. The compression uses a 2-byte format consisting of a count byte followed by a byte containing a color index. | |
| 398 | + BI_CMYKRLE4 = 0x0D //A CMYK format that uses RLE compression for bitmaps with 4 bits per pixel. The compression uses a 2-byte format consisting of a count byte followed by two word-length color indexes. | |
| 392 | 399 | } BmpCompression; |
| 393 | 400 | |
| 394 | 401 | typedef SDWORD FXPT2DOT30; |
| @@ -596,16 +603,22 @@ | ||
| 596 | 603 | Try40: if(LoadPartBmpInfHdr(f,Info.BIH) != (40-4)) goto ENDPROC; |
| 597 | 604 | if(Info.BIH.biPlanes!=1) return; |
| 598 | 605 | Compression = Info.BIH.biCompression; |
| 599 | - if(Info.BIH.biCompression>BI_BITFIELDS) | |
| 600 | - goto ENDPROC;; //unsupported compression mode | |
| 606 | +#if SupportJPG>=4 || SupportJPG==2 | |
| 607 | + if(Info.BIH.biCompression == BI_JPEG) | |
| 608 | + { | |
| 609 | + Raster = LoadFragmentJPG(f); | |
| 610 | + } | |
| 611 | +#endif | |
| 612 | + if(Info.BIH.biCompression > BI_BITFIELDS) | |
| 613 | + goto ENDPROC; //unsupported compression mode | |
| 601 | 614 | |
| 602 | 615 | k = Info.BIH.biPlanes*Info.BIH.biBitCount; |
| 603 | 616 | if(k==32) |
| 604 | 617 | { |
| 605 | 618 | Compression = -1; //!!! |
| 606 | - k=24; | |
| 619 | + k = 24; | |
| 607 | 620 | } |
| 608 | - Raster=CreateRaster2D(Info.BIH.biWidth,Info.BIH.biHeight,k); | |
| 621 | + Raster = CreateRaster2D(Info.BIH.biWidth,Info.BIH.biHeight,k); | |
| 609 | 622 | k = 4; //RGB Quad |
| 610 | 623 | ldblk = Info.BIH.biClrUsed; |
| 611 | 624 | break; |
| @@ -1377,7 +1390,7 @@ | ||
| 1377 | 1390 | if(c>='A') |
| 1378 | 1391 | B = (c- 'A' + 10) << 4; |
| 1379 | 1392 | else |
| 1380 | - B = (c-'0') << 4;; | |
| 1393 | + B = (c-'0') << 4; | |
| 1381 | 1394 | |
| 1382 | 1395 | c=toupper(fgetc(F)); |
| 1383 | 1396 | c-='0'; |
| @@ -3827,7 +3840,7 @@ | ||
| 3827 | 3840 | } |
| 3828 | 3841 | |
| 3829 | 3842 | FINISH: |
| 3830 | - if(RBit8.Data1D) RBit8.Erase();; | |
| 3843 | + if(RBit8.Data1D) RBit8.Erase(); | |
| 3831 | 3844 | |
| 3832 | 3845 | fclose(f); |
| 3833 | 3846 | Img.AttachRaster(Raster); |
| @@ -51,22 +51,104 @@ | ||
| 51 | 51 | |
| 52 | 52 | |
| 53 | 53 | #if SupportJPG>=4 || SupportJPG==2 |
| 54 | + | |
| 55 | +Raster2DAbstract *LoadFragmentJPG(FILE *F) | |
| 56 | +{ | |
| 57 | +struct jpeg_decompress_struct cinfo; | |
| 58 | +struct my_error_mgr jerr; | |
| 59 | +int row_stride; /* physical row width in output buffer */ | |
| 60 | +JSAMPARRAY buffer; /* Output row buffer */ | |
| 61 | +unsigned current_line = 0; | |
| 62 | + | |
| 63 | + if(F==NULL) return NULL; | |
| 64 | + | |
| 65 | + /* Step 1: allocate and initialize JPEG decompression object */ | |
| 66 | + | |
| 67 | + cinfo.err = jpeg_std_error(&jerr.pub); | |
| 68 | + jerr.pub.error_exit = my_error_exit; | |
| 69 | + /* Establish the setjmp return context for my_error_exit to use. */ | |
| 70 | + if(setjmp(jerr.setjmp_buffer)) | |
| 71 | + { /* If we get here, the JPEG code has signaled an error. We need to clean up the JPEG object, close the input file, and return. */ | |
| 72 | + jpeg_destroy_decompress(&cinfo); | |
| 73 | + return NULL; | |
| 74 | + } | |
| 75 | + | |
| 76 | + jpeg_create_decompress(&cinfo); /* Now we can initialize the JPEG decompression object. */ | |
| 77 | + | |
| 78 | + /* Step 2: specify data source (eg, a file) */ | |
| 79 | + jpeg_stdio_src(&cinfo, F); | |
| 80 | + | |
| 81 | + /* Step 3: read file parameters with jpeg_read_header() */ | |
| 82 | + | |
| 83 | + (void) jpeg_read_header(&cinfo, TRUE); | |
| 84 | + /* We can ignore the return value from jpeg_read_header since | |
| 85 | + * (a) suspension is not possible with the stdio data source, and | |
| 86 | + * (b) we passed TRUE to reject a tables-only JPEG file as an error. | |
| 87 | + * See libjpeg.doc for more info. */ | |
| 88 | + | |
| 89 | + Raster2DAbstract *Raster = CreateRaster2D(cinfo.image_width,cinfo.image_height,24); | |
| 90 | + if(Raster==NULL) return NULL; | |
| 91 | + | |
| 92 | + /* Step 5: Start decompressor */ | |
| 93 | + (void)jpeg_start_decompress(&cinfo); | |
| 94 | + | |
| 95 | + row_stride = cinfo.output_width * cinfo.output_components; | |
| 96 | + /* Make a one-row-high sample array that will go away when done with image */ | |
| 97 | + buffer = (*cinfo.mem->alloc_sarray)((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1); | |
| 98 | + | |
| 99 | + /* Step 6: while (scan lines remain to be read) */ | |
| 100 | + /* jpeg_read_scanlines(...); */ | |
| 101 | + | |
| 102 | + /* Here we use the library's state variable cinfo.output_scanline as the | |
| 103 | + * loop counter, so that we don't have to keep track ourselves. */ | |
| 104 | + while(cinfo.output_scanline < cinfo.output_height) | |
| 105 | + { /* jpeg_read_scanlines expects an array of pointers to scanlines. | |
| 106 | + * Here the array is only one element long, but you could ask for | |
| 107 | + * more than one scanline at a time if that's more convenient. */ | |
| 108 | + (void)jpeg_read_scanlines(&cinfo, buffer, 1); | |
| 109 | + | |
| 110 | + int line_size = 3 * cinfo.output_width; /* Assume put_scanline_someplace wants a pointer and sample count. */ | |
| 111 | + | |
| 112 | + //{ BlockWrite(outfile, buffer^, row_stride);} | |
| 113 | + | |
| 114 | + if(line_size > row_stride) line_size = row_stride; | |
| 115 | + | |
| 116 | + if(current_line < Raster->Size2D) | |
| 117 | + memcpy(Raster->GetRow(current_line), buffer[0], line_size); | |
| 118 | + current_line++; | |
| 119 | + | |
| 120 | + //if AlineProc<>nil then AlineProc^.NextLine; | |
| 121 | + | |
| 122 | + //put_scanline_someplace(buffer[0], row_stride); | |
| 123 | + } | |
| 124 | + | |
| 125 | + /* Step 7: Finish decompression */ | |
| 126 | + | |
| 127 | + (void)jpeg_finish_decompress(&cinfo); | |
| 128 | + /* We can ignore the return value since suspension is not possible with the stdio data source. */ | |
| 129 | + | |
| 130 | + /* Step 8: Release JPEG decompression object */ | |
| 131 | + /* This is an important step since it will release a good deal of memory. */ | |
| 132 | + jpeg_destroy_decompress(&cinfo); | |
| 133 | + | |
| 134 | +return Raster; | |
| 135 | +} | |
| 136 | + | |
| 137 | + | |
| 54 | 138 | Image LoadPictureJPG(const char *Name) |
| 55 | 139 | { |
| 56 | 140 | Image Img; |
| 57 | -int line_size; | |
| 58 | 141 | unsigned current_line = 0; |
| 59 | 142 | /* This struct contains the JPEG decompression parameters and pointers to |
| 60 | 143 | * working space (which is allocated as needed by the JPEG library). */ |
| 61 | 144 | struct jpeg_decompress_struct cinfo; |
| 62 | 145 | /* We use our private extension JPEG error handler. |
| 63 | 146 | * Note that this struct must live as long as the main JPEG parameter |
| 64 | - * struct, to avoid dangling-pointer problems. | |
| 65 | - */ | |
| 147 | + * struct, to avoid dangling-pointer problems. */ | |
| 66 | 148 | struct my_error_mgr jerr; |
| 67 | 149 | /* More stuff */ |
| 68 | 150 | FILE * infile; /* source file */ |
| 69 | -JSAMPARRAY buffer; /* Output row buffer */ | |
| 151 | +JSAMPARRAY buffer; /* Output row buffer */ | |
| 70 | 152 | int row_stride; /* physical row width in output buffer */ |
| 71 | 153 | |
| 72 | 154 | /* In this example we want to open the input file before doing anything else, |
| @@ -129,8 +211,7 @@ | ||
| 129 | 211 | /* JSAMPLEs per row in output buffer */ |
| 130 | 212 | row_stride = cinfo.output_width * cinfo.output_components; |
| 131 | 213 | /* Make a one-row-high sample array that will go away when done with image */ |
| 132 | - buffer = (*cinfo.mem->alloc_sarray) | |
| 133 | - ((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1); | |
| 214 | + buffer = (*cinfo.mem->alloc_sarray)((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1); | |
| 134 | 215 | |
| 135 | 216 | /* Step 6: while (scan lines remain to be read) */ |
| 136 | 217 | /* jpeg_read_scanlines(...); */ |
| @@ -144,7 +225,7 @@ | ||
| 144 | 225 | (void) jpeg_read_scanlines(&cinfo, buffer, 1); |
| 145 | 226 | |
| 146 | 227 | /* Assume put_scanline_someplace wants a pointer and sample count. */ |
| 147 | - line_size = 3 * cinfo.output_width; | |
| 228 | + int line_size = 3 * cinfo.output_width; | |
| 148 | 229 | |
| 149 | 230 | //{ BlockWrite(outfile, buffer^, row_stride);} |
| 150 | 231 |
| @@ -913,7 +913,7 @@ | ||
| 913 | 913 | goto FINISH; |
| 914 | 914 | default: goto FINISH; |
| 915 | 915 | } |
| 916 | - cq->ActualPos=ftell(cq->wpd);; | |
| 916 | + cq->ActualPos=ftell(cq->wpd); | |
| 917 | 917 | } |
| 918 | 918 | return; |
| 919 | 919 | FINISH: |
| @@ -961,7 +961,7 @@ | ||
| 961 | 961 | pVecLine->Close = false; |
| 962 | 962 | VectList.AddObject(pVecLine); pVecLine=NULL; |
| 963 | 963 | |
| 964 | - strcpy(ObjType,ObjName+1); | |
| 964 | + sprintf(ObjType,"%s(%d;%d)", ObjName+1, LineX, LineY); | |
| 965 | 965 | return; |
| 966 | 966 | } |
| 967 | 967 | } |
| @@ -3255,7 +3255,7 @@ | ||
| 3255 | 3255 | if(log!=NULL) |
| 3256 | 3256 | { /**/ |
| 3257 | 3257 | fprintf(log, _("\n%*s{EMF func:%3Xh; size:%4lu; pos:%lXh}"), |
| 3258 | - recursion*2,"",EmfRec.Type, (long)2*EmfRec.Size, (long)EmfRec.ParamFilePos); | |
| 3258 | + recursion*2,"",EmfRec.Type, (long)EmfRec.Size, (long)EmfRec.ParamFilePos); | |
| 3259 | 3259 | if(*ObjType!=0) fprintf(log," %s",ObjType); |
| 3260 | 3260 | } |
| 3261 | 3261 |
| @@ -5414,7 +5414,7 @@ | ||
| 5414 | 5414 | void wvBuildCLXForSimple6 (CLX * clx, FIB * fib) |
| 5415 | 5415 | { |
| 5416 | 5416 | wvInitCLX (clx); |
| 5417 | - clx->nopcd = 1;; | |
| 5417 | + clx->nopcd = 1; | |
| 5418 | 5418 | |
| 5419 | 5419 | clx->pcd = (PCD *) malloc (clx->nopcd * sizeof (PCD)); |
| 5420 | 5420 | clx->pos = (__u32 *) malloc ((clx->nopcd + 1) * sizeof (__u32)); |
| @@ -85,19 +85,19 @@ | ||
| 85 | 85 | $% |
| 86 | 86 | }% |
| 87 | 87 | } |
| 88 | -\providecommand{\alifted}{\charslifted{a}} | |
| 88 | +\providecommand{\astrike}{\charstrike{a}} | |
| 89 | 89 | \providecommand{\between}{\mbox{(\kern0.1ex\llap{)}}} |
| 90 | 90 | \providecommand{\bigominus} {\mbox{\LARGE $\ominus$}} |
| 91 | 91 | \providecommand{\bigsqcap} {\mbox{\LARGE $\sqcap$}} |
| 92 | 92 | \providecommand{\because}{\mbox{$\raisebox{0.9ex}{.}\kern-0.1ex.\kern-0.1ex\raisebox{0.9ex}{.}$}} |
| 93 | 93 | \providecommand{\bslash}{{\tt\char'134}} |
| 94 | 94 | \providecommand{\degrees}{{\char'027}} |
| 95 | -\providecommand{\charslifted}[1]{\raisebox{0.7ex}{\the\scriptfont0{#1}}} | |
| 95 | +\providecommand{\charstrike}[1]{\rlap{\kern.1ex\rule[.54ex]{.7ex}{.4pt}}\raisebox{0.8ex}{\scriptsize{#1}}} | |
| 96 | 96 | \providecommand{\identical}{\mbox{$\raisebox{0ex}{..}\kern-1.55ex\raisebox{0.9ex}{..}$}} |
| 97 | 97 | \providecommand{\image}{\mbox{\rlap{\raisebox{1.1ex}{.}}=\llap{\raisebox{-0.25ex}{.}}}} |
| 98 | 98 | \providecommand{\rimage}{\mbox{\rlap{\raisebox{-0.25ex}{.}}=\llap{\raisebox{1.1ex}{.}}}} |
| 99 | 99 | \providecommand{\lowerquote}{\raisebox{-1.2ex}{"}} |
| 100 | -\providecommand{\olifted}{\charslifted{o}} | |
| 100 | +\providecommand{\ostrike}{\charstrike{o}} | |
| 101 | 101 | \providecommand{\Tau}{\mathrm{T}} |
| 102 | 102 | \providecommand{\therefore}{\mbox{$.\kern-0.1ex\raisebox{0.9ex}{.}\kern-0.1ex.$}} |
| 103 | 103 | \providecommand{\gtlt}{\mbox{ |
| @@ -55,7 +55,7 @@ | ||
| 55 | 55 | $(MKDIR) $@ |
| 56 | 56 | |
| 57 | 57 | |
| 58 | -bigtest: $(MAKEFILE_LIST) | $(OUTDIR)/ | |
| 58 | +bigtest: $(MAKEFILE_LIST) | $(OUTDIR) | |
| 59 | 59 | $(WP2LATEX) -S -i test5.wp -o $(OUTDIR)/test5_ALL.tex -use-all |
| 60 | 60 | $(WP2LATEX) -S -i test5.wp -o $(OUTDIR)/test5_t.tex -tipa |
| 61 | 61 | $(WP2LATEX) -S -i test5.wp -o $(OUTDIR)/test5__.tex -no-tipa |
Fork