[cairo-commit] 2 commits - src/cairo-recording-surface.c

[GitLab Mirror]

 src/cairo-recording-surface.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 08194cef5342dccdd444cadd528ceff5a8970ee1
Merge: ad0467097 7eff124d0
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Wed Jan 11 07:53:11 2023 +0000

    Merge branch 'bug-619' into 'master'
    
    Remove the unbounded recording surface assertion
    
    Closes #619
    
    See merge request cairo/cairo!399

commit 7eff124d09821cf372cb521934321cebc045c182
Author: Fujii Hironori <Hironori.Fujii at sony.com>
Date:   Tue Jan 10 13:15:31 2023 +0900

    Remove the unbounded recording surface assertion
    
    There was an assertion in
    `_cairo_recording_surface_acquire_source_image` to ensure the surface
    isn't unbounded. However, this assertion was failing for
    `record-paint` test on Windows.
    
    Removed the assertion and return `CAIRO_INT_STATUS_UNSUPPORTED` if the
    surface is unbounded.
    
    Fixes cairo/cairo#619

diff --git a/src/cairo-recording-surface.c b/src/cairo-recording-surface.c
index 1df0998e0..f8bac4b2e 100644
--- a/src/cairo-recording-surface.c
+++ b/src/cairo-recording-surface.c
@@ -615,7 +615,8 @@ _cairo_recording_surface_acquire_source_image (void			 *abstract_surface,
 	return CAIRO_STATUS_SUCCESS;
     }
 
-    assert (! surface->unbounded);
+    if (surface->unbounded)
+	return CAIRO_INT_STATUS_UNSUPPORTED;
     image = _cairo_image_surface_create_with_content (surface->base.content,
 						      surface->extents.width,
 						      surface->extents.height);