[gtk: 40/40] Merge branch 'image-loading' into 'master'




commit 1d41dc716e99f3f2f0c0bfe6e9a9985f11909a59
Merge: 698b3542a1 3914ecbd0f
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Fri Sep 17 03:13:38 2021 +0000

    Merge branch 'image-loading' into 'master'
    
    Image loaders
    
    See merge request GNOME/gtk!3939

 demos/gtk-demo/listbox.c                        |  11 +-
 demos/gtk-demo/listbox.ui                       |   1 +
 examples/bp/bloatpad.c                          |   4 +-
 gdk/gdkcontentdeserializer.c                    | 109 ++++-
 gdk/gdkcontentserializer.c                      | 133 +++++-
 gdk/gdktexture.c                                | 318 +++++++++++--
 gdk/gdktexture.h                                |  31 ++
 gdk/gdktextureprivate.h                         |   5 +-
 gdk/loaders/gdkjpeg.c                           | 329 ++++++++++++++
 gdk/loaders/gdkjpegprivate.h                    |  43 ++
 gdk/loaders/gdkpng.c                            | 568 ++++++++++++++++++++++++
 gdk/loaders/gdkpngprivate.h                     |  43 ++
 gdk/loaders/gdktiff.c                           | 513 +++++++++++++++++++++
 gdk/loaders/gdktiffprivate.h                    |  46 ++
 gdk/meson.build                                 |   8 +-
 gsk/gskrendernodeparser.c                       |  30 +-
 gtk/gdkpixbufutils.c                            |  78 ++--
 gtk/gdkpixbufutilsprivate.h                     |   6 -
 gtk/gtkbuilder.c                                |  81 +++-
 gtk/gtkcssimageurl.c                            |  21 +-
 gtk/gtkicontheme.c                              | 161 +++----
 meson.build                                     |  21 +
 subprojects/libpng.wrap                         |  12 +
 subprojects/libtiff.wrap                        |  12 +
 testsuite/gdk/contentserializer.c               |  71 ++-
 testsuite/gdk/image-data/image.jpeg             | Bin 0 -> 8397 bytes
 testsuite/gdk/image-data/image.png              | Bin 0 -> 1609 bytes
 testsuite/gdk/image-data/image.tiff             | Bin 0 -> 205344 bytes
 testsuite/gdk/image.c                           | 129 ++++++
 testsuite/gdk/memorytexture.c                   |  68 ++-
 testsuite/gdk/meson.build                       |  26 ++
 testsuite/gsk/nodeparser/empty-texture.ref.node |   5 +-
 testsuite/gsk/nodeparser/widgetfactory.ref.node | 513 +++++++++++----------
 33 files changed, 2852 insertions(+), 544 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]