From 2cb9f42507a9ec7375958606c75791e202274e49 Mon Sep 17 00:00:00 2001
From: pubpub-zz <4083478+pubpub-zz@users.noreply.github.com>
Date: Mon, 16 May 2022 11:53:00 +0200
Subject: [PATCH 1/4] BUG : Fix merge of a cropped page

tracked in #636

thee smaller box between cropBox is and  trimBox(== mediaBox by default) is used
---
 PyPDF2/_page.py    | 13 +++++++++----
 tests/test_page.py | 18 +++++++++++++++++-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/PyPDF2/_page.py b/PyPDF2/_page.py
index 01b45d8a1..c65048ef5 100644
--- a/PyPDF2/_page.py
+++ b/PyPDF2/_page.py
@@ -352,16 +352,21 @@ def _mergePage(
         page2content = page2.getContents()
         if page2content is not None:
             page2content = ContentStream(page2content, self.pdf)
+            if(page2.cropBox.getWidth()<page2.trimBox.getWidth() or
+               page2.cropBox.getHeight()<page2.trimBox.getHeight()):
+                rect = page2.cropBox
+            else:
+                rect = page2.trimBox
             page2content.operations.insert(
                 0,
                 (
                     map(
                         FloatObject,
                         [
-                            page2.trimBox.getLowerLeft_x(),
-                            page2.trimBox.getLowerLeft_y(),
-                            page2.trimBox.getWidth(),
-                            page2.trimBox.getHeight(),
+                            rect.getLowerLeft_x(),
+                            rect.getLowerLeft_y(),
+                            rect.getWidth(),
+                            rect.getHeight(),
                         ],
                     ),
                     "re",
diff --git a/tests/test_page.py b/tests/test_page.py
index 780a45e7e..fd32d3abe 100644
--- a/tests/test_page.py
+++ b/tests/test_page.py
@@ -1,9 +1,11 @@
 import json
 import os
+import copy
+import io
 
 import pytest
 
-from PyPDF2 import PdfFileReader
+from PyPDF2 import PdfFileReader,PdfFileWriter
 from PyPDF2._page import PageObject
 from PyPDF2.generic import RectangleObject
 
@@ -128,3 +130,17 @@ def test_page_rotation_non90():
     with pytest.raises(ValueError) as exc:
         page.rotateClockwise(91)
     assert exc.value.args[0] == "Rotation angle must be a multiple of 90"
+
+def test_page_merge_cropped():
+    p = PdfFileReader(os.path.join(RESOURCE_ROOT, "issue-604.pdf"))
+    a=  copy.deepcopy(p.getPage(1))     # crossed to ease test reading
+    b=  copy.deepcopy(p.getPage(2))
+    a.cropBox = RectangleObject([100,100,300,200])
+    w = PdfFileWriter()
+    w.addPage(a)
+    w.addPage(b)
+    c=copy.deepcopy(b)
+    c.mergePage(a)
+    w.addPage(c)
+    o = io.BytesIO()
+    w.write(o)

From 75e9fdc6692f66a020de956c1da40b1aad0842db Mon Sep 17 00:00:00 2001
From: Martin Thoma <info@martin-thoma.de>
Date: Mon, 23 May 2022 22:43:44 +0200
Subject: [PATCH 2/4] Apply suggestions from code review

---
 PyPDF2/_page.py    | 10 ++++++----
 tests/test_page.py |  4 +---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/PyPDF2/_page.py b/PyPDF2/_page.py
index 7e4eda5d1..b8b9947bd 100644
--- a/PyPDF2/_page.py
+++ b/PyPDF2/_page.py
@@ -539,11 +539,13 @@ def _merge_page(
         page2content = page2.getContents()
         if page2content is not None:
             page2content = ContentStream(page2content, self.pdf)
-            if(page2.cropBox.getWidth()<page2.trimBox.getWidth() or
-               page2.cropBox.getHeight()<page2.trimBox.getHeight()):
-                rect = page2.cropBox
+            if (
+                page2.cropbox.width < page2.trimbox.width
+                or page2.cropbox.height < page2.trimbox.height
+            ):
+                rect = page2.cropbox
             else:
-                rect = page2.trimBox
+                rect = page2.trimbox
             page2content.operations.insert(
                 0,
                 (
diff --git a/tests/test_page.py b/tests/test_page.py
index 986e89288..1dce2f7c5 100644
--- a/tests/test_page.py
+++ b/tests/test_page.py
@@ -177,7 +177,6 @@ def test_page_rotation_non90():
         page.rotate_clockwise(91)
     assert exc.value.args[0] == "Rotation angle must be a multiple of 90"
 
-    
 def test_page_merge_cropped():
     p = PdfReader(os.path.join(RESOURCE_ROOT, "issue-604.pdf"))
     a = deepcopy(p.page[1])  # crossed to ease test reading
@@ -187,7 +186,7 @@ def test_page_merge_cropped():
     w.add_page(a)
     w.add_page(b)
     c = deepcopy(b)
-    c.mergePage(a)
+    c.merge_page(a)
     w.add_page(c)
     o = io.BytesIO()
     w.write(o)
@@ -201,4 +200,3 @@ def test_page_scale():
 
     assert op.scale(sx=2).ctm == (2, 0, 0, 2, 0, 0)
     assert op.scale(sy=3).ctm == (3, 0, 0, 3, 0, 0)
-

From 9ead0c33ee2ad3626de3626d83be0a4401003eda Mon Sep 17 00:00:00 2001
From: Martin Thoma <info@martin-thoma.de>
Date: Mon, 23 May 2022 22:45:57 +0200
Subject: [PATCH 3/4] Apply suggestions from code review

---
 tests/test_page.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_page.py b/tests/test_page.py
index 1dce2f7c5..1adbdf253 100644
--- a/tests/test_page.py
+++ b/tests/test_page.py
@@ -179,8 +179,8 @@ def test_page_rotation_non90():
 
 def test_page_merge_cropped():
     p = PdfReader(os.path.join(RESOURCE_ROOT, "issue-604.pdf"))
-    a = deepcopy(p.page[1])  # crossed to ease test reading
-    b = deepcopy(p.page[2])
+    a = deepcopy(p.pages[1])  # crossed to ease test reading
+    b = deepcopy(p.pages[2])
     a.cropbox = RectangleObject([100, 100, 300, 200])
     w = PdfWriter()
     w.add_page(a)

From bc6f8eddb1c368b2bc84fa304a11f4adb1039fa2 Mon Sep 17 00:00:00 2001
From: Martin Thoma <info@martin-thoma.de>
Date: Tue, 28 Jun 2022 19:06:19 +0200
Subject: [PATCH 4/4] Update tests/test_page.py

---
 tests/test_page.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_page.py b/tests/test_page.py
index 3baa27e59..c64081715 100644
--- a/tests/test_page.py
+++ b/tests/test_page.py
@@ -195,6 +195,7 @@ def test_page_rotation_non90():
         page.rotate(91)
     assert exc.value.args[0] == "Rotation angle must be a multiple of 90"
 
+
 def test_page_merge_cropped():
     p = PdfReader(os.path.join(RESOURCE_ROOT, "issue-604.pdf"))
     a = deepcopy(p.pages[1])  # crossed to ease test reading