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

[GitLab Mirror]

 src/cairo-ps-surface.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9f44d4c7c509e7aa348f627f6b21dad62762810c
Merge: 2dec76ddf ca3e776ab
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sun Aug 22 06:48:10 2021 +0000

    Merge branch 'ps-image' into 'master'
    
    Fix PS emit image for 16-bit images
    
    See merge request cairo/cairo!242

commit ca3e776abe6744c94fb4dbff4533308a84661097
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sun Aug 22 15:19:47 2021 +0930

    Fix PS emit image for 16-bit images

diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c
index c61c2246d..41f635d56 100644
--- a/src/cairo-ps-surface.c
+++ b/src/cairo-ps-surface.c
@@ -2607,7 +2607,6 @@ _cairo_ps_surface_emit_image (cairo_ps_surface_t          *surface,
 	surf = _cairo_image_surface_create_with_content (image->base.content,
 							 image->width,
 							 image->height);
-	image = (cairo_image_surface_t *) surf;
 	if (surf->status) {
 	    status = surf->status;
 	    goto bail0;
@@ -2618,6 +2617,7 @@ _cairo_ps_surface_emit_image (cairo_ps_surface_t          *surface,
 				       CAIRO_OPERATOR_SOURCE, &pattern.base,
 				       NULL);
         _cairo_pattern_fini (&pattern.base);
+	image = (cairo_image_surface_t *) surf;
         if (unlikely (status))
             goto bail0;
     }