luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-01 19:46:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1281-to-pixdata-docs' into 'master'

Browse Source 
gresource: Document the `to-pixdata` option as being deprecated

Closes #1281

See merge request GNOME/glib!1826
This commit is contained in:
Philip Withnall 2021-01-04 12:58:42 +00:00
commit 9716a26ab6
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/reference/gio/glib-compile-resources.xml
View File

@ -219,6 +219,9 @@ searched for in the <envar>PATH</envar>.
<varlistentry> <varlistentry>
<term><envar>GDK_PIXBUF_PIXDATA</envar></term> <term><envar>GDK_PIXBUF_PIXDATA</envar></term>
<listitem><para> <listitem><para>
Deprecated since gdk-pixbuf 2.32, as <type>GResource</type> supports embedding
modern image formats without conversion.
</para><para>
The full path to the <command>gdk-pixbuf-pixdata</command> executable. This is The full path to the <command>gdk-pixbuf-pixdata</command> executable. This is
used to preprocess resources with the <literal>to-pixdata</literal> preprocessing used to preprocess resources with the <literal>to-pixdata</literal> preprocessing
option. If this environment variable is not set, <command>gdk-pixbuf-pixdata</command> option. If this environment variable is not set, <command>gdk-pixbuf-pixdata</command>

16
gio/gresource.c
View File

@ -76,12 +76,16 @@ G_DEFINE_BOXED_TYPE (GResource, g_resource, g_resource_ref, g_resource_unref)
* the xmllint executable, or xmllint must be in the `PATH`; otherwise * the xmllint executable, or xmllint must be in the `PATH`; otherwise
* the preprocessing step is skipped. * the preprocessing step is skipped.
* *
* `to-pixdata` which will use the gdk-pixbuf-pixdata command to convert * `to-pixdata` (deprecated since gdk-pixbuf 2.32) which will use the
* images to the GdkPixdata format, which allows you to create pixbufs directly using the data inside * `gdk-pixbuf-pixdata` command to convert images to the #GdkPixdata format,
* the resource file, rather than an (uncompressed) copy of it. For this, the gdk-pixbuf-pixdata * which allows you to create pixbufs directly using the data inside the
* program must be in the PATH, or the `GDK_PIXBUF_PIXDATA` environment variable must be * resource file, rather than an (uncompressed) copy of it. For this, the
* set to the full path to the gdk-pixbuf-pixdata executable; otherwise the resource compiler will * `gdk-pixbuf-pixdata` program must be in the `PATH`, or the
* abort. * `GDK_PIXBUF_PIXDATA` environment variable must be set to the full path to the
* `gdk-pixbuf-pixdata` executable; otherwise the resource compiler will abort.
* `to-pixdata` has been deprecated since gdk-pixbuf 2.32, as #GResource
* supports embedding modern image formats just as well. Instead of using it,
* embed a PNG or SVG file in your #GResource.
* *
* `json-stripblanks` which will use the `json-glib-format` command to strip * `json-stripblanks` which will use the `json-glib-format` command to strip
* ignorable whitespace from the JSON file. For this to work, the * ignorable whitespace from the JSON file. For this to work, the