Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix XREF table generation #2866

Merged
merged 1 commit into from
Aug 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/jspdf.js
Original file line number Diff line number Diff line change
Expand Up @@ -2872,16 +2872,16 @@ function jsPDF(options) {

out("xref");
out("0 " + (objectNumber + 1));
out("0000000000 65535 f");
out("0000000000 65535 f ");
for (var i = 1; i <= objectNumber; i++) {
var offset = offsets[i];
if (typeof offset === "function") {
out((p + offsets[i]()).slice(-10) + " 00000 n");
out((p + offsets[i]()).slice(-10) + " 00000 n ");
} else {
if (typeof offsets[i] !== "undefined") {
out((p + offsets[i]).slice(-10) + " 00000 n");
out((p + offsets[i]).slice(-10) + " 00000 n ");
} else {
out("0000000000 00000 n");
out("0000000000 00000 n ");
}
}
}
Expand Down
Binary file modified test/reference/2pages.pdf
Binary file not shown.
Binary file modified test/reference/3pages.pdf
Binary file not shown.
Binary file modified test/reference/FitWindow.pdf
Binary file not shown.
Binary file modified test/reference/HideMenubar.pdf
Binary file not shown.
Binary file modified test/reference/HideToolbar.pdf
Binary file not shown.
Binary file modified test/reference/HideWindowUI.pdf
Binary file not shown.
Binary file modified test/reference/NumCopies.pdf
Binary file not shown.
Binary file modified test/reference/PrintPageRange.pdf
Binary file not shown.
Binary file modified test/reference/ViewAreaMediaBox.pdf
Binary file not shown.
Binary file modified test/reference/alignment.pdf
Binary file not shown.
Binary file modified test/reference/alternating-text-styling.pdf
Binary file not shown.
Binary file modified test/reference/angle.pdf
Binary file not shown.
Binary file modified test/reference/autoPaging10Pages.pdf
Binary file not shown.
Binary file modified test/reference/autoprint-js.pdf
Binary file not shown.
Binary file modified test/reference/autoprint-nc.pdf
Binary file not shown.
Binary file modified test/reference/bar_graph_with_text_and_lines.pdf
Binary file not shown.
Binary file modified test/reference/blackpixel.pdf
Binary file not shown.
Binary file modified test/reference/blank.pdf
Binary file not shown.
Binary file modified test/reference/bmp1p.pdf
Binary file not shown.
Binary file modified test/reference/bmp24p.pdf
Binary file not shown.
Binary file modified test/reference/bmp32p.pdf
Binary file not shown.
Binary file modified test/reference/bmp4p.pdf
Binary file not shown.
Binary file modified test/reference/bmp8p.pdf
Binary file not shown.
Binary file modified test/reference/bookmark-in.pdf
Binary file not shown.
Binary file modified test/reference/bookmark-mm.pdf
Binary file not shown.
Binary file modified test/reference/bookmark-pt.pdf
Binary file not shown.
Binary file modified test/reference/checkbox.pdf
Binary file not shown.
Binary file modified test/reference/circles.pdf
Binary file not shown.
Binary file modified test/reference/closed.pdf
Binary file not shown.
Binary file modified test/reference/cm.pdf
Binary file not shown.
Binary file modified test/reference/color.pdf
Binary file not shown.
Binary file modified test/reference/colortype_1_grayscale_8_bit_png.pdf
Binary file not shown.
Binary file modified test/reference/colortype_2_rgb_16_bit_png.pdf
Binary file not shown.
Binary file modified test/reference/colortype_2_rgb_8_bit_png.pdf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified test/reference/colortype_4_grayscale_alpha_16_bit_png.pdf
Binary file not shown.
Binary file modified test/reference/colortype_4_grayscale_alpha_8_bit_png.pdf
Binary file not shown.
Binary file modified test/reference/colortype_6_rgba_16_bit_png.pdf
Binary file not shown.
Binary file modified test/reference/colortype_6_rgba_8_bit_png.pdf
Binary file not shown.
Binary file modified test/reference/colortype_6_rgba_8_bit_png_FAST.pdf
Binary file not shown.
Binary file modified test/reference/colortype_6_rgba_8_bit_png_MEDIUM.pdf
Binary file not shown.
Binary file modified test/reference/colortype_6_rgba_8_bit_png_NONE.pdf
Binary file not shown.
Binary file modified test/reference/colortype_6_rgba_8_bit_png_SLOW.pdf
Binary file not shown.
Binary file modified test/reference/combobox.pdf
Binary file not shown.
Binary file modified test/reference/compress.pdf
Binary file not shown.
Binary file modified test/reference/context2d-custom-fonts.pdf
Binary file not shown.
Binary file modified test/reference/continuous.pdf
Binary file not shown.
Binary file modified test/reference/csscolornames.pdf
Binary file not shown.
Binary file modified test/reference/curves.pdf
Binary file not shown.
Binary file modified test/reference/customfont.pdf
Binary file not shown.
Binary file modified test/reference/different-sizes.pdf
Binary file not shown.
Binary file modified test/reference/drawImage.pdf
Binary file not shown.
Binary file modified test/reference/em.pdf
Binary file not shown.
Binary file modified test/reference/enUS.pdf
Binary file not shown.
Binary file modified test/reference/ex.pdf
Binary file not shown.
Binary file modified test/reference/fill-color.pdf
Binary file not shown.
Binary file modified test/reference/fillRect_strokeRect.pdf
Binary file not shown.
Binary file modified test/reference/fillStyle_strokeStyle.pdf
Binary file not shown.
Binary file modified test/reference/font-faces.pdf
Binary file not shown.
Binary file modified test/reference/fonts.pdf
Binary file not shown.
Binary file modified test/reference/freetext.pdf
Binary file not shown.
Binary file modified test/reference/fullscreen.pdf
Binary file not shown.
Binary file modified test/reference/gif.pdf
Binary file not shown.
Binary file modified test/reference/html-basic.pdf
Binary file not shown.
Binary file modified test/reference/in.pdf
Binary file not shown.
Binary file modified test/reference/japanese-kana-nani.pdf
Binary file not shown.
Binary file modified test/reference/jpg.pdf
Binary file not shown.
Binary file modified test/reference/landscape.pdf
Binary file not shown.
Binary file modified test/reference/letter-spacing.pdf
Binary file not shown.
Binary file modified test/reference/line-break.pdf
Binary file not shown.
Binary file modified test/reference/line.pdf
Binary file not shown.
Binary file modified test/reference/lines.pdf
Binary file not shown.
Binary file modified test/reference/listbox.pdf
Binary file not shown.
Binary file modified test/reference/mm.pdf
Binary file not shown.
Binary file modified test/reference/moveTo_lineTo_stroke_fill.pdf
Binary file not shown.
Binary file modified test/reference/open.pdf
Binary file not shown.
Binary file modified test/reference/outlines.pdf
Binary file not shown.
Binary file modified test/reference/password.pdf
Binary file not shown.
Binary file modified test/reference/paths.pdf
Binary file not shown.
Binary file modified test/reference/pc.pdf
Binary file not shown.
Binary file modified test/reference/piechart.pdf
Binary file not shown.
Binary file modified test/reference/properties.pdf
Binary file not shown.
Binary file modified test/reference/pt.pdf
Binary file not shown.
Binary file modified test/reference/pushbutton.pdf
Binary file not shown.
Binary file modified test/reference/px.pdf
Binary file not shown.
Binary file modified test/reference/radiogroup.pdf
Binary file not shown.
Binary file modified test/reference/radiogroup2.pdf
Binary file not shown.
Binary file modified test/reference/rectangles.pdf
Binary file not shown.
Binary file modified test/reference/red-black.pdf
Binary file not shown.
Binary file modified test/reference/rotation-45.pdf
Binary file not shown.
Binary file modified test/reference/rotation-90.pdf
Binary file not shown.
Binary file modified test/reference/russian-1line.pdf
Binary file not shown.
Binary file modified test/reference/russian-2line.pdf
Binary file not shown.
Binary file modified test/reference/sierpinski.pdf
Binary file not shown.
Binary file modified test/reference/single.pdf
Binary file not shown.
Binary file modified test/reference/smiley.pdf
Binary file not shown.
Binary file modified test/reference/standard.pdf
Binary file not shown.
Binary file modified test/reference/standardfont.pdf
Binary file not shown.
Binary file modified test/reference/stroke.pdf
Binary file not shown.
Binary file modified test/reference/table-autoSize.pdf
Binary file not shown.
Binary file modified test/reference/table.pdf
Binary file not shown.
Binary file modified test/reference/textBaseline.pdf
Binary file not shown.
Binary file modified test/reference/textfield.pdf
Binary file not shown.
Binary file modified test/reference/thumbs.pdf
Binary file not shown.
Binary file modified test/reference/two-page.pdf
Binary file not shown.
Binary file modified test/reference/twoleft.pdf
Binary file not shown.
Binary file modified test/reference/tworight.pdf
Binary file not shown.
Binary file modified test/reference/w3s_arc.pdf
Binary file not shown.
Binary file modified test/reference/w3s_bezierCurveTo.pdf
Binary file not shown.
Binary file modified test/reference/w3s_clip.pdf
Binary file not shown.
Binary file modified test/reference/w3s_closePath_v1.pdf
Binary file not shown.
Binary file modified test/reference/w3s_closePath_v2.pdf
Binary file not shown.
Binary file modified test/reference/w3s_fillStyle.pdf
Binary file not shown.
Binary file modified test/reference/w3s_fillText.pdf
Binary file not shown.
Binary file modified test/reference/w3s_font.pdf
Binary file not shown.
Binary file modified test/reference/w3s_lineCap_butt.pdf
Binary file not shown.
Binary file modified test/reference/w3s_lineCap_round.pdf
Binary file not shown.
Binary file modified test/reference/w3s_lineCap_square.pdf
Binary file not shown.
Binary file modified test/reference/w3s_lineJoin_bevel.pdf
Binary file not shown.
Binary file modified test/reference/w3s_lineJoin_miter.pdf
Binary file not shown.
Binary file modified test/reference/w3s_lineJoin_round.pdf
Binary file not shown.
Binary file modified test/reference/w3s_lineTo.pdf
Binary file not shown.
Binary file modified test/reference/w3s_quadraticCurveTo.pdf
Binary file not shown.
Binary file modified test/reference/w3s_rotate.pdf
Binary file not shown.
Binary file modified test/reference/w3s_scale.pdf
Binary file not shown.
Binary file modified test/reference/w3s_setTransform.pdf
Binary file not shown.
Binary file modified test/reference/w3s_strokeStyle.pdf
Binary file not shown.
Binary file modified test/reference/w3s_strokeText.pdf
Binary file not shown.
Binary file modified test/reference/w3s_textAlign.pdf
Binary file not shown.
Binary file modified test/reference/w3s_textBaseline.pdf
Binary file not shown.
Binary file modified test/reference/w3s_transform.pdf
Binary file not shown.
Binary file modified test/reference/w3s_translate.pdf
Binary file not shown.
Binary file modified test/reference/warnsign.pdf
Binary file not shown.
Binary file modified test/reference/webp.pdf
Binary file not shown.
Binary file modified test/reference/with_annotations.pdf
Binary file not shown.
Binary file modified test/reference/xmpmetadata-defaultNS.pdf
Binary file not shown.
Binary file modified test/reference/xmpmetadata.pdf
Binary file not shown.
Binary file modified test/reference/zoom-2x.pdf
Binary file not shown.
Binary file modified test/reference/zoom-3x.pdf
Binary file not shown.
Binary file modified test/reference/zoom-full-height.pdf
Binary file not shown.
Binary file modified test/reference/zoom-full-page.pdf
Binary file not shown.
Binary file modified test/reference/zoom-full-width.pdf
Binary file not shown.
Binary file modified test/reference/zoom-original.pdf
Binary file not shown.
132 changes: 66 additions & 66 deletions test/specs/jspdf.unit.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -771,27 +771,27 @@ describe("Core: Unit Tests", () => {
"endobj",
"xref",
"0 21",
"0000000000 65535 f",
"0000000184 00000 n",
"0000002001 00000 n",
"0000000015 00000 n",
"0000000124 00000 n",
"0000000241 00000 n",
"0000000366 00000 n",
"0000000496 00000 n",
"0000000629 00000 n",
"0000000766 00000 n",
"0000000889 00000 n",
"0000001018 00000 n",
"0000001150 00000 n",
"0000001286 00000 n",
"0000001414 00000 n",
"0000001541 00000 n",
"0000001670 00000 n",
"0000001803 00000 n",
"0000001905 00000 n",
"0000002249 00000 n",
"0000002335 00000 n",
"0000000000 65535 f ",
"0000000184 00000 n ",
"0000002001 00000 n ",
"0000000015 00000 n ",
"0000000124 00000 n ",
"0000000241 00000 n ",
"0000000366 00000 n ",
"0000000496 00000 n ",
"0000000629 00000 n ",
"0000000766 00000 n ",
"0000000889 00000 n ",
"0000001018 00000 n ",
"0000001150 00000 n ",
"0000001286 00000 n ",
"0000001414 00000 n ",
"0000001541 00000 n ",
"0000001670 00000 n ",
"0000001803 00000 n ",
"0000001905 00000 n ",
"0000002249 00000 n ",
"0000002335 00000 n ",
"trailer",
"<<",
"/Size 21",
Expand Down Expand Up @@ -2911,9 +2911,9 @@ break`,
expect(writeArray).toEqual([
"xref",
"0 3",
"0000000000 65535 f",
"0000000039 00000 n",
"0000000058 00000 n"
"0000000000 65535 f ",
"0000000040 00000 n ",
"0000000060 00000 n "
]);
});

Expand Down Expand Up @@ -3315,27 +3315,27 @@ break`,
"endobj",
"xref",
"0 21",
"0000000000 65535 f",
"0000000184 00000 n",
"0000002001 00000 n",
"0000000015 00000 n",
"0000000124 00000 n",
"0000000241 00000 n",
"0000000366 00000 n",
"0000000496 00000 n",
"0000000629 00000 n",
"0000000766 00000 n",
"0000000889 00000 n",
"0000001018 00000 n",
"0000001150 00000 n",
"0000001286 00000 n",
"0000001414 00000 n",
"0000001541 00000 n",
"0000001670 00000 n",
"0000001803 00000 n",
"0000001905 00000 n",
"0000002249 00000 n",
"0000002335 00000 n",
"0000000000 65535 f ",
"0000000184 00000 n ",
"0000002001 00000 n ",
"0000000015 00000 n ",
"0000000124 00000 n ",
"0000000241 00000 n ",
"0000000366 00000 n ",
"0000000496 00000 n ",
"0000000629 00000 n ",
"0000000766 00000 n ",
"0000000889 00000 n ",
"0000001018 00000 n ",
"0000001150 00000 n ",
"0000001286 00000 n ",
"0000001414 00000 n ",
"0000001541 00000 n ",
"0000001670 00000 n ",
"0000001803 00000 n ",
"0000001905 00000 n ",
"0000002249 00000 n ",
"0000002335 00000 n ",
"trailer",
"<<",
"/Size 21",
Expand Down Expand Up @@ -3556,27 +3556,27 @@ break`,
"endobj",
"xref",
"0 21",
"0000000000 65535 f",
"0000000184 00000 n",
"0000002001 00000 n",
"0000000015 00000 n",
"0000000124 00000 n",
"0000000241 00000 n",
"0000000366 00000 n",
"0000000496 00000 n",
"0000000629 00000 n",
"0000000766 00000 n",
"0000000889 00000 n",
"0000001018 00000 n",
"0000001150 00000 n",
"0000001286 00000 n",
"0000001414 00000 n",
"0000001541 00000 n",
"0000001670 00000 n",
"0000001803 00000 n",
"0000001905 00000 n",
"0000002249 00000 n",
"0000002335 00000 n",
"0000000000 65535 f ",
"0000000184 00000 n ",
"0000002001 00000 n ",
"0000000015 00000 n ",
"0000000124 00000 n ",
"0000000241 00000 n ",
"0000000366 00000 n ",
"0000000496 00000 n ",
"0000000629 00000 n ",
"0000000766 00000 n ",
"0000000889 00000 n ",
"0000001018 00000 n ",
"0000001150 00000 n ",
"0000001286 00000 n ",
"0000001414 00000 n ",
"0000001541 00000 n ",
"0000001670 00000 n ",
"0000001803 00000 n ",
"0000001905 00000 n ",
"0000002249 00000 n ",
"0000002335 00000 n ",
"trailer",
"<<",
"/Size 21",
Expand Down