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

BUG: Fix merge_page sometimes generating unknown operator 'QQ' #2588

Merged
merged 6 commits into from
Apr 7, 2024
Merged

BUG: Fix merge_page sometimes generating unknown operator 'QQ' #2588

merged 6 commits into from
Apr 7, 2024

Conversation

rfotino
Copy link
Contributor

@rfotino rfotino commented Apr 7, 2024

Fixes #2587

Add back trailing newline

Co-authored-by: Stefan <96178532+stefan6419846@users.noreply.github.com>
@stefan6419846
Copy link
Collaborator

Thanks for your report and PR.

We will have to wait for one of the maintainers of the sample files repository (which I am not) to approve and merge your PR there to be able to update the submodule. Alternatively, we might want to use the URL-based test file approach for now.

tests/test_page.py Outdated Show resolved Hide resolved
@rfotino
Copy link
Contributor Author

rfotino commented Apr 7, 2024

No problem thanks for the quick response! If just using a github-hosted file works for the URL approach I can update with https://github.com/py-pdf/pypdf/files/14895914/blank_portrait.pdf, and will also update to fix the code style issues

Copy link

codecov bot commented Apr 7, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 94.88%. Comparing base (ae0d27b) to head (28a95b5).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2588   +/-   ##
=======================================
  Coverage   94.88%   94.88%           
=======================================
  Files          50       50           
  Lines        8286     8286           
  Branches     1659     1659           
=======================================
  Hits         7862     7862           
  Misses        263      263           
  Partials      161      161           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@pubpub-zz
Copy link
Collaborator

Alternatively, we might want to use the URL-based test file approach for now.

I agree this approach which is as effective and may prevent data duplications

Copy link
Collaborator

@pubpub-zz pubpub-zz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

_data is private and you should use the get_data() instead

Can you also modify the test code to use the url of the data from the github comments

tests/test_page.py Outdated Show resolved Hide resolved
tests/test_page.py Outdated Show resolved Hide resolved
rfotino and others added 2 commits April 7, 2024 00:52
Co-authored-by: pubpub-zz <4083478+pubpub-zz@users.noreply.github.com>
Co-authored-by: pubpub-zz <4083478+pubpub-zz@users.noreply.github.com>
@rfotino
Copy link
Contributor Author

rfotino commented Apr 7, 2024

Thanks I didn't know _data had a getter, I also updated the test to use get_data_from_url() and fetch the github hosted file so I think it should be good now - I'll close that sample-files PR and update the description

@stefan6419846 stefan6419846 changed the title BUG: Fixes merge_page sometimes generating unknown operator 'QQ' BUG: Fix merge_page sometimes generating unknown operator 'QQ' Apr 7, 2024
@stefan6419846 stefan6419846 merged commit 561b1b0 into py-pdf:main Apr 7, 2024
18 checks passed
stefan6419846 added a commit that referenced this pull request Apr 7, 2024
REL: 4.2.0

## What's new

### New Features (ENH)
- Allow multiple charsets for NameObject.read_from_stream (#2585) by @pubpub-zz
- Add support for /Kids in page labels (#2562) by @stefan6419846
- Allow to update fields on many pages (#2571) by @pubpub-zz
- Tolerate PDF with invalid xref pointed objects (#2335) by @pubpub-zz
- Add Enforce from PDF2.0 in viewer_preferences (#2511) by @pubpub-zz
- Add += and -= operators to ArrayObject (#2510) by @pubpub-zz

### Bug Fixes (BUG)
- Fix merge_page sometimes generating unknown operator 'QQ' (#2588) by @rfotino
- Fix fields update where annotations are kids of field (#2570) by @pubpub-zz
- Process CMYK images without a filter correctly (#2557) by @pubpub-zz
- Extract text in layout mode without finding resources (#2555) by @pubpub-zz
- Prevent recursive loop in some PDF files (#2505) by @pubpub-zz

### Robustness (ROB)
- Tolerate "truncated" xref (#2580) by @pubpub-zz
- Replace error by warning for EOD in RunLengthDecode/ASCIIHexDecode (#2334) by @pubpub-zz
- Rebuild xref table if one entry is invalid (#2528) by @pubpub-zz
- Robustify stream extraction (#2526) by @pubpub-zz

### Documentation (DOC)
- Update release process for latest changes (#2564) by @stefan6419846
- Encryption/decryption: Clone document instead of copying all pages (#2546) by @redfast00
- Minor improvements (#2542) by @j-t-1
- Update annotation list (#2534) by @j-t-1
- Update references and formatting (#2529) by @j-t-1
- Correct threads reference, plus minor changes (#2521) by @j-t-1
- Minor readability increases (#2515) by @j-t-1
- Simplify PaperSize examples (#2504) by @j-t-1
- Minor improvements (#2501) by @j-t-1

### Developer Experience (DEV)
- Remove unused dependencies (#2572) by @stefan6419846
- Remove page labels PR link from message (#2561) by @stefan6419846
- Fix changelog generator regarding whitespace and handling of "Other" group (#2492) by @stefan6419846
- Add REL to known PR prefixes (#2554) by @stefan6419846
- Release using the REL commit instead of git tag (#2500) by @MartinThoma
- Unify code between PdfReader and PdfWriter (#2497) by @pubpub-zz
- Bump softprops/action-gh-release from 1 to 2 (#2514) by @dependabot[bot]

### Maintenance (MAINT)
- Ressources → Resources (and internal name childs) (#2550) by @pubpub-zz
- Fix typos found by codespell (#2549) by @stefan6419846
- Update Read the Docs configuration (#2538) by @j-t-1
- Add root_object, _info and _ID to PdfReader (#2495) by @pubpub-zz

### Testing (TST)
- Allow loading truncated images if required (#2586) by @stefan6419846
- Fix download issues from #2562 (#2578) by @pubpub-zz
- Improve test_get_contents_from_nullobject to show real use-case (#2524) by @stefan6419846
- Add missing test annotations (#2507) by @stefan6419846

[Full Changelog](4.1.0...4.2.0)
@rfotino rfotino deleted the fix-merge-page-QQ branch April 7, 2024 16:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merging PDFs with content streams ending in Q causes error message in Adobe Reader
3 participants