Commit e0e9d646740285f5305c59dc420e39129a80594a
1 parent
e5abc789
Remove some ABI compatibility private methods
Since we have to bump soname, remove some private methods that were just there for binary compatibility
Showing
2 changed files
with
1 additions
and
39 deletions
include/qpdf/QPDFWriter.hh
| @@ -312,8 +312,6 @@ class QPDFWriter | @@ -312,8 +312,6 @@ class QPDFWriter | ||
| 312 | void writeObjectStream(QPDFObjectHandle object); | 312 | void writeObjectStream(QPDFObjectHandle object); |
| 313 | void writeObject(QPDFObjectHandle object, int object_stream_index = -1); | 313 | void writeObject(QPDFObjectHandle object, int object_stream_index = -1); |
| 314 | void writeTrailer(trailer_e which, int size, | 314 | void writeTrailer(trailer_e which, int size, |
| 315 | - bool xref_stream, qpdf_offset_t prev = 0); | ||
| 316 | - void writeTrailer(trailer_e which, int size, | ||
| 317 | bool xref_stream, qpdf_offset_t prev, | 315 | bool xref_stream, qpdf_offset_t prev, |
| 318 | int linearization_pass); | 316 | int linearization_pass); |
| 319 | void unparseObject(QPDFObjectHandle object, int level, | 317 | void unparseObject(QPDFObjectHandle object, int level, |
| @@ -365,14 +363,6 @@ class QPDFWriter | @@ -365,14 +363,6 @@ class QPDFWriter | ||
| 365 | bool suppress_offsets, | 363 | bool suppress_offsets, |
| 366 | int hint_id, | 364 | int hint_id, |
| 367 | qpdf_offset_t hint_offset, | 365 | qpdf_offset_t hint_offset, |
| 368 | - qpdf_offset_t hint_length); | ||
| 369 | - qpdf_offset_t writeXRefTable( | ||
| 370 | - trailer_e which, int first, int last, int size, | ||
| 371 | - // for linearization | ||
| 372 | - qpdf_offset_t prev, | ||
| 373 | - bool suppress_offsets, | ||
| 374 | - int hint_id, | ||
| 375 | - qpdf_offset_t hint_offset, | ||
| 376 | qpdf_offset_t hint_length, | 366 | qpdf_offset_t hint_length, |
| 377 | int linearization_pass); | 367 | int linearization_pass); |
| 378 | qpdf_offset_t writeXRefStream( | 368 | qpdf_offset_t writeXRefStream( |
| @@ -386,15 +376,6 @@ class QPDFWriter | @@ -386,15 +376,6 @@ class QPDFWriter | ||
| 386 | int hint_id, | 376 | int hint_id, |
| 387 | qpdf_offset_t hint_offset, | 377 | qpdf_offset_t hint_offset, |
| 388 | qpdf_offset_t hint_length, | 378 | qpdf_offset_t hint_length, |
| 389 | - bool skip_compression); | ||
| 390 | - qpdf_offset_t writeXRefStream( | ||
| 391 | - int objid, int max_id, qpdf_offset_t max_offset, | ||
| 392 | - trailer_e which, int first, int last, int size, | ||
| 393 | - // for linearization | ||
| 394 | - qpdf_offset_t prev, | ||
| 395 | - int hint_id, | ||
| 396 | - qpdf_offset_t hint_offset, | ||
| 397 | - qpdf_offset_t hint_length, | ||
| 398 | bool skip_compression, | 379 | bool skip_compression, |
| 399 | int linearization_pass); | 380 | int linearization_pass); |
| 400 | int calculateXrefStreamPadding(int xref_bytes); | 381 | int calculateXrefStreamPadding(int xref_bytes); |
libqpdf/QPDFWriter.cc
| @@ -1110,13 +1110,6 @@ QPDFWriter::unparseChild(QPDFObjectHandle child, int level, int flags) | @@ -1110,13 +1110,6 @@ QPDFWriter::unparseChild(QPDFObjectHandle child, int level, int flags) | ||
| 1110 | 1110 | ||
| 1111 | void | 1111 | void |
| 1112 | QPDFWriter::writeTrailer(trailer_e which, int size, bool xref_stream, | 1112 | QPDFWriter::writeTrailer(trailer_e which, int size, bool xref_stream, |
| 1113 | - qpdf_offset_t prev) | ||
| 1114 | -{ | ||
| 1115 | - writeTrailer(which, size, xref_stream, prev, 0); | ||
| 1116 | -} | ||
| 1117 | - | ||
| 1118 | -void | ||
| 1119 | -QPDFWriter::writeTrailer(trailer_e which, int size, bool xref_stream, | ||
| 1120 | qpdf_offset_t prev, int linearization_pass) | 1113 | qpdf_offset_t prev, int linearization_pass) |
| 1121 | { | 1114 | { |
| 1122 | QPDFObjectHandle trailer = getTrimmedTrailer(); | 1115 | QPDFObjectHandle trailer = getTrimmedTrailer(); |
| @@ -2468,18 +2461,7 @@ QPDFWriter::writeHintStream(int hint_id) | @@ -2468,18 +2461,7 @@ QPDFWriter::writeHintStream(int hint_id) | ||
| 2468 | qpdf_offset_t | 2461 | qpdf_offset_t |
| 2469 | QPDFWriter::writeXRefTable(trailer_e which, int first, int last, int size) | 2462 | QPDFWriter::writeXRefTable(trailer_e which, int first, int last, int size) |
| 2470 | { | 2463 | { |
| 2471 | - return writeXRefTable(which, first, last, size, 0, false, 0, 0, 0); | ||
| 2472 | -} | ||
| 2473 | - | ||
| 2474 | -qpdf_offset_t | ||
| 2475 | -QPDFWriter::writeXRefTable(trailer_e which, int first, int last, int size, | ||
| 2476 | - qpdf_offset_t prev, bool suppress_offsets, | ||
| 2477 | - int hint_id, qpdf_offset_t hint_offset, | ||
| 2478 | - qpdf_offset_t hint_length) | ||
| 2479 | -{ | ||
| 2480 | - // ABI compatibility | ||
| 2481 | - return writeXRefTable(which, first, last, size, prev, suppress_offsets, | ||
| 2482 | - hint_id, hint_offset, hint_length, 0); | 2464 | + return writeXRefTable(which, first, last, size, 0, false, 0, 0, 0, 0); |
| 2483 | } | 2465 | } |
| 2484 | 2466 | ||
| 2485 | qpdf_offset_t | 2467 | qpdf_offset_t |
| @@ -2526,7 +2508,6 @@ qpdf_offset_t | @@ -2526,7 +2508,6 @@ qpdf_offset_t | ||
| 2526 | QPDFWriter::writeXRefStream(int objid, int max_id, qpdf_offset_t max_offset, | 2508 | QPDFWriter::writeXRefStream(int objid, int max_id, qpdf_offset_t max_offset, |
| 2527 | trailer_e which, int first, int last, int size) | 2509 | trailer_e which, int first, int last, int size) |
| 2528 | { | 2510 | { |
| 2529 | - // ABI compatibility | ||
| 2530 | return writeXRefStream(objid, max_id, max_offset, | 2511 | return writeXRefStream(objid, max_id, max_offset, |
| 2531 | which, first, last, size, 0, 0, 0, 0, false, 0); | 2512 | which, first, last, size, 0, 0, 0, 0, false, 0); |
| 2532 | } | 2513 | } |