pixman: Branch 'master'

[GitLab Mirror]

 pixman/pixman-private.h |    4 ++--
 pixman/pixman-utils.c   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7aeeb501ad3918bdc6d667b1337cfd6db771eb43
Author: Simon Ser <contact at emersion.fr>
Date:   Sat Aug 12 08:44:09 2023 +0200

    Fix const warnings in pixman_image_set_clip_region()
    
    Fixes the following warnings:
    
        pixman-image.c: In function 'pixman_image_set_clip_region':
        pixman-image.c:601:81: warning: passing argument 2 of 'pixman_region32_copy_from_region16' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
          601 |         if ((result = pixman_region32_copy_from_region16 (&common->clip_region, region)))
              |                                                                                 ^~~~~~
        In file included from pixman-image.c:32:
        pixman-private.h:859:56: note: expected 'pixman_region16_t *' {aka 'struct pixman_region16 *'} but argument is of type 'const pixman_region16_t *' {aka 'const struct pixman_region16 *'}
          859 |                                     pixman_region16_t *src);
              |                                     ~~~~~~~~~~~~~~~~~~~^~~
        pixman-utils.c:240:1: error: conflicting types for 'pixman_region16_copy_from_region32'; have 'pixman_bool_t(pixman_region16_t *, pixman_region32_t *)' {aka 'int(struct pixman_region16 *, struct pixman_region32 *)'}
          240 | pixman_region16_copy_from_region32 (pixman_region16_t *dst,
              | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        In file included from pixman-utils.c:31:
        pixman-private.h:862:1: note: previous declaration of 'pixman_region16_copy_from_region32' with type 'pixman_bool_t(pixman_region16_t *, const pixman_region32_t *)' {aka 'int(struct pixman_region16 *, const struct pixman_region32 *)'}
          862 | pixman_region16_copy_from_region32 (pixman_region16_t *dst,
              | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        pixman-utils.c:270:1: error: conflicting types for 'pixman_region32_copy_from_region16'; have 'pixman_bool_t(pixman_region32_t *, pixman_region16_t *)' {aka 'int(struct pixman_region32 *, struct pixman_region16 *)'}
          270 | pixman_region32_copy_from_region16 (pixman_region32_t *dst,
              | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        In file included from pixman-utils.c:31:
        pixman-private.h:858:1: note: previous declaration of 'pixman_region32_copy_from_region16' with type 'pixman_bool_t(pixman_region32_t *, const pixman_region16_t *)' {aka 'int(struct pixman_region32 *, const struct pixman_region16 *)'}
          858 | pixman_region32_copy_from_region16 (pixman_region32_t *dst,
              | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    Signed-off-by: Simon Ser <contact at emersion.fr>

diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 7316c80..f43e87f 100644
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -856,11 +856,11 @@ pixman_contract_from_float (uint32_t     *dst,
 /* Region Helpers */
 pixman_bool_t
 pixman_region32_copy_from_region16 (pixman_region32_t *dst,
-                                    pixman_region16_t *src);
+                                    const pixman_region16_t *src);
 
 pixman_bool_t
 pixman_region16_copy_from_region32 (pixman_region16_t *dst,
-                                    pixman_region32_t *src);
+                                    const pixman_region32_t *src);
 
 /* Doubly linked lists */
 typedef struct pixman_link_t pixman_link_t;
diff --git a/pixman/pixman-utils.c b/pixman/pixman-utils.c
index 8c57b0b..302cd0c 100644
--- a/pixman/pixman-utils.c
+++ b/pixman/pixman-utils.c
@@ -238,7 +238,7 @@ _pixman_iter_init_bits_stride (pixman_iter_t *iter, const pixman_iter_info_t *in
 
 pixman_bool_t
 pixman_region16_copy_from_region32 (pixman_region16_t *dst,
-                                    pixman_region32_t *src)
+                                    const pixman_region32_t *src)
 {
     int n_boxes, i;
     pixman_box32_t *boxes32;
@@ -268,7 +268,7 @@ pixman_region16_copy_from_region32 (pixman_region16_t *dst,
 
 pixman_bool_t
 pixman_region32_copy_from_region16 (pixman_region32_t *dst,
-                                    pixman_region16_t *src)
+                                    const pixman_region16_t *src)
 {
     int n_boxes, i;
     pixman_box16_t *boxes16;