diff options
37 files changed, 2519 insertions, 2543 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e1c7febd..0d52caf6b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ variables: COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false" LOADERS_FLAGS: "-Dpng=true -Djpeg=true -Dtiff=true" MESON_TEST_TIMEOUT_MULTIPLIER: 3 - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gdk-pixbuf/fedora:v1" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gdk-pixbuf/fedora:v2" .only-default: only: @@ -23,8 +23,8 @@ variables: before_script: - mkdir -p _ccache script: - - meson ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _build . - - ninja -C _build + - meson setup ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _build . + - meson compile -C _build - .gitlab/scripts/run-tests.sh _build artifacts: when: always @@ -69,7 +69,7 @@ macos: - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH script: - meson setup -Dintrospection=disabled -Dinstalled_tests=false -Dman=false -Dgtk_doc=false _build - - meson compile -C_build + - meson compile -C _build artifacts: when: always paths: @@ -90,9 +90,11 @@ reference: variables: BUILD_OPTS: "-Dbuildtype=release -Dgtk_doc=true" script: - - meson ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _build . - - ninja -C _build gdk-pixbuf-doc - - mv _build/docs/html _reference + - meson setup ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _build . + - meson compile -C _build + - mkdir -p _reference + - mv _build/docs/gdk-pixbuf/ _reference/gdk-pixbuf/ + - mv _build/docs/gdk-pixdata/ _reference/gdk-pixdata/ artifacts: when: on_success paths: @@ -105,7 +107,7 @@ static-scan: variables: BUILD_OPTS: "--buildtype=debug" script: - - meson ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _scan_build + - meson setup ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _scan_build - ninja -C _scan_build scan-build artifacts: paths: @@ -121,8 +123,8 @@ asan-build: needs: [] variables: script: - - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled _build - - ninja -C _build + - CC=clang meson setup --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled _build + - meson compile -C _build - .gitlab/scripts/run-tests.sh _build artifacts: paths: @@ -139,13 +141,14 @@ release-dist: - meson ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _build . - meson compile -C _build - meson dist -C _build - - ninja -C _build gdk-pixbuf-doc - - tar -c -J -f _build/gdk-pixbuf-docs-${CI_COMMIT_TAG}.tar.xz _build/docs/ + - tar -c -J -f _build/gdk-pixbuf-docs-${CI_COMMIT_TAG}.tar.xz _build/docs/gdk-pixbuf/ + - tar -c -J -f _build/gdk-pixdata-docs-${CI_COMMIT_TAG}.tar.xz _build/docs/gdk-pixdata/ artifacts: when: on_success paths: - _build/meson-dist/gdk-pixbuf-${CI_COMMIT_TAG}.tar.xz - _build/gdk-pixbuf-docs-${CI_COMMIT_TAG}.tar.xz + - _build/gdk-pixdata-docs-${CI_COMMIT_TAG}.tar.xz only: - tags diff --git a/.gitlab/ci/fedora.Dockerfile b/.gitlab/ci/fedora.Dockerfile index 83fe27d98..804024823 100644 --- a/.gitlab/ci/fedora.Dockerfile +++ b/.gitlab/ci/fedora.Dockerfile @@ -23,8 +23,11 @@ RUN dnf -y install \ meson \ python3 \ python3-jinja2 \ + python3-markdown \ python3-pip \ python3-pygments \ + python3-toml \ + python3-typogrify \ python3-wheel \ redhat-rpm-config \ shared-mime-info \ @@ -1,3 +1,18 @@ +2.42.4 (stable) +=== + + - Make enum type registration thread safe + - Do not install skipped test files [Jan Tojnar] + - Fix GIF initialization [Simon McVittie] + - Always run GIF loader tests [Simon McVittie] + - Fix leaks discovered via ASan [Simon McVittie] + - Expose GdkPixbufLoader API via introspection [Paolo Borelli] + - Fix revert-to-previous first frame behaviour for GIF files [Robert Ancell, #166] + - Link to libintl if needed [Fabrice Fontaine] + - Improve support for using gdk-pixbuf as a subproject [Xavier Claessens] + - Fix build with GModule disabled [Fabrice Fontaine] + - Use gi-docgen to generate the API reference from introspection data + 2.42.2 (stable) === @@ -39,8 +39,7 @@ Additionally, you may need: - [shared-mime-info](https://freedesktop.org/wiki/Software/shared-mime-info/) - [GObject Introspection](https://gitlab.gnome.org/GNOME/gobject-introspection/) - - [GTK-Doc](https://gitlab.gnome.org/GNOME/gtk-doc/) - - [Xlib's development files](https://cgit.freedesktop.org/xorg/lib/libX11/) + - [GI-DocGen](https://gitlab.gnome.org/ebassi/gi-docgen/) - mediaLib's development files ### Building and installing @@ -51,10 +50,9 @@ the project; typically, on most platforms, you should be able to use the following commands to build and install GdkPixbuf in the default prefix: ```sh -$ meson _build . -$ cd _build -$ ninja -$ sudo ninja install +$ meson setup _build . +$ meson compile -C _build +$ meson install -C _build ``` You can use Meson's `--prefix` argument to control the installation prefix @@ -67,9 +65,8 @@ check the current build configuration, and change its options. You can specify the following options in the command line to `meson`: - * `-Dgtk_doc=true` - Build the API reference documentation. This - requires `gtk-doc` to be installed. - * `-Drelocatable=true` - Enable application bundle relocation support. + * `-Dgtk_doc=true` - Build the API reference documentation + * `-Drelocatable=true` - Enable application bundle relocation support For a complete list of build-time options, see the file [`meson_options.txt`](meson_options.txt). You can read about Meson diff --git a/build-aux/dist.py b/build-aux/dist.py new file mode 100644 index 000000000..4f1a18df2 --- /dev/null +++ b/build-aux/dist.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python3 + +import os +import shutil + +references = [ + 'docs/gdk-pixbuf', + 'docs/gdk-pixdata', +] + +sourceroot = os.environ.get('MESON_SOURCE_ROOT') +buildroot = os.environ.get('MESON_BUILD_ROOT') +distroot = os.environ.get('MESON_DIST_ROOT') + +for reference in references: + src_path = os.path.join(buildroot, reference) + if os.path.exists(src_path): + dst_path = os.path.join(distroot, reference) + if os.path.isdir(src_path): + shutil.copytree(src_path, dst_path) + elif os.path.isfile(src_path): + shutil.copyfile(src_path, dst_path) diff --git a/docs/gdk-pixbuf-from-drawables.xml b/docs/gdk-pixbuf-from-drawables.xml deleted file mode 100644 index 99fe3be07..000000000 --- a/docs/gdk-pixbuf-from-drawables.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" - "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ -]> -<refentry id="gdk-pixbuf-gdk-pixbuf-from-drawables"> -<refmeta> -<refentrytitle>Drawables to Pixbufs</refentrytitle> -<manvolnum>3</manvolnum> -<refmiscinfo>GDK-PIXBUF Library</refmiscinfo> -</refmeta> - -<refnamediv> -<refname>Drawables to Pixbufs</refname><refpurpose>Getting parts of a GDK drawable's image data into a pixbuf.</refpurpose> -</refnamediv> - -<refsect1> -<title>Description</title> - <para> - The functions to take the image data from a GDK windowing system surface - and store them into a GdkPixbuf are provided by GDK; see - <ulink url="https://developer.gnome.org/gdk3/stable/gdk3-Pixbufs.html">the - GDK documentation</ulink>. - </para> -</refsect1> - -</refentry> diff --git a/docs/gdk-pixbuf-rendering.xml b/docs/gdk-pixbuf-rendering.xml deleted file mode 100644 index 26c8776cc..000000000 --- a/docs/gdk-pixbuf-rendering.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" - "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ -]> -<refentry id="gdk-pixbuf-gdk-pixbuf-rendering"> -<refmeta> -<refentrytitle>Rendering</refentrytitle> -<manvolnum>3</manvolnum> -<refmiscinfo>GDK-PIXBUF Library</refmiscinfo> -</refmeta> - -<refnamediv> -<refname>Rendering</refname><refpurpose>Rendering a pixbuf to a GDK drawable.</refpurpose> -</refnamediv> - - -<refsect1> -<title>Description</title> - <para> - The functions to render pixbufs to GDK drawables are provided by GDK, see - the <ulink url="https://developer.gnome.org/gdk3/stable/gdk3-Cairo-Interaction.html">GDK - documentation</ulink>. - </para> -</refsect1> - -</refentry> diff --git a/docs/gdk-pixbuf.toml.in b/docs/gdk-pixbuf.toml.in new file mode 100644 index 000000000..bd5cfe935 --- /dev/null +++ b/docs/gdk-pixbuf.toml.in @@ -0,0 +1,129 @@ +# SPDX-FileCopyrightText: 2021 GNOME Foundation +# +# SPDX-License-Identifier: CC0-1.0 + +[library] +name = "gdk-pixbuf" +version = "@VERSION@" +browse_url = "https://gitlab.gnome.org/GNOME/gdk-pixbuf/" +repository_url = "https://gitlab.gnome.org/GNOME/gdk-pixbuf.git" +website_url = "https://www.gtk.org" +authors = "GTK Development Team" +license = "GPL-2.1-or-later" +description = "Image loading library" +dependencies = [ "gobject", "gio" ] +devhelp = true +search_index = true + + [dependencies.gobject] + name = "GObject" + description = "The base type system library" + docs_url = "https://developer.gnome.org/gobject/stable" + + [dependencies.gio] + name = "GIO" + description = "GObject Interfaces and Objects" + docs_url = "https://developer.gnome.org/gio/stable" + +[theme] +name = "basic" +show_index_summary = true + +[source-location] +base_url = "https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/blob/master/" + +[extra] +urlmap_file = "urlmap.js" +content_images = [ + 'apple-red-1a.png', + 'apple-red-2c.png', + 'composite.png', + 'gnome-gmush-1.png', +] +content_files = [ + 'scaling-compositing.md', +] + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_0_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_2_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_4_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_6_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_8_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_10_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_12_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_14_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_16_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_18_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_20_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_22_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_24_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_26_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_28_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_30_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_32_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_34_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_36_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_38_FOR" +hidden = true + +[[object]] +name = "PIXBUF_DEPRECATED_IN_2_40_FOR" +hidden = true diff --git a/docs/gdk-pixbuf.xml b/docs/gdk-pixbuf.xml deleted file mode 100644 index efe977bdd..000000000 --- a/docs/gdk-pixbuf.xml +++ /dev/null @@ -1,229 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" - "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ -<!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'"> -<!ENTITY version SYSTEM "version.xml"> -]> -<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> - <bookinfo> - <title>GDK-PixBuf Reference Manual</title> - <releaseinfo> - Version &version; - The latest version of this documentation can be found on-line at - <ulink role="online-location" url="http://library.gnome.org/devel/gdk-pixbuf/unstable/">http://library.gnome.org/devel/gdk-pixbuf/unstable/</ulink>. - </releaseinfo> - <authorgroup> - <author> - <firstname>Federico</firstname> - <surname>Mena Quintero</surname> - <affiliation> - <address> - <email>federico@gimp.org</email> - </address> - </affiliation> - </author> - </authorgroup> - - <copyright> - <year>2000</year> - <holder>The Free Software Foundation</holder> - </copyright> - - <legalnotice> - <para> - Permission is granted to copy, distribute and/or modify this - document under the terms of the <citetitle>GNU Free - Documentation License</citetitle>, Version 1.1 or any later - version published by the Free Software Foundation with no - Invariant Sections, no Front-Cover Texts, and no Back-Cover - Texts. You may obtain a copy of the <citetitle>GNU Free - Documentation License</citetitle> from the Free Software - Foundation by visiting <ulink type="http" - url="http://www.fsf.org">their Web site</ulink> or by writing - to: - - <address> - The Free Software Foundation, Inc., - <street>59 Temple Place</street> - Suite 330, - <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>, - <country>USA</country> - </address> - </para> - - <para> - Many of the names used by companies to distinguish their - products and services are claimed as trademarks. Where those - names appear in any GNOME documentation, and those trademarks - are made aware to the members of the GNOME Documentation - Project, the names have been printed in caps or initial caps. - </para> - </legalnotice> - </bookinfo> - - <reference> - <title>API Reference</title> - - <partintro> - <para> - This part presents the class and function reference for the - gdk-pixbuf library. Classes are described together with - their methods; individual functions are grouped by functional - group. - </para> - </partintro> - - <xi:include href="xml/initialization_versions.xml" /> - - <xi:include href="xml/gdk-pixbuf.xml" /> - <xi:include href="xml/refcounting.xml" /> - <xi:include href="xml/file-loading.xml" /> - <xi:include href="xml/file-saving.xml" /> - <xi:include href="xml/creating.xml" /> - <xi:include href="xml/inline.xml" /> - <xi:include href="xml/scaling.xml" /> - <xi:include href="xml/util.xml" /> - <xi:include href="xml/animation.xml" /> - - <chapter id="LoadableModules"> - <title>Loadable modules</title> - <xi:include href="xml/module_interface.xml" /> - <xi:include href="xml/gdk-pixbuf-loader.xml" /> - </chapter> - - <chapter id="Gdk"> - <title>GDK integration (deprecated)</title> - <xi:include href="xml/gdk-pixbuf-rendering.xml" /> - <xi:include href="xml/gdk-pixbuf-from-drawables.xml" /> - </chapter> - </reference> - - <reference> - <title>Tools Reference</title> - - <partintro> - <para> - This part presents the tools which are shipped with the gdk-pixbuf library. - </para> - </partintro> - - <xi:include href="gdk-pixbuf-csource.xml" /> - <xi:include href="gdk-pixbuf-query-loaders.xml" /> - </reference> - - <index id="api-index-full"> - <title>Index of all symbols</title> - <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> - </index> - <index id="api-index-deprecated" role="deprecated"> - <title>Index of deprecated symbols</title> - <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include> - </index> - <index id="api-index-2-2" role="2.2"> - <title>Index of new symbols in 2.2</title> - <xi:include href="xml/api-index-2.2.xml"><xi:fallback /></xi:include> - </index> - <index id="api-index-2-4" role="2.4"> - <title>Index of new symbols in 2.4</title> - <xi:include href="xml/api-index-2.4.xml"><xi:fallback /></xi:include> - </index> - <index id="api-index-2-6" role="2.6"> - <title>Index of new symbols in 2.6</title> - <xi:include href="xml/api-index-2.6.xml"><xi:fallback /></xi:include> - </index> - <index id="api-index-2-8" role="2.8"> - <title>Index of new symbols in 2.8</title> - <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include> - </index> - <index id="api-index-2-12" role="2.12"> - <title>Index of new symbols in 2.12</title> - <xi:include href="xml/api-index-2.12.xml"><xi:fallback /></xi:include> - </index> - <index id="api-index-2-14" role="2.14"> - <title>Index of new symbols in 2.14</title> - <xi:include href="xml/api-index-2.14.xml"><xi:fallback /></xi:include> - </index> - <index id="api-index-2-18" role="2.18"> - <title>Index of new symbols in 2.18</title> - <xi:include href="xml/api-index-2.18.xml"><xi:fallback /></xi:include> - </index> - <index id="api-index-2-22" role="2.22"> - <title>Index of new symbols in 2.22</title> - <xi:include href="xml/api-index-2.22.xml"><xi:fallback /></xi:include> - </index> - <index id="api-index-2-24" role="2.24"> - <title>Index of new symbols in 2.24</title> - <xi:include href="xml/api-index-2.24.xml"><xi:fallback /></xi:include> - </index> - <index id="api-index-2-26" role="2.26"> - <title>Index of new symbols in 2.26</title> - <xi:include href="xml/api-index-2.26.xml"><xi:fallback /></xi:include> - </index> - <index id="api-index-2-28" role="2.28"> - <title>Index of new symbols in 2.28</title> - <xi:include href="xml/api-index-2.28.xml"><xi:fallback /></xi:include> - </index> - <index id="api-index-2-30" role="2.30"> - <title>Index of new symbols in 2.30</title> - <xi:include href="xml/api-index-2.30.xml"><xi:fallback /></xi:include> - </index> - <index id="api-index-2-32" role="2.32"> - <title>Index of new symbols in 2.32</title> - <xi:include href="xml/api-index-2.32.xml"><xi:fallback /></xi:include> - </index> - <index id="api-index-2-36" role="2.36"> - <title>Index of new symbols in 2.36</title> - <xi:include href="xml/api-index-2.36.xml"><xi:fallback /></xi:include> - </index> - <index id="api-index-2-36-8" role="2.36.8"> - <title>Index of new symbols in 2.36.8</title> - <xi:include href="xml/api-index-2.36.8.xml"><xi:fallback /></xi:include> - </index> - <index id="api-index-2-38" role="2.38"> - <title>Index of new symbols in 2.38</title> - <xi:include href="xml/api-index-2.38.xml"><xi:fallback /></xi:include> - </index> - <index id="api-index-2-40" role="2.40"> - <title>Index of new symbols in 2.40</title> - <xi:include href="xml/api-index-2.40.xml"><xi:fallback /></xi:include> - </index> - - <!-- License --> - - <appendix id="license"> - <title>License</title> - - <para> - This library is free software; you can redistribute it and/or - modify it under the terms of the <citetitle>GNU Library General - Public License</citetitle> as published by the Free Software - Foundation; either version 2 of the License, or (at your option) - any later version. - </para> - - <para> - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - <citetitle>GNU Library General Public License</citetitle> for - more details. - </para> - - <para> - You may obtain a copy of the <citetitle>GNU Library General - Public License</citetitle> from the Free Software Foundation by - visiting <ulink type="http" url="http://www.fsf.org">their Web - site</ulink> or by writing to: - - <address> - Free Software Foundation, Inc. - <street>59 Temple Place</street> - Suite 330 - <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode> - <country>USA</country> - </address> - </para> - </appendix> - - <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include> - -</book> - diff --git a/docs/gdk-pixdata.toml.in b/docs/gdk-pixdata.toml.in new file mode 100644 index 000000000..47f37cb25 --- /dev/null +++ b/docs/gdk-pixdata.toml.in @@ -0,0 +1,41 @@ +# SPDX-FileCopyrightText: 2021 GNOME Foundation +# +# SPDX-License-Identifier: CC0-1.0 + +[library] +name = "gdk-pixdata" +version = "@VERSION@" +browse_url = "https://gitlab.gnome.org/GNOME/gdk-pixbuf/" +repository_url = "https://gitlab.gnome.org/GNOME/gdk-pixbuf.git" +website_url = "https://www.gtk.org" +authors = "GTK Development Team" +license = "GPL-2.1-or-later" +description = "Inline image data" +dependencies = [ "gobject", "gio", "gdk-pixbuf" ] +devhelp = true +search_index = true + + [dependencies.gobject] + name = "GObject" + description = "The base type system library" + docs_url = "https://developer.gnome.org/gobject/stable" + + [dependencies.gio] + name = "GIO" + description = "GObject Interfaces and Objects" + docs_url = "https://developer.gnome.org/gio/stable" + + [dependencies."gdk-pixbuf"] + name = "GdkPixbuf" + description = "Image loading library" + docs_url = "../gdk-pixbuf/index.html" + +[theme] +name = "basic" +show_index_summary = true + +[source-location] +base_url = "https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/blob/master/" + +[extra] +urlmap_file = "urlmap.js" diff --git a/docs/meson.build b/docs/meson.build index c7c8fe721..c9a16a49b 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -1,69 +1,68 @@ -version_xml = configuration_data() -version_xml.set('GDK_PIXBUF_VERSION', meson.project_version()) -configure_file(input: 'version.xml.in', - output: 'version.xml', - configuration: version_xml) +gidocgen_dep = dependency('gi-docgen', + version: '>= 2021.1', + fallback: ['gi-docgen', 'dummy_dep'], + required: get_option('gtk_doc'), +) -if gobject_dep.type_name() == 'pkgconfig' - glib_prefix = gobject_dep.get_pkgconfig_variable('prefix') -else - glib_prefix = get_option('prefix') -endif -glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html') -docpath = join_paths(gdk_pixbuf_datadir, 'gtk-doc', 'html') -private_headers = [ - 'pixops', - 'gdk-pixbuf.h', - 'gdk-pixbuf-alias.h', - 'gdk-pixbuf-autocleanups.h', - 'gdk-pixbuf-buffer-queue-private.h', - 'gdk-pixbuf-marshal.h', - 'gdk-pixbuf-private.h', - 'gdk-pixbuf-scaled-anim.h', - 'io-ani-animation.h', - 'io-gdip-animation.h', - 'io-gdip-native.h', - 'io-gdip-propertytags.h', - 'io-gdip-utils.h', - 'io-gif-animation.h', - 'xpm-color-table.h', - 'test-images.h', - 'lzw.h', +toml_conf = configuration_data() +toml_conf.set('VERSION', meson.project_version()) +pixbuf_toml = configure_file(input: 'gdk-pixbuf.toml.in', output: 'gdk-pixbuf.toml', configuration: toml_conf) +pixdata_toml = configure_file(input: 'gdk-pixdata.toml.in', output: 'gdk-pixdata.toml', configuration: toml_conf) + +gidocgen = find_program('gi-docgen', required: get_option('gtk_doc')) + +docs_dir = gdk_pixbuf_datadir / 'doc/gdk-pixbuf/reference' + +expand_content_md_files = [ + 'scaling-compositing.md', ] +build_docs = get_option('gtk_doc') if get_option('docs') - warning('The "docs" build option is deprecated; please use "gtk_doc=true"') + warning('The docs option is deprecated; use -Dgtk_doc=true') + build_docs = true endif -if get_option('gtk_doc') or get_option('docs') - gnome.gtkdoc('gdk-pixbuf', - main_xml: 'gdk-pixbuf.xml', - src_dir: [ gdk_pixbuf_inc ], - dependencies: gdkpixbuf_dep, - gobject_typesfile: 'gdk-pixbuf.types', - scan_args: [ - '--rebuild-types', - '--deprecated-guards="GDK_PIXBUF_ENABLE_BROKEN|GDK_PIXBUF_DISABLE_DEPRECATED"', - '--ignore-headers=' + ' '.join(private_headers), - ], - fixxref_args: [ - '--html-dir=@0@'.format(docpath), - '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')), - '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')), - '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')), - ], - html_assets: [ - 'composite.png', - ], - content_files: [ - 'gdk-pixbuf-from-drawables.xml', - 'gdk-pixbuf-rendering.xml', - 'gdk-pixbuf.xml', - 'gdk-pixbuf-csource.xml', - 'gdk-pixbuf-query-loaders.xml', - ], - install: true) +if build_docs + custom_target('gdk-pixbuf-doc', + input: [ pixbuf_toml, gdkpixbuf_gir[0] ], + output: 'gdk-pixbuf', + command: [ + gidocgen, + 'generate', + '--quiet', + '--add-include-path=@0@'.format(meson.current_build_dir() / '../gdk-pixbuf'), + '--config=@INPUT0@', + '--output-dir=@OUTPUT@', + '--no-namespace-dir', + '--content-dir=@0@'.format(meson.current_source_dir()), + '@INPUT1@', + ], + depend_files: [ expand_content_md_files ], + build_by_default: true, + install: true, + install_dir: docs_dir, + ) + + custom_target('gdk-pixdata-doc', + input: [ pixdata_toml, gdkpixdata_gir[0] ], + output: 'gdk-pixdata', + command: [ + gidocgen, + 'generate', + '--quiet', + '--add-include-path=@0@'.format(meson.current_build_dir() / '../gdk-pixbuf'), + '--config=@INPUT0@', + '--output-dir=@OUTPUT@', + '--no-namespace-dir', + '--content-dir=@0@'.format(meson.current_source_dir()), + '@INPUT1@', + ], + build_by_default: true, + install: true, + install_dir: docs_dir, + ) endif xsltproc = find_program('xsltproc', required: false) diff --git a/docs/scaling-compositing.md b/docs/scaling-compositing.md new file mode 100644 index 000000000..3abc75e73 --- /dev/null +++ b/docs/scaling-compositing.md @@ -0,0 +1,44 @@ +Title: Scaling and compositing + +---- + +The `GdkPixBuf` class contains methods to scale pixbufs, to scale +pixbufs and alpha blend against an existing image, and to scale +pixbufs and alpha blend against a solid color or checkerboard. +Alpha blending a checkerboard is a common way to show an image with +an alpha channel in image-viewing and editing software. + +Note that in these functions, the terms ‘alpha blending’ and ‘compositing’ +are used synonymously. + +Since the full-featured functions [method@GdkPixbuf.Pixbuf.scale], +[method@GdkPixbuf.Pixbuf.composite], and [`method@GdkPixbuf.Pixbuf.composite_color`] +are rather complex to use and have many arguments, two simple +convenience functions are provided, [`method@GdkPixbuf.Pixbuf.scale_simple`] +and [`method@GdkPixbuf.Pixbuf.composite_color_simple`] which create a new +pixbuf of a given size, scale an original image to fit, and then return it. + +If the destination pixbuf was created from a read only source, these +operations will force a copy into a mutable buffer. + +Scaling and alpha blending functions take advantage of MMX hardware +acceleration on systems where MMX is supported. If `GdkPixbuf` is built +with the Sun mediaLib library, these functions are instead accelerated +using mediaLib, which provides hardware acceleration on Intel, AMD, +and Sparc chipsets. If desired, mediaLib support can be turned off by +setting the `GDK_DISABLE_MEDIALIB` environment variable. + +The alpha blending function used is: + +``` +Cd = Cs·As + Cd(1-As) +``` + +where `Cd` is the destination pixel color, `Cs` is the source pixel color, +and `As` is the source pixel alpha. + +**NOTE**: It is recommended to use [Cairo][cairo] for scaling and +compositing, by using the contents of a `GdkPixbuf` pixel buffer as the +data for a Cairo image surface. + +[cairo]: https://www.cairographics.org diff --git a/docs/urlmap.js b/docs/urlmap.js new file mode 100644 index 000000000..caaee10f0 --- /dev/null +++ b/docs/urlmap.js @@ -0,0 +1,14 @@ +// SPDX-FileCopyrightText: 2021 GNOME Foundation +// SPDX-License-Identifier: LGPL-2.1-or-later + +// A map between namespaces and base URLs for their online documentation +baseURLs = [ + [ 'Gdk', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4/' ], + [ 'GdkWayland', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-wayland/' ], + [ 'GdkX11', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-x11/' ], + [ 'Gsk', 'https://gnome.pages.gitlab.gnome.org/gtk/gsk4/' ], + [ 'Gtk', 'https://gnome.pages.gitlab.gnome.org/gtk/gtk4/' ], + [ 'Pango', 'https://gnome.pages/gitlab.gnome.org/pango/pango/' ], + [ 'PangoCairo', 'https://gnome.pages.gitlab.gnome.org/pango/pangocairo/' ], + [ 'GdkPixbuf', 'https://gnome.pages.gitlab.gnome.org/gdk-pixbuf/' ], +] diff --git a/docs/version.xml.in b/docs/version.xml.in deleted file mode 100644 index 90ff08b2b..000000000 --- a/docs/version.xml.in +++ /dev/null @@ -1 +0,0 @@ -@GDK_PIXBUF_VERSION@ diff --git a/gdk-pixbuf/gdk-pixbuf-animation.c b/gdk-pixbuf/gdk-pixbuf-animation.c index c8f2695e3..6f2c170b8 100644 --- a/gdk-pixbuf/gdk-pixbuf-animation.c +++ b/gdk-pixbuf/gdk-pixbuf-animation.c @@ -30,21 +30,30 @@ #include <glib/gstdio.h> /** - * SECTION:animation - * @Short_description: Animated images. - * @Title: Animations - * @See_also: #GdkPixbufLoader. + * GdkPixbufAnimation: + * + * An opaque object representing an animation. * * The GdkPixBuf library provides a simple mechanism to load and * represent animations. An animation is conceptually a series of - * frames to be displayed over time. The animation may not be - * represented as a series of frames internally; for example, it may - * be stored as a sprite and instructions for moving the sprite around - * a background. To display an animation you don't need to understand - * its representation, however; you just ask GdkPixBuf what should + * frames to be displayed over time. + * + * The animation may not be represented as a series of frames + * internally; for example, it may be stored as a sprite and + * instructions for moving the sprite around a background. + * + * To display an animation you don't need to understand its + * representation, however; you just ask `GdkPixbuf` what should * be displayed at a given point in time. */ +/** + * GdkPixbufAnimationIter: + * + * An opaque object representing an iterator which points to a + * certain position in an animation. + */ + typedef struct _GdkPixbufNonAnim GdkPixbufNonAnim; typedef struct _GdkPixbufNonAnimClass GdkPixbufNonAnimClass; @@ -138,18 +147,19 @@ noop_updated_notify (GdkPixbuf *pixbuf, /** * gdk_pixbuf_animation_new_from_file: * @filename: (type filename): Name of file to load, in the GLib file - * name encoding + * name encoding * @error: return location for error * - * Creates a new animation by loading it from a file. The file format is - * detected automatically. If the file's format does not support multi-frame - * images, then an animation with a single frame will be created. Possible errors - * are in the #GDK_PIXBUF_ERROR and #G_FILE_ERROR domains. + * Creates a new animation by loading it from a file. * - * Return value: A newly-created animation with a reference count of 1, or %NULL - * if any of several error conditions ocurred: the file could not be opened, - * there was no loader for the file's format, there was not enough memory to - * allocate the image buffer, or the image file contained invalid data. + * The file format is detected automatically. + * + * If the file's format does not support multi-frame images, then an animation + * with a single frame will be created. + * + * Possible errors are in the `GDK_PIXBUF_ERROR` and `G_FILE_ERROR` domains. + * + * Return value: (transfer full) (nullable): A newly-created animation */ GdkPixbufAnimation * gdk_pixbuf_animation_new_from_file (const gchar *filename, @@ -320,7 +330,7 @@ fail_begin_load: * * Same as gdk_pixbuf_animation_new_from_file() * - * Return value: A newly-created animation with a reference count of 1, or %NULL + * Return value: A newly-created animation with a reference count of 1, or `NULL` * if any of several error conditions ocurred: the file could not be opened, * there was no loader for the file's format, there was not enough memory to * allocate the image buffer, or the image file contained invalid data. @@ -335,24 +345,24 @@ gdk_pixbuf_animation_new_from_file_utf8 (const gchar *filename, /** * gdk_pixbuf_animation_new_from_stream: - * @stream: a #GInputStream to load the pixbuf from - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore + * @stream: a `GInputStream` to load the pixbuf from + * @cancellable: (nullable): optional `GCancellable` object * @error: Return location for an error * * Creates a new animation by loading it from an input stream. * - * The file format is detected automatically. If %NULL is returned, then - * @error will be set. The @cancellable can be used to abort the operation - * from another thread. If the operation was cancelled, the error - * %G_IO_ERROR_CANCELLED will be returned. Other possible errors are in - * the #GDK_PIXBUF_ERROR and %G_IO_ERROR domains. + * The file format is detected automatically. + * + * If `NULL` is returned, then @error will be set. + * + * The @cancellable can be used to abort the operation from another thread. + * If the operation was cancelled, the error `G_IO_ERROR_CANCELLED` will be + * returned. Other possible errors are in the `GDK_PIXBUF_ERROR` and + * `G_IO_ERROR` domains. * * The stream is not closed. * - * Return value: A newly-created pixbuf, or %NULL if any of several error - * conditions occurred: the file could not be opened, the image format is - * not supported, there was not enough memory to allocate the image buffer, - * the stream contained invalid data, or the operation was cancelled. + * Return value: (transfer full) (nullable): A newly-created animation * * Since: 2.28 */ @@ -433,8 +443,8 @@ animation_new_from_stream_thread (GTask *task, /** * gdk_pixbuf_animation_new_from_stream_async: * @stream: a #GInputStream from which to load the animation - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore - * @callback: a #GAsyncReadyCallback to call when the pixbuf is loaded + * @cancellable: (nullable): optional #GCancellable object + * @callback: a `GAsyncReadyCallback` to call when the pixbuf is loaded * @user_data: the data to pass to the callback function * * Creates a new animation by asynchronously loading an image from an input stream. @@ -442,7 +452,7 @@ animation_new_from_stream_thread (GTask *task, * For more details see gdk_pixbuf_new_from_stream(), which is the synchronous * version of this function. * - * When the operation is finished, @callback will be called in the main thread. + * When the operation is finished, `callback` will be called in the main thread. * You can then call gdk_pixbuf_animation_new_from_stream_finish() to get the * result of the operation. * @@ -469,13 +479,12 @@ gdk_pixbuf_animation_new_from_stream_async (GInputStream *stream, /** * gdk_pixbuf_animation_new_from_stream_finish: * @async_result: a #GAsyncResult - * @error: a #GError, or %NULL + * @error: a #GError, or `NULL` * * Finishes an asynchronous pixbuf animation creation operation started with - * gdk_pixbuf_animation_new_from_stream_async(). + * [func@GdkPixbuf.PixbufAnimation.new_from_stream_async]. * - * Return value: a #GdkPixbufAnimation or %NULL on error. Free the returned - * object with g_object_unref(). + * Return value: (transfer full) (nullable): the newly created animation * * Since: 2.28 **/ @@ -499,13 +508,10 @@ gdk_pixbuf_animation_new_from_stream_finish (GAsyncResult *async_result, * * Creates a new pixbuf animation by loading an image from an resource. * - * The file format is detected automatically. If %NULL is returned, then + * The file format is detected automatically. If `NULL` is returned, then * @error will be set. * - * Return value: A newly-created animation, or %NULL if any of several error - * conditions occurred: the file could not be opened, the image format is - * not supported, there was not enough memory to allocate the image buffer, - * the stream contained invalid data, or the operation was cancelled. + * Return value: (transfer full) (nullable): A newly-created animation * * Since: 2.28 */ @@ -567,12 +573,14 @@ gdk_pixbuf_animation_unref (GdkPixbufAnimation *animation) * gdk_pixbuf_animation_is_static_image: * @animation: a #GdkPixbufAnimation * + * Checks whether the animation is a static image. + * * If you load a file with gdk_pixbuf_animation_new_from_file() and it * turns out to be a plain, unanimated image, then this function will - * return %TRUE. Use gdk_pixbuf_animation_get_static_image() to retrieve + * return `TRUE`. Use gdk_pixbuf_animation_get_static_image() to retrieve * the image. * - * Return value: %TRUE if the "animation" was really just an image + * Return value: `TRUE` if the "animation" was really just an image */ gboolean gdk_pixbuf_animation_is_static_image (GdkPixbufAnimation *animation) @@ -586,12 +594,17 @@ gdk_pixbuf_animation_is_static_image (GdkPixbufAnimation *animation) * gdk_pixbuf_animation_get_static_image: * @animation: a #GdkPixbufAnimation * + * Retrieves a static image for the animation. + * * If an animation is really just a plain image (has only one frame), - * this function returns that image. If the animation is an animation, - * this function returns a reasonable thing to display as a static - * unanimated image, which might be the first frame, or something more - * sophisticated. If an animation hasn't loaded any frames yet, this - * function will return %NULL. + * this function returns that image. + * + * If the animation is an animation, this function returns a reasonable + * image to use as a static unanimated image, which might be the first + * frame, or something more sophisticated depending on the file format. + * + * If an animation hasn't loaded any frames yet, this function will + * return `NULL`. * * Return value: (transfer none): unanimated image representing the animation */ @@ -653,9 +666,10 @@ gdk_pixbuf_animation_get_height (GdkPixbufAnimation *animation) * @animation: a #GdkPixbufAnimation * @start_time: (allow-none): time when the animation starts playing * - * Get an iterator for displaying an animation. The iterator provides - * the frames that should be displayed at a given time. It should be - * freed after use with g_object_unref(). + * Get an iterator for displaying an animation. + * + * The iterator provides the frames that should be displayed at a + * given time. * * @start_time would normally come from g_get_current_time(), and marks * the beginning of animation playback. After creating an iterator, you @@ -667,7 +681,7 @@ gdk_pixbuf_animation_get_height (GdkPixbufAnimation *animation) * the image is updated, you should reinstall the timeout with the new, * possibly-changed delay time. * - * As a shortcut, if @start_time is %NULL, the result of + * As a shortcut, if @start_time is `NULL`, the result of * g_get_current_time() will be used automatically. * * To update the image (i.e. possibly change the result of @@ -678,14 +692,14 @@ gdk_pixbuf_animation_get_height (GdkPixbufAnimation *animation) * after the delay time, you should also update it whenever you * receive the area_updated signal and * gdk_pixbuf_animation_iter_on_currently_loading_frame() returns - * %TRUE. In this case, the frame currently being fed into the loader + * `TRUE`. In this case, the frame currently being fed into the loader * has received new data, so needs to be refreshed. The delay time for * a frame may also be modified after an area_updated signal, for * example if the delay time for a frame is encoded in the data after * the frame itself. So your timeout should be reinstalled after any * area_updated signal. * - * A delay time of -1 is possible, indicating "infinite." + * A delay time of -1 is possible, indicating "infinite". * * Return value: (transfer full): an iterator to move over the animation */ @@ -723,9 +737,10 @@ gdk_pixbuf_animation_iter_init (GdkPixbufAnimationIter *iter) * @iter: an animation iterator * * Gets the number of milliseconds the current pixbuf should be displayed, - * or -1 if the current pixbuf should be displayed forever. g_timeout_add() - * conveniently takes a timeout in milliseconds, so you can use a timeout - * to schedule the next update. + * or -1 if the current pixbuf should be displayed forever. + * + * The `g_timeout_add()` function conveniently takes a timeout in milliseconds, + * so you can use a timeout to schedule the next update. * * Note that some formats, like GIF, might clamp the timeout values in the * image file to avoid updates that are just too quick. The minimum timeout @@ -746,17 +761,21 @@ gdk_pixbuf_animation_iter_get_delay_time (GdkPixbufAnimationIter *iter) * gdk_pixbuf_animation_iter_get_pixbuf: * @iter: an animation iterator * - * Gets the current pixbuf which should be displayed; the pixbuf might not - * be the same size as the animation itself + * Gets the current pixbuf which should be displayed. + * + * The pixbuf might not be the same size as the animation itself * (gdk_pixbuf_animation_get_width(), gdk_pixbuf_animation_get_height()). - * This pixbuf should be displayed for - * gdk_pixbuf_animation_iter_get_delay_time() milliseconds. The caller - * of this function does not own a reference to the returned pixbuf; - * the returned pixbuf will become invalid when the iterator advances - * to the next frame, which may happen anytime you call - * gdk_pixbuf_animation_iter_advance(). Copy the pixbuf to keep it - * (don't just add a reference), as it may get recycled as you advance - * the iterator. + * + * This pixbuf should be displayed for gdk_pixbuf_animation_iter_get_delay_time() + * milliseconds. + * + * The caller of this function does not own a reference to the returned + * pixbuf; the returned pixbuf will become invalid when the iterator + * advances to the next frame, which may happen anytime you call + * gdk_pixbuf_animation_iter_advance(). + * + * Copy the pixbuf to keep it (don't just add a reference), as it may get + * recycled as you advance the iterator. * * Return value: (transfer none): the pixbuf to be displayed */ @@ -774,12 +793,13 @@ gdk_pixbuf_animation_iter_get_pixbuf (GdkPixbufAnimationIter *iter) * @iter: a #GdkPixbufAnimationIter * * Used to determine how to respond to the area_updated signal on - * #GdkPixbufLoader when loading an animation. area_updated is emitted - * for an area of the frame currently streaming in to the loader. So if - * you're on the currently loading frame, you need to redraw the screen for - * the updated area. + * #GdkPixbufLoader when loading an animation. + * + * The `::area_updated` signal is emitted for an area of the frame currently + * streaming in to the loader. So if you're on the currently loading frame, + * you will need to redraw the screen for the updated area. * - * Return value: %TRUE if the frame we're on is partially loaded, or the last frame + * Return value: `TRUE` if the frame we're on is partially loaded, or the last frame */ gboolean gdk_pixbuf_animation_iter_on_currently_loading_frame (GdkPixbufAnimationIter *iter) @@ -795,8 +815,10 @@ gdk_pixbuf_animation_iter_on_currently_loading_frame (GdkPixbufAnimationIter *it * @iter: a #GdkPixbufAnimationIter * @current_time: (allow-none): current time * - * Possibly advances an animation to a new frame. Chooses the frame based - * on the start time passed to gdk_pixbuf_animation_get_iter(). + * Possibly advances an animation to a new frame. + * + * Chooses the frame based on the start time passed to + * gdk_pixbuf_animation_get_iter(). * * @current_time would normally come from g_get_current_time(), and * must be greater than or equal to the time passed to @@ -805,17 +827,17 @@ gdk_pixbuf_animation_iter_on_currently_loading_frame (GdkPixbufAnimationIter *it * called. That is, you can't go backward in time; animations only * play forward. * - * As a shortcut, pass %NULL for the current time and g_get_current_time() + * As a shortcut, pass `NULL` for the current time and g_get_current_time() * will be invoked on your behalf. So you only need to explicitly pass * @current_time if you're doing something odd like playing the animation * at double speed. * - * If this function returns %FALSE, there's no need to update the animation + * If this function returns `FALSE`, there's no need to update the animation * display, assuming the display had been rendered prior to advancing; - * if %TRUE, you need to call gdk_pixbuf_animation_iter_get_pixbuf() + * if `TRUE`, you need to call gdk_pixbuf_animation_iter_get_pixbuf() * and update the display with the new pixbuf. * - * Returns: %TRUE if the image may need updating + * Returns: `TRUE` if the image may need updating */ gboolean gdk_pixbuf_animation_iter_advance (GdkPixbufAnimationIter *iter, diff --git a/gdk-pixbuf/gdk-pixbuf-animation.h b/gdk-pixbuf/gdk-pixbuf-animation.h index ad0c39c3b..cae551edd 100644 --- a/gdk-pixbuf/gdk-pixbuf-animation.h +++ b/gdk-pixbuf/gdk-pixbuf-animation.h @@ -36,20 +36,9 @@ G_BEGIN_DECLS /* Animation support */ -/** - * GdkPixbufAnimation: - * - * An opaque struct representing an animation. - */ typedef struct _GdkPixbufAnimation GdkPixbufAnimation; -/** - * GdkPixbufAnimationIter: - * - * An opaque struct representing an iterator which points to a - * certain position in an animation. - */ typedef struct _GdkPixbufAnimationIter GdkPixbufAnimationIter; #define GDK_TYPE_PIXBUF_ANIMATION (gdk_pixbuf_animation_get_type ()) diff --git a/gdk-pixbuf/gdk-pixbuf-core.h b/gdk-pixbuf/gdk-pixbuf-core.h index 9e6ba6fab..4b8c9b9b2 100644 --- a/gdk-pixbuf/gdk-pixbuf-core.h +++ b/gdk-pixbuf/gdk-pixbuf-core.h @@ -44,17 +44,23 @@ G_BEGIN_DECLS * considered fully opaque. * @GDK_PIXBUF_ALPHA_FULL: For now falls back to #GDK_PIXBUF_ALPHA_BILEVEL. * In the future it will do full alpha compositing. - * - * These values can be passed to - * gdk_pixbuf_xlib_render_to_drawable_alpha() to control how the alpha - * channel of an image should be handled. This function can create a - * bilevel clipping mask (black and white) and use it while painting - * the image. In the future, when the X Window System gets an alpha - * channel extension, it will be possible to do full alpha - * compositing onto arbitrary drawables. For now both cases fall - * back to a bilevel clipping mask. * - * Deprecated: it is unused since 2.42. + * Control the alpha channel for drawables. + * + * These values can be passed to gdk_pixbuf_xlib_render_to_drawable_alpha() + * in gdk-pixbuf-xlib to control how the alpha channel of an image should + * be handled. + * + * This function can create a bilevel clipping mask (black and white) and use + * it while painting the image. + * + * In the future, when the X Window System gets an alpha channel extension, + * it will be possible to do full alpha compositing onto arbitrary drawables. + * For now both cases fall back to a bilevel clipping mask. + * + * Deprecated: 2.42: There is no user of GdkPixbufAlphaMode in GdkPixbuf, + * and the Xlib utility functions have been split out to their own + * library, gdk-pixbuf-xlib */ typedef enum { @@ -67,7 +73,9 @@ typedef enum * @GDK_COLORSPACE_RGB: Indicates a red/green/blue additive color space. * * This enumeration defines the color spaces that are supported by - * the gdk-pixbuf library. Currently only RGB is supported. + * the gdk-pixbuf library. + * + * Currently only RGB is supported. */ /* Note that these values are encoded in inline pixbufs * as ints, so don't reorder them @@ -78,15 +86,6 @@ typedef enum { /* All of these are opaque structures */ -/** - * GdkPixbuf: - * - * This is the main structure in the gdk-pixbuf library. It is - * used to represent images. It contains information about the - * image's pixel data, its color space, bits per sample, width and - * height, and the rowstride (the number of bytes between the start of - * one row and the start of the next). - */ typedef struct _GdkPixbuf GdkPixbuf; #define GDK_TYPE_PIXBUF (gdk_pixbuf_get_type ()) @@ -101,20 +100,23 @@ typedef struct _GdkPixbuf GdkPixbuf; * @data: (closure): User closure data. * * A function of this type is responsible for freeing the pixel array - * of a pixbuf. The gdk_pixbuf_new_from_data() function lets you - * pass in a pre-allocated pixel array so that a pixbuf can be - * created from it; in this case you will need to pass in a function - * of #GdkPixbufDestroyNotify so that the pixel data can be freed - * when the pixbuf is finalized. + * of a pixbuf. + * + * The gdk_pixbuf_new_from_data() function lets you pass in a pre-allocated + * pixel array so that a pixbuf can be created from it; in this case you + * will need to pass in a function of type `GdkPixbufDestroyNotify` so that + * the pixel data can be freed when the pixbuf is finalized. */ typedef void (* GdkPixbufDestroyNotify) (guchar *pixels, gpointer data); /** * GDK_PIXBUF_ERROR: * - * Error domain used for pixbuf operations. Indicates that the error code - * will be in the #GdkPixbufError enumeration. See #GError for - * information on error domains and error codes. + * Error domain used for pixbuf operations. + * + * Indicates that the error code will be in the `GdkPixbufError` enumeration. + * + * See the `GError` for information on error domains and error codes. */ #define GDK_PIXBUF_ERROR gdk_pixbuf_error_quark () @@ -129,9 +131,10 @@ typedef void (* GdkPixbufDestroyNotify) (guchar *pixels, gpointer data); * @GDK_PIXBUF_ERROR_FAILED: Generic failure code, something went wrong. * @GDK_PIXBUF_ERROR_INCOMPLETE_ANIMATION: Only part of the animation was loaded. * - * An error code in the #GDK_PIXBUF_ERROR domain. Many gdk-pixbuf - * operations can cause errors in this domain, or in the #G_FILE_ERROR - * domain. + * An error code in the `GDK_PIXBUF_ERROR` domain. + * + * Many gdk-pixbuf operations can cause errors in this domain, or in + * the `G_FILE_ERROR` domain. */ typedef enum { /* image data hosed */ @@ -347,15 +350,18 @@ gboolean gdk_pixbuf_savev_utf8 (GdkPixbuf *pixbuf, * @error: (out): A location to return an error. * @data: (closure): user data passed to gdk_pixbuf_save_to_callback(). * - * Specifies the type of the function passed to - * gdk_pixbuf_save_to_callback(). It is called once for each block of - * bytes that is "written" by gdk_pixbuf_save_to_callback(). If - * successful it should return %TRUE. If an error occurs it should set - * @error and return %FALSE, in which case gdk_pixbuf_save_to_callback() + * Save functions used by [method@GdkPixbuf.Pixbuf.save_to_callback]. + * + * This function is called once for each block of bytes that is "written" + * by `gdk_pixbuf_save_to_callback()`. + * + * If successful it should return `TRUE`; if an error occurs it should set + * `error` and return `FALSE`, in which case `gdk_pixbuf_save_to_callback()` * will fail with the same error. + * + * Returns: `TRUE` if successful, `FALSE` otherwise * * Since: 2.4 - * Returns: %TRUE if successful, %FALSE (with @error set) if failed. */ typedef gboolean (*GdkPixbufSaveFunc) (const gchar *buf, diff --git a/gdk-pixbuf/gdk-pixbuf-data.c b/gdk-pixbuf/gdk-pixbuf-data.c index cd968d4ae..958bcb73f 100644 --- a/gdk-pixbuf/gdk-pixbuf-data.c +++ b/gdk-pixbuf/gdk-pixbuf-data.c @@ -39,23 +39,30 @@ * drops to zero, or %NULL if the data should not be freed * @destroy_fn_data: (closure): Closure data to pass to the destroy notification function * - * Creates a new #GdkPixbuf out of in-memory image data. Currently only RGB - * images with 8 bits per sample are supported. + * Creates a new #GdkPixbuf out of in-memory image data. + * + * Currently only RGB images with 8 bits per sample are supported. * * Since you are providing a pre-allocated pixel buffer, you must also * specify a way to free that data. This is done with a function of - * type #GdkPixbufDestroyNotify. When a pixbuf created with is + * type `GdkPixbufDestroyNotify`. When a pixbuf created with is * finalized, your destroy notification function will be called, and * it is its responsibility to free the pixel array. * - * See also gdk_pixbuf_new_from_bytes(). + * See also: [ctor@GdkPixbuf.Pixbuf.new_from_bytes] * - * Return value: (transfer full): A newly-created #GdkPixbuf structure with a reference count of 1. + * Return value: (transfer full): A newly-created pixbuf **/ GdkPixbuf * -gdk_pixbuf_new_from_data (const guchar *data, GdkColorspace colorspace, gboolean has_alpha, - int bits_per_sample, int width, int height, int rowstride, - GdkPixbufDestroyNotify destroy_fn, gpointer destroy_fn_data) +gdk_pixbuf_new_from_data (const guchar *data, + GdkColorspace colorspace, + gboolean has_alpha, + int bits_per_sample, + int width, + int height, + int rowstride, + GdkPixbufDestroyNotify destroy_fn, + gpointer destroy_fn_data) { GdkPixbuf *pixbuf; @@ -95,15 +102,24 @@ gdk_pixbuf_new_from_data (const guchar *data, GdkColorspace colorspace, gboolean * @rowstride: Distance in bytes between row starts * * Creates a new #GdkPixbuf out of in-memory readonly image data. + * * Currently only RGB images with 8 bits per sample are supported. - * This is the #GBytes variant of gdk_pixbuf_new_from_data(). * - * Return value: (transfer full): A newly-created #GdkPixbuf structure with a reference count of 1. + * This is the `GBytes` variant of gdk_pixbuf_new_from_data(), useful + * for language bindings. + * + * Return value: (transfer full): A newly-created pixbuf + * * Since: 2.32 **/ GdkPixbuf * -gdk_pixbuf_new_from_bytes (GBytes *data, GdkColorspace colorspace, gboolean has_alpha, - int bits_per_sample, int width, int height, int rowstride) +gdk_pixbuf_new_from_bytes (GBytes *data, + GdkColorspace colorspace, + gboolean has_alpha, + int bits_per_sample, + int width, + int height, + int rowstride) { g_return_val_if_fail (data != NULL, NULL); g_return_val_if_fail (colorspace == GDK_COLORSPACE_RGB, NULL); @@ -112,14 +128,14 @@ gdk_pixbuf_new_from_bytes (GBytes *data, GdkColorspace colorspace, gboolean has_ g_return_val_if_fail (height > 0, NULL); g_return_val_if_fail (g_bytes_get_size (data) >= width * height * (has_alpha ? 4 : 3), NULL); - return (GdkPixbuf*) g_object_new (GDK_TYPE_PIXBUF, - "pixel-bytes", data, - "colorspace", colorspace, - "n-channels", has_alpha ? 4 : 3, - "bits-per-sample", bits_per_sample, - "has-alpha", has_alpha ? TRUE : FALSE, - "width", width, - "height", height, - "rowstride", rowstride, - NULL); + return g_object_new (GDK_TYPE_PIXBUF, + "pixel-bytes", data, + "colorspace", colorspace, + "n-channels", has_alpha ? 4 : 3, + "bits-per-sample", bits_per_sample, + "has-alpha", has_alpha ? TRUE : FALSE, + "width", width, + "height", height, + "rowstride", rowstride, + NULL); } diff --git a/gdk-pixbuf/gdk-pixbuf-features.h.in b/gdk-pixbuf/gdk-pixbuf-features.h.in index 4fdb6bffa..600d03220 100644 --- a/gdk-pixbuf/gdk-pixbuf-features.h.in +++ b/gdk-pixbuf/gdk-pixbuf-features.h.in @@ -1,22 +1,13 @@ +#ifndef __GDK_PIXBUF_FEATURES_H__ +#define __GDK_PIXBUF_FEATURES_H__ + #if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION) #error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly." #endif -#ifndef GDK_PIXBUF_FEATURES_H -#define GDK_PIXBUF_FEATURES_H 1 - #include <glib.h> /** - * SECTION:initialization_versions - * @Short_description: Library version numbers. - * @Title: Initialization and Versions - * - * These macros and variables let you check the version of gdk-pixbuf - * you're linking against. - */ - -/** * GDK_PIXBUF_MAJOR: * * Major version of gdk-pixbuf library, that is the "0" in @@ -37,9 +28,10 @@ /** * GDK_PIXBUF_VERSION: * - * Contains the full version of the gdk-pixbuf header as a string. + * Contains the full version of GdkPixbuf as a string. + * * This is the version being compiled against; contrast with - * #gdk_pixbuf_version. + * `gdk_pixbuf_version`. */ #define GDK_PIXBUF_MAJOR (@GDK_PIXBUF_MAJOR@) @@ -81,7 +73,7 @@ * * This variable is in the library, so represents the * gdk-pixbuf library you have linked against. Contrast with the - * #GDK_PIXBUF_MAJOR macro, which represents the major version of the + * `GDK_PIXBUF_MAJOR` macro, which represents the major version of the * gdk-pixbuf headers you have included. */ /** @@ -93,7 +85,7 @@ * * This variable is in the library, so represents the * gdk-pixbuf library you have linked against. Contrast with the - * #GDK_PIXBUF_MINOR macro, which represents the minor version of the + * `GDK_PIXBUF_MINOR` macro, which represents the minor version of the * gdk-pixbuf headers you have included. */ /** @@ -105,7 +97,7 @@ * * This variable is in the library, so represents the * gdk-pixbuf library you have linked against. Contrast with the - * #GDK_PIXBUF_MICRO macro, which represents the micro version of the + * `GDK_PIXBUF_MICRO` macro, which represents the micro version of the * gdk-pixbuf headers you have included. */ /** @@ -120,4 +112,4 @@ GDK_PIXBUF_VAR const guint gdk_pixbuf_minor_version; GDK_PIXBUF_VAR const guint gdk_pixbuf_micro_version; GDK_PIXBUF_VAR const char *gdk_pixbuf_version; -#endif /* GDK_PIXBUF_FEATURES_H */ +#endif /* __GDK_PIXBUF_FEATURES_H__ */ diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index 2dc2ea6da..eb442e3bc 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -48,80 +48,69 @@ #endif /** - * SECTION:file-loading - * @Short_description: Loading a pixbuf from a file. - * @Title: File Loading - * @See_also: #GdkPixbufLoader. + * GdkPixbufModule: + * @module_name: the name of the module, usually the same as the + * usual file extension for images of this type, eg. "xpm", "jpeg" or "png". + * @module_path: the path from which the module is loaded. + * @module: the loaded `GModule`. + * @info: a `GdkPixbufFormat` holding information about the module. + * @load: loads an image from a file. + * @load_xpm_data: loads an image from data in memory. + * @begin_load: begins an incremental load. + * @stop_load: stops an incremental load. + * @load_increment: continues an incremental load. + * @load_animation: loads an animation from a file. + * @save: saves a `GdkPixbuf` to a file. + * @save_to_callback: saves a `GdkPixbuf` by calling the given `GdkPixbufSaveFunc`. + * @is_save_option_supported: returns whether a save option key is supported by the module * - * The GdkPixBuf library provides a simple mechanism for loading - * an image from a file in synchronous fashion. This means that the - * library takes control of the application while the file is being - * loaded; from the user's point of view, the application will block - * until the image is done loading. + * A `GdkPixbufModule` contains the necessary functions to load and save + * images in a certain file format. * + * If `GdkPixbuf` has been compiled with `GModule` support, it can be extended + * by modules which can load (and perhaps also save) new image and animation + * formats. + * + * ## Implementing modules * - * This interface can be used by applications in which blocking is - * acceptable while an image is being loaded. It can also be used to - * load small images in general. Applications that need progressive - * loading can use the #GdkPixbufLoader functionality instead. - */ - -/** - * SECTION:file-saving - * @Short_description: Saving a pixbuf to a file. - * @Title: File saving - * - * These functions allow to save a #GdkPixbuf in a number of - * file formats. The formatted data can be written to a file - * or to a memory buffer. GdkPixBuf can also call a user-defined - * callback on the data, which allows to e.g. write the image - * to a socket or store it in a database. - */ - -/** - * SECTION:module_interface - * @Short_description: Extending GdkPixBuf - * @Title: Module Interface - * - * If GdkPixBuf has been compiled with GModule support, it can be extended by - * modules which can load (and perhaps also save) new image and animation - * formats. Each loadable module must export a - * #GdkPixbufModuleFillInfoFunc function named `fill_info` and - * a #GdkPixbufModuleFillVtableFunc function named - * `fill_vtable`. + * The `GdkPixbuf` interfaces needed for implementing modules are contained in + * `gdk-pixbuf-io.h` (and `gdk-pixbuf-animation.h` if the module supports + * animations). They are not covered by the same stability guarantees as the + * regular GdkPixbuf API. To underline this fact, they are protected by the + * `GDK_PIXBUF_ENABLE_BACKEND` pre-processor symbol. + * + * Each loadable module must contain a `GdkPixbufModuleFillVtableFunc` function + * named `fill_vtable`, which will get called when the module + * is loaded and must set the function pointers of the `GdkPixbufModule`. * * In order to make format-checking work before actually loading the modules - * (which may require dlopening image libraries), modules export their - * signatures (and other information) via the `fill_info` function. An - * external utility, gdk-pixbuf-query-loaders, uses this to create a text + * (which may require calling `dlopen` to load image libraries), modules export + * their signatures (and other information) via the `fill_info` function. An + * external utility, `gdk-pixbuf-query-loaders`, uses this to create a text * file containing a list of all available loaders and their signatures. - * This file is then read at runtime by GdkPixBuf to obtain the list of + * This file is then read at runtime by `GdkPixbuf` to obtain the list of * available loaders and their signatures. * * Modules may only implement a subset of the functionality available via - * #GdkPixbufModule. If a particular functionality is not implemented, the + * `GdkPixbufModule`. If a particular functionality is not implemented, the * `fill_vtable` function will simply not set the corresponding - * function pointers of the #GdkPixbufModule structure. If a module supports - * incremental loading (i.e. provides #begin_load, #stop_load and - * #load_increment), it doesn't have to implement #load, since GdkPixBuf can - * supply a generic #load implementation wrapping the incremental loading. + * function pointers of the `GdkPixbufModule` structure. If a module supports + * incremental loading (i.e. provides `begin_load`, `stop_load` and + * `load_increment`), it doesn't have to implement `load`, since `GdkPixbuf` + * can supply a generic `load` implementation wrapping the incremental loading. + * + * ## Installing modules * * Installing a module is a two-step process: - * - copy the module file(s) to the loader directory (normally - * `$libdir/gdk-pixbuf-2.0/$version/loaders`, unless overridden by the - * environment variable `GDK_PIXBUF_MODULEDIR`) - * - call gdk-pixbuf-query-loaders to update the module file (normally - * `$libdir/gdk-pixbuf-2.0/$version/loaders.cache`, unless overridden by the - * environment variable `GDK_PIXBUF_MODULE_FILE`) - * - * The GdkPixBuf interfaces needed for implementing modules are contained in - * `gdk-pixbuf-io.h` (and `gdk-pixbuf-animation.h` if the module supports - * animations). They are not covered by the same stability guarantees as the - * regular GdkPixBuf API. To underline this fact, they are protected by - * `#ifdef GDK_PIXBUF_ENABLE_BACKEND`. + * + * - copy the module file(s) to the loader directory (normally + * `$libdir/gdk-pixbuf-2.0/$version/loaders`, unless overridden by the + * environment variable `GDK_PIXBUF_MODULEDIR`) + * - call `gdk-pixbuf-query-loaders` to update the module file (normally + * `$libdir/gdk-pixbuf-2.0/$version/loaders.cache`, unless overridden + * by the environment variable `GDK_PIXBUF_MODULE_FILE`) */ - static gint format_check (GdkPixbufModule *module, guchar *buffer, int size) { @@ -568,10 +557,10 @@ gdk_pixbuf_io_init_modules (const char *filename, /** * gdk_pixbuf_init_modules: - * @path: Path to directory where the loaders.cache is installed - * @error: return location for a #GError + * @path: Path to directory where the `loaders.cache` is installed + * @error: return location for a `GError` * - * Initalizes the gdk-pixbuf loader modules referenced by the loaders.cache + * Initalizes the gdk-pixbuf loader modules referenced by the `loaders.cache` * file present inside that directory. * * This is to be used by applications that want to ship certain loaders @@ -1091,20 +1080,26 @@ _gdk_pixbuf_generic_image_load (GdkPixbufModule *module, FILE *f, GError **error } /** - * gdk_pixbuf_new_from_file: + * gdk_pixbuf_new_from_file: (constructor) * @filename: (type filename): Name of file to load, in the GLib file - * name encoding - * @error: Return location for an error + * name encoding + * @error: (out): Return location for an error * - * Creates a new pixbuf by loading an image from a file. The file format is - * detected automatically. If %NULL is returned, then @error will be set. - * Possible errors are in the #GDK_PIXBUF_ERROR and #G_FILE_ERROR domains. + * Creates a new pixbuf by loading an image from a file. * - * Return value: A newly-created pixbuf with a reference count of 1, or %NULL if - * any of several error conditions occurred: the file could not be opened, - * there was no loader for the file's format, there was not enough memory to - * allocate the image buffer, or the image file contained invalid data. - **/ + * The file format is detected automatically. + * + * If `NULL` is returned, then @error will be set. Possible errors are: + * + * - the file could not be opened + * - there is no loader for the file's format + * - there is not enough memory to allocate the image buffer + * - the image buffer contains invalid data + * + * The error domains are `GDK_PIXBUF_ERROR` and `G_FILE_ERROR`. + * + * Return value: (transfer full) (nullable): A newly-created pixbuf + */ GdkPixbuf * gdk_pixbuf_new_from_file (const char *filename, GError **error) @@ -1190,7 +1185,7 @@ gdk_pixbuf_new_from_file (const char *filename, * * Same as gdk_pixbuf_new_from_file() * - * Return value: A newly-created pixbuf with a reference count of 1, or %NULL if + * Return value: A newly-created pixbuf with a reference count of 1, or `NULL` if * any of several error conditions occurred: the file could not be opened, * there was no loader for the file's format, there was not enough memory to * allocate the image buffer, or the image file contained invalid data. @@ -1206,29 +1201,33 @@ gdk_pixbuf_new_from_file_utf8 (const char *filename, /** - * gdk_pixbuf_new_from_file_at_size: + * gdk_pixbuf_new_from_file_at_size: (constructor) * @filename: (type filename): Name of file to load, in the GLib file * name encoding * @width: The width the image should have or -1 to not constrain the width * @height: The height the image should have or -1 to not constrain the height - * @error: Return location for an error + * @error: (out): Return location for an error + * + * Creates a new pixbuf by loading an image from a file. + * + * The file format is detected automatically. * - * Creates a new pixbuf by loading an image from a file. - * The file format is detected automatically. If %NULL is returned, then - * @error will be set. Possible errors are in the #GDK_PIXBUF_ERROR and - * #G_FILE_ERROR domains. + * If `NULL` is returned, then @error will be set. Possible errors are: + * + * - the file could not be opened + * - there is no loader for the file's format + * - there is not enough memory to allocate the image buffer + * - the image buffer contains invalid data + * + * The error domains are `GDK_PIXBUF_ERROR` and `G_FILE_ERROR`. * * The image will be scaled to fit in the requested size, preserving * the image's aspect ratio. Note that the returned pixbuf may be smaller - * than @width x @height, if the aspect ratio requires it. To load + * than `width` x `height`, if the aspect ratio requires it. To load * and image at the requested size, regardless of aspect ratio, use - * gdk_pixbuf_new_from_file_at_scale(). + * [ctor@GdkPixbuf.Pixbuf.new_from_file_at_scale]. * - * Return value: A newly-created pixbuf with a reference count of 1, or - * %NULL if any of several error conditions occurred: the file could not - * be opened, there was no loader for the file's format, there was not - * enough memory to allocate the image buffer, or the image file contained - * invalid data. + * Return value: (transfer full) (nullable): A newly-created pixbuf * * Since: 2.4 **/ @@ -1255,7 +1254,7 @@ gdk_pixbuf_new_from_file_at_size (const char *filename, * Same as gdk_pixbuf_new_from_file_at_size() * * Return value: A newly-created pixbuf with a reference count of 1, or - * %NULL if any of several error conditions occurred: the file could not + * `NULL` if any of several error conditions occurred: the file could not * be opened, there was no loader for the file's format, there was not * enough memory to allocate the image buffer, or the image file contained * invalid data. @@ -1329,31 +1328,38 @@ at_scale_size_prepared_cb (GdkPixbufLoader *loader, } /** - * gdk_pixbuf_new_from_file_at_scale: + * gdk_pixbuf_new_from_file_at_scale: (constructor) * @filename: (type filename): Name of file to load, in the GLib file * name encoding * @width: The width the image should have or -1 to not constrain the width * @height: The height the image should have or -1 to not constrain the height - * @preserve_aspect_ratio: %TRUE to preserve the image's aspect ratio + * @preserve_aspect_ratio: `TRUE` to preserve the image's aspect ratio * @error: Return location for an error * - * Creates a new pixbuf by loading an image from a file. The file format is - * detected automatically. If %NULL is returned, then @error will be set. - * Possible errors are in the #GDK_PIXBUF_ERROR and #G_FILE_ERROR domains. + * Creates a new pixbuf by loading an image from a file. + * + * The file format is detected automatically. + * + * If `NULL` is returned, then @error will be set. Possible errors are: + * + * - the file could not be opened + * - there is no loader for the file's format + * - there is not enough memory to allocate the image buffer + * - the image buffer contains invalid data + * + * The error domains are `GDK_PIXBUF_ERROR` and `G_FILE_ERROR`. + * * The image will be scaled to fit in the requested size, optionally preserving * the image's aspect ratio. * - * When preserving the aspect ratio, a @width of -1 will cause the image - * to be scaled to the exact given height, and a @height of -1 will cause + * When preserving the aspect ratio, a `width` of -1 will cause the image + * to be scaled to the exact given height, and a `height` of -1 will cause * the image to be scaled to the exact given width. When not preserving - * aspect ratio, a @width or @height of -1 means to not scale the image - * at all in that dimension. Negative values for @width and @height are + * aspect ratio, a `width` or `height` of -1 means to not scale the image + * at all in that dimension. Negative values for `width` and `height` are * allowed since 2.8. * - * Return value: A newly-created pixbuf with a reference count of 1, or %NULL - * if any of several error conditions occurred: the file could not be opened, - * there was no loader for the file's format, there was not enough memory to - * allocate the image buffer, or the image file contained invalid data. + * Return value: (transfer full) (nullable): A newly-created pixbuf * * Since: 2.6 **/ @@ -1458,12 +1464,12 @@ gdk_pixbuf_new_from_file_at_scale (const char *filename, * @filename: (type filename): Name of file to load, in the GLib file name encoding * @width: The width the image should have or -1 to not constrain the width * @height: The height the image should have or -1 to not constrain the height - * @preserve_aspect_ratio: %TRUE to preserve the image's aspect ratio + * @preserve_aspect_ratio: `TRUE` to preserve the image's aspect ratio * @error: Return location for an error * * Same as gdk_pixbuf_new_from_file_at_scale(). * - * Return value: A newly-created pixbuf with a reference count of 1, or %NULL + * Return value: A newly-created pixbuf with a reference count of 1, or `NULL` * if any of several error conditions occurred: the file could not be opened, * there was no loader for the file's format, there was not enough memory to * allocate the image buffer, or the image file contained invalid data. @@ -1528,40 +1534,37 @@ load_from_stream (GdkPixbufLoader *loader, /** - * gdk_pixbuf_new_from_stream_at_scale: - * @stream: a #GInputStream to load the pixbuf from + * gdk_pixbuf_new_from_stream_at_scale: (constructor) + * @stream: a `GInputStream` to load the pixbuf from * @width: The width the image should have or -1 to not constrain the width * @height: The height the image should have or -1 to not constrain the height - * @preserve_aspect_ratio: %TRUE to preserve the image's aspect ratio - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore + * @preserve_aspect_ratio: `TRUE` to preserve the image's aspect ratio + * @cancellable: (allow-none): optional `GCancellable` object, `NULL` to ignore * @error: Return location for an error * * Creates a new pixbuf by loading an image from an input stream. * - * The file format is detected automatically. If %NULL is returned, then + * The file format is detected automatically. If `NULL` is returned, then * @error will be set. The @cancellable can be used to abort the operation * from another thread. If the operation was cancelled, the error - * %G_IO_ERROR_CANCELLED will be returned. Other possible errors are in - * the #GDK_PIXBUF_ERROR and %G_IO_ERROR domains. + * `G_IO_ERROR_CANCELLED` will be returned. Other possible errors are in + * the `GDK_PIXBUF_ERROR` and `G_IO_ERROR` domains. * * The image will be scaled to fit in the requested size, optionally * preserving the image's aspect ratio. * - * When preserving the aspect ratio, a @width of -1 will cause the image to be - * scaled to the exact given height, and a @height of -1 will cause the image - * to be scaled to the exact given width. If both @width and @height are + * When preserving the aspect ratio, a `width` of -1 will cause the image to be + * scaled to the exact given height, and a `height` of -1 will cause the image + * to be scaled to the exact given width. If both `width` and `height` are * given, this function will behave as if the smaller of the two values * is passed as -1. * - * When not preserving aspect ratio, a @width or @height of -1 means to not + * When not preserving aspect ratio, a `width` or `height` of -1 means to not * scale the image at all in that dimension. * * The stream is not closed. * - * Return value: A newly-created pixbuf, or %NULL if any of several error - * conditions occurred: the file could not be opened, the image format is - * not supported, there was not enough memory to allocate the image buffer, - * the stream contained invalid data, or the operation was cancelled. + * Return value: (transfer full) (nullable): A newly-created pixbuf * * Since: 2.14 */ @@ -1644,12 +1647,12 @@ out: /** * gdk_pixbuf_new_from_stream_at_scale_async: - * @stream: a #GInputStream from which to load the pixbuf + * @stream: a `GInputStream` from which to load the pixbuf * @width: the width the image should have or -1 to not constrain the width * @height: the height the image should have or -1 to not constrain the height - * @preserve_aspect_ratio: %TRUE to preserve the image's aspect ratio - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore - * @callback: a #GAsyncReadyCallback to call when the pixbuf is loaded + * @preserve_aspect_ratio: `TRUE` to preserve the image's aspect ratio + * @cancellable: (allow-none): optional `GCancellable` object, `NULL` to ignore + * @callback: a `GAsyncReadyCallback` to call when the pixbuf is loaded * @user_data: the data to pass to the callback function * * Creates a new pixbuf by asynchronously loading an image from an input stream. @@ -1705,25 +1708,25 @@ gdk_pixbuf_new_from_stream_at_scale_async (GInputStream *stream, } /** - * gdk_pixbuf_new_from_stream: - * @stream: a #GInputStream to load the pixbuf from - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore + * gdk_pixbuf_new_from_stream: (constructor) + * @stream: a `GInputStream` to load the pixbuf from + * @cancellable: (allow-none): optional `GCancellable` object, `NULL` to ignore * @error: Return location for an error * * Creates a new pixbuf by loading an image from an input stream. * - * The file format is detected automatically. If %NULL is returned, then - * @error will be set. The @cancellable can be used to abort the operation - * from another thread. If the operation was cancelled, the error - * %G_IO_ERROR_CANCELLED will be returned. Other possible errors are in - * the #GDK_PIXBUF_ERROR and %G_IO_ERROR domains. + * The file format is detected automatically. + * + * If `NULL` is returned, then `error` will be set. + * + * The `cancellable` can be used to abort the operation from another thread. + * If the operation was cancelled, the error `G_IO_ERROR_CANCELLED` will be + * returned. Other possible errors are in the `GDK_PIXBUF_ERROR` and + * `G_IO_ERROR` domains. * * The stream is not closed. * - * Return value: A newly-created pixbuf, or %NULL if any of several error - * conditions occurred: the file could not be opened, the image format is - * not supported, there was not enough memory to allocate the image buffer, - * the stream contained invalid data, or the operation was cancelled. + * Return value: (transfer full) (nullable): A newly-created pixbuf * * Since: 2.14 **/ @@ -1781,19 +1784,16 @@ G_GNUC_END_IGNORE_DEPRECATIONS } /** - * gdk_pixbuf_new_from_resource: + * gdk_pixbuf_new_from_resource: (constructor) * @resource_path: the path of the resource file * @error: Return location for an error * * Creates a new pixbuf by loading an image from an resource. * - * The file format is detected automatically. If %NULL is returned, then + * The file format is detected automatically. If `NULL` is returned, then * @error will be set. * - * Return value: A newly-created pixbuf, or %NULL if any of several error - * conditions occurred: the file could not be opened, the image format is - * not supported, there was not enough memory to allocate the image buffer, - * the stream contained invalid data, or the operation was cancelled. + * Return value: (transfer full) (nullable): A newly-created pixbuf * * Since: 2.26 **/ @@ -1818,16 +1818,16 @@ gdk_pixbuf_new_from_resource (const gchar *resource_path, } /** - * gdk_pixbuf_new_from_resource_at_scale: + * gdk_pixbuf_new_from_resource_at_scale: (constructor) * @resource_path: the path of the resource file * @width: The width the image should have or -1 to not constrain the width * @height: The height the image should have or -1 to not constrain the height - * @preserve_aspect_ratio: %TRUE to preserve the image's aspect ratio + * @preserve_aspect_ratio: `TRUE` to preserve the image's aspect ratio * @error: Return location for an error * * Creates a new pixbuf by loading an image from an resource. * - * The file format is detected automatically. If %NULL is returned, then + * The file format is detected automatically. If `NULL` is returned, then * @error will be set. * * The image will be scaled to fit in the requested size, optionally @@ -1839,10 +1839,7 @@ gdk_pixbuf_new_from_resource (const gchar *resource_path, * * The stream is not closed. * - * Return value: A newly-created pixbuf, or %NULL if any of several error - * conditions occurred: the file could not be opened, the image format is - * not supported, there was not enough memory to allocate the image buffer, - * the stream contained invalid data, or the operation was cancelled. + * Return value: (transfer full) (nullable): A newly-created pixbuf * * Since: 2.26 */ @@ -1867,9 +1864,9 @@ gdk_pixbuf_new_from_resource_at_scale (const char *resource_path, /** * gdk_pixbuf_new_from_stream_async: - * @stream: a #GInputStream from which to load the pixbuf - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore - * @callback: a #GAsyncReadyCallback to call when the pixbuf is loaded + * @stream: a `GInputStream` from which to load the pixbuf + * @cancellable: (allow-none): optional `GCancellable` object, `NULL` to ignore + * @callback: a `GAsyncReadyCallback` to call when the pixbuf is loaded * @user_data: the data to pass to the callback function * * Creates a new pixbuf by asynchronously loading an image from an input stream. @@ -1878,7 +1875,8 @@ gdk_pixbuf_new_from_resource_at_scale (const char *resource_path, * version of this function. * * When the operation is finished, @callback will be called in the main thread. - * You can then call gdk_pixbuf_new_from_stream_finish() to get the result of the operation. + * You can then call gdk_pixbuf_new_from_stream_finish() to get the result of + * the operation. * * Since: 2.24 **/ @@ -1908,14 +1906,13 @@ gdk_pixbuf_new_from_stream_async (GInputStream *stream, /** * gdk_pixbuf_new_from_stream_finish: - * @async_result: a #GAsyncResult - * @error: a #GError, or %NULL + * @async_result: a `GAsyncResult` + * @error: a `GError`, or `NULL` * * Finishes an asynchronous pixbuf creation operation started with * gdk_pixbuf_new_from_stream_async(). * - * Return value: a #GdkPixbuf or %NULL on error. Free the returned - * object with g_object_unref(). + * Return value: (transfer full) (nullable): the newly created pixbuf * * Since: 2.24 **/ @@ -1960,17 +1957,13 @@ info_cb (GdkPixbufLoader *loader, /** * gdk_pixbuf_get_file_info: * @filename: (type filename): The name of the file to identify. - * @width: (optional) (out): Return location for the width of the - * image, or %NULL - * @height: (optional) (out): Return location for the height of the - * image, or %NULL + * @width: (optional) (out): Return location for the width of the image + * @height: (optional) (out): Return location for the height of the image * * Parses an image file far enough to determine its format and size. * - * Returns: (nullable) (transfer none): A #GdkPixbufFormat describing - * the image format of the file or %NULL if the image format wasn't - * recognized. The return value is owned by #GdkPixbuf and should - * not be freed. + * Returns: (nullable) (transfer none): A `GdkPixbufFormat` describing + * the image format of the file * * Since: 2.4 **/ @@ -2062,8 +2055,8 @@ get_file_info_thread (GTask *task, /** * gdk_pixbuf_get_file_info_async: * @filename: (type filename): The name of the file to identify - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore - * @callback: a #GAsyncReadyCallback to call when the file info is available + * @cancellable: (allow-none): optional `GCancellable` object, `NULL` to ignore + * @callback: a `GAsyncReadyCallback` to call when the file info is available * @user_data: the data to pass to the callback function * * Asynchronously parses an image file far enough to determine its @@ -2104,18 +2097,16 @@ gdk_pixbuf_get_file_info_async (const gchar *filename, /** * gdk_pixbuf_get_file_info_finish: - * @async_result: a #GAsyncResult - * @width: (out): Return location for the width of the image, or %NULL - * @height: (out): Return location for the height of the image, or %NULL - * @error: a #GError, or %NULL + * @async_result: a `GAsyncResult` + * @width: (out): Return location for the width of the image, or `NULL` + * @height: (out): Return location for the height of the image, or `NULL` + * @error: a `GError`, or `NULL` * * Finishes an asynchronous pixbuf parsing operation started with * gdk_pixbuf_get_file_info_async(). * - * Returns: (transfer none): A #GdkPixbufFormat describing the image - * format of the file or %NULL if the image format wasn't - * recognized. The return value is owned by GdkPixbuf and should - * not be freed. + * Returns: (transfer none) (nullable): A `GdkPixbufFormat` describing the + * image format of the file * * Since: 2.32 **/ @@ -2151,10 +2142,12 @@ gdk_pixbuf_get_file_info_finish (GAsyncResult *async_result, * gdk_pixbuf_new_from_xpm_data: * @data: (array zero-terminated=1): Pointer to inline XPM data. * - * Creates a new pixbuf by parsing XPM data in memory. This data is commonly - * the result of including an XPM file into a program's C source. + * Creates a new pixbuf by parsing XPM data in memory. * - * Return value: A newly-created pixbuf with a reference count of 1. + * This data is commonly the result of including an XPM file into a + * program's C source. + * + * Return value: A newly-created pixbuf **/ GdkPixbuf * gdk_pixbuf_new_from_xpm_data (const char **data) @@ -2415,18 +2408,18 @@ gdk_pixbuf_real_save_to_callback (GdkPixbuf *pixbuf, /** * gdk_pixbuf_save: - * @pixbuf: a #GdkPixbuf. + * @pixbuf: a `GdkPixbuf`. * @filename: (type filename): name of file to save. * @type: name of file format. - * @error: (allow-none): return location for error, or %NULL - * @...: list of key-value save options, followed by %NULL + * @error: (nullable): return location for error + * @...: list of key-value save options, followed by `NULL` * * Saves pixbuf to a file in format @type. By default, "jpeg", "png", "ico" * and "bmp" are possible file formats to save in, but more formats may be * installed. The list of all writable formats can be determined in the * following way: * - * |[ + * ```c * void add_if_writable (GdkPixbufFormat *data, GSList **list) * { * if (gdk_pixbuf_format_is_writable (data)) @@ -2437,55 +2430,63 @@ gdk_pixbuf_real_save_to_callback (GdkPixbuf *pixbuf, * GSList *writable_formats = NULL; * g_slist_foreach (formats, add_if_writable, &writable_formats); * g_slist_free (formats); - * ]| + * ``` * - * If @error is set, %FALSE will be returned. Possible errors include - * those in the #GDK_PIXBUF_ERROR domain and those in the #G_FILE_ERROR domain. + * If `error` is set, `FALSE` will be returned. Possible errors include + * those in the `GDK_PIXBUF_ERROR` domain and those in the `G_FILE_ERROR` + * domain. * - * The variable argument list should be %NULL-terminated; if not empty, + * The variable argument list should be `NULL`-terminated; if not empty, * it should contain pairs of strings that modify the save * parameters. For example: - * |[ + * + * ```c * gdk_pixbuf_save (pixbuf, handle, "jpeg", &error, "quality", "100", NULL); - * ]| + * ``` * - * Currently only few parameters exist. JPEG images can be saved with a - * "quality" parameter; its value should be in the range [0,100]. JPEG - * and PNG density can be set by setting the "x-dpi" and "y-dpi" parameters - * to the appropriate values in dots per inch. + * Currently only few parameters exist. + * + * JPEG images can be saved with a "quality" parameter; its value should be + * in the range `[0, 100]`. JPEG and PNG density can be set by setting the + * "x-dpi" and "y-dpi" parameters to the appropriate values in dots per inch. * * Text chunks can be attached to PNG images by specifying parameters of * the form "tEXt::key", where key is an ASCII string of length 1-79. * The values are UTF-8 encoded strings. The PNG compression level can * be specified using the "compression" parameter; it's value is in an - * integer in the range of [0,9]. + * integer in the range of `[0, 9]`. * * ICC color profiles can also be embedded into PNG, JPEG and TIFF images. * The "icc-profile" value should be the complete ICC profile encoded * into base64. * - * |[ - * gchar *contents; - * gchar *contents_encode; + * ```c + * char *contents; * gsize length; - * g_file_get_contents ("/home/hughsie/.color/icc/L225W.icm", &contents, &length, NULL); - * contents_encode = g_base64_encode ((const guchar *) contents, length); + * + * // icm_path is set elsewhere + * g_file_get_contents (icm_path, &contents, &length, NULL); + * + * char *contents_encode = g_base64_encode ((const guchar *) contents, length); + * * gdk_pixbuf_save (pixbuf, handle, "png", &error, "icc-profile", contents_encode, NULL); - * ]| + * ``` + * + * TIFF images recognize: * - * TIFF images recognize: (1) a "bits-per-sample" option (integer) which - * can be either 1 for saving bi-level CCITTFAX4 images, or 8 for saving - * 8-bits per sample; (2) a "compression" option (integer) which can be - * 1 for no compression, 2 for Huffman, 5 for LZW, 7 for JPEG and 8 for - * DEFLATE (see the libtiff documentation and tiff.h for all supported - * codec values); (3) an "icc-profile" option (zero-terminated string) - * containing a base64 encoded ICC color profile. + * 1. a "bits-per-sample" option (integer) which can be either 1 for saving + * bi-level CCITTFAX4 images, or 8 for saving 8-bits per sample + * 2. a "compression" option (integer) which can be 1 for no compression, + * 2 for Huffman, 5 for LZW, 7 for JPEG and 8 for DEFLATE (see the libtiff + * documentation and tiff.h for all supported codec values) + * 3. an "icc-profile" option (zero-terminated string) containing a base64 + * encoded ICC color profile. * * ICO images can be saved in depth 16, 24, or 32, by using the "depth" * parameter. When the ICO saver is given "x_hot" and "y_hot" parameters, * it produces a CUR instead of an ICO. * - * Return value: whether an error was set + * Return value: `TRUE` on success, and `FALSE` otherwise **/ gboolean gdk_pixbuf_save (GdkPixbuf *pixbuf, @@ -2519,16 +2520,20 @@ gdk_pixbuf_save (GdkPixbuf *pixbuf, /** * gdk_pixbuf_savev: - * @pixbuf: a #GdkPixbuf. + * @pixbuf: a `GdkPixbuf`. * @filename: (type filename): name of file to save. * @type: name of file format. - * @option_keys: (array zero-terminated=1): name of options to set, %NULL-terminated - * @option_values: (array zero-terminated=1): values for named options - * @error: (allow-none): return location for error, or %NULL + * @option_keys: (array zero-terminated=1) (element-type utf8) (nullable): name of options to set + * @option_values: (array zero-terminated=1) (element-type utf8) (nullable): values for named options + * @error: (allow-none): return location for error, or `NULL` + * + * Vector version of `gdk_pixbuf_save()`. * - * Saves pixbuf to a file in @type, which is currently "jpeg", "png", "tiff", "ico" or "bmp". - * If @error is set, %FALSE will be returned. - * See gdk_pixbuf_save () for more details. + * Saves pixbuf to a file in `type`, which is currently "jpeg", "png", "tiff", "ico" or "bmp". + * + * If @error is set, `FALSE` will be returned. + * + * See [method@GdkPixbuf.Pixbuf.save] for more details. * * Return value: whether an error was set **/ @@ -2600,12 +2605,12 @@ gdk_pixbuf_savev (GdkPixbuf *pixbuf, /** * gdk_pixbuf_savev_utf8: - * @pixbuf: a #GdkPixbuf. + * @pixbuf: a `GdkPixbuf`. * @filename: name of file to save. * @type: name of file format. - * @option_keys: (array zero-terminated=1): name of options to set, %NULL-terminated - * @option_values: (array zero-terminated=1): values for named options - * @error: (allow-none): return location for error, or %NULL + * @option_keys: (array zero-terminated=1) (element-type utf8) (nullable): name of options to set + * @option_values: (array zero-terminated=1) (element-type utf8) (nullable): values for named options + * @error: (allow-none): return location for error, or `NULL` * * Same as gdk_pixbuf_savev() * @@ -2627,22 +2632,25 @@ gdk_pixbuf_savev_utf8 (GdkPixbuf *pixbuf, /** * gdk_pixbuf_save_to_callback: - * @pixbuf: a #GdkPixbuf. + * @pixbuf: a `GdkPixbuf`. * @save_func: (scope call): a function that is called to save each block of data that * the save routine generates. * @user_data: user data to pass to the save function. * @type: name of file format. - * @error: (allow-none): return location for error, or %NULL + * @error: (allow-none): return location for error, or `NULL` * @...: list of key-value save options * - * Saves pixbuf in format @type by feeding the produced data to a - * callback. Can be used when you want to store the image to something - * other than a file, such as an in-memory buffer or a socket. - * If @error is set, %FALSE will be returned. Possible errors - * include those in the #GDK_PIXBUF_ERROR domain and whatever the save + * Saves pixbuf in format `type` by feeding the produced data to a + * callback. + * + * This function can be used when you want to store the image to something + * other than a file, such as an in-memory buffer or a socket. + * + * If @error is set, `FALSE` will be returned. Possible errors + * include those in the `GDK_PIXBUF_ERROR` domain and whatever the save * function generates. * - * See gdk_pixbuf_save() for more details. + * See [method@GdkPixbuf.Pixbuf.save] for more details. * * Return value: whether an error was set * @@ -2681,18 +2689,23 @@ gdk_pixbuf_save_to_callback (GdkPixbuf *pixbuf, /** * gdk_pixbuf_save_to_callbackv: - * @pixbuf: a #GdkPixbuf. + * @pixbuf: a `GdkPixbuf`. * @save_func: (scope call): a function that is called to save each block of data that * the save routine generates. * @user_data: (closure): user data to pass to the save function. * @type: name of file format. - * @option_keys: (array zero-terminated=1) (element-type utf8): name of options to set, %NULL-terminated - * @option_values: (array zero-terminated=1) (element-type utf8): values for named options - * @error: (allow-none): return location for error, or %NULL + * @option_keys: (array zero-terminated=1) (element-type utf8) (nullable): name of options to set + * @option_values: (array zero-terminated=1) (element-type utf8) (nullable): values for named options + * @error: (allow-none): return location for error, or `NULL` + * + * Vector version of `gdk_pixbuf_save_to_callback()`. * * Saves pixbuf to a callback in format @type, which is currently "jpeg", - * "png", "tiff", "ico" or "bmp". If @error is set, %FALSE will be returned. See - * gdk_pixbuf_save_to_callback () for more details. + * "png", "tiff", "ico" or "bmp". + * + * If @error is set, `FALSE` will be returned. + * + * See [method@GdkPixbuf.Pixbuf.save_to_callback] for more details. * * Return value: whether an error was set * @@ -2732,23 +2745,28 @@ gdk_pixbuf_save_to_callbackv (GdkPixbuf *pixbuf, /** * gdk_pixbuf_save_to_buffer: - * @pixbuf: a #GdkPixbuf. + * @pixbuf: a `GdkPixbuf`. * @buffer: (array length=buffer_size) (out) (element-type guint8): location to receive a pointer * to the new buffer. * @buffer_size: location to receive the size of the new buffer. * @type: name of file format. - * @error: (allow-none): return location for error, or %NULL + * @error: (allow-none): return location for error, or `NULL` * @...: list of key-value save options * - * Saves pixbuf to a new buffer in format @type, which is currently "jpeg", - * "png", "tiff", "ico" or "bmp". This is a convenience function that uses - * gdk_pixbuf_save_to_callback() to do the real work. Note that the buffer - * is not nul-terminated and may contain embedded nuls. - * If @error is set, %FALSE will be returned and @buffer will be set to - * %NULL. Possible errors include those in the #GDK_PIXBUF_ERROR + * Saves pixbuf to a new buffer in format `type`, which is currently "jpeg", + * "png", "tiff", "ico" or "bmp". + * + * This is a convenience function that uses `gdk_pixbuf_save_to_callback()` + * to do the real work. + * + * Note that the buffer is not `NUL`-terminated and may contain embedded `NUL` + * characters. + * + * If @error is set, `FALSE` will be returned and @buffer will be set to + * `NULL`. Possible errors include those in the `GDK_PIXBUF_ERROR` * domain. * - * See gdk_pixbuf_save() for more details. + * See `gdk_pixbuf_save()` for more details. * * Return value: whether an error was set * @@ -2820,18 +2838,21 @@ save_to_buffer_callback (const gchar *data, /** * gdk_pixbuf_save_to_bufferv: - * @pixbuf: a #GdkPixbuf. + * @pixbuf: a `GdkPixbuf`. * @buffer: (array length=buffer_size) (out) (element-type guint8): * location to receive a pointer to the new buffer. * @buffer_size: location to receive the size of the new buffer. * @type: name of file format. - * @option_keys: (array zero-terminated=1): name of options to set, %NULL-terminated - * @option_values: (array zero-terminated=1): values for named options - * @error: (allow-none): return location for error, or %NULL + * @option_keys: (array zero-terminated=1) (element-type utf8) (nullable): name of options to set + * @option_values: (array zero-terminated=1) (element-type utf8) (nullable): values for named options + * @error: (allow-none): return location for error, or `NULL` + * + * Vector version of `gdk_pixbuf_save_to_buffer()`. * * Saves pixbuf to a new buffer in format @type, which is currently "jpeg", - * "tiff", "png", "ico" or "bmp". See gdk_pixbuf_save_to_buffer() - * for more details. + * "tiff", "png", "ico" or "bmp". + * + * See [method@GdkPixbuf.Pixbuf.save_to_buffer] for more details. * * Return value: whether an error was set * @@ -2919,21 +2940,23 @@ save_to_stream (const gchar *buffer, /** * gdk_pixbuf_save_to_streamv: - * @pixbuf: a #GdkPixbuf - * @stream: a #GOutputStream to save the pixbuf to + * @pixbuf: a `GdkPixbuf` + * @stream: a `GOutputStream` to save the pixbuf to * @type: name of file format - * @option_keys: (array zero-terminated=1): name of options to set, %NULL-terminated - * @option_values: (array zero-terminated=1): values for named options - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore - * @error: (allow-none): return location for error, or %NULL + * @option_keys: (array zero-terminated=1) (element-type utf8) (nullable): name of options to set + * @option_values: (array zero-terminated=1) (element-type utf8) (nullable): values for named options + * @cancellable: (nullable): optional `GCancellable` object, `NULL` to ignore + * @error: return location for error * - * Saves @pixbuf to an output stream. + * Saves `pixbuf` to an output stream. * * Supported file formats are currently "jpeg", "tiff", "png", "ico" or - * "bmp". See gdk_pixbuf_save_to_stream() for more details. + * "bmp". * - * Returns: %TRUE if the pixbuf was saved successfully, %FALSE if an - * error was set. + * See [method@GdkPixbuf.Pixbuf.save_to_stream] for more details. + * + * Returns: `TRUE` if the pixbuf was saved successfully, `FALSE` if an + * error was set. * * Since: 2.36 */ @@ -2959,27 +2982,27 @@ gdk_pixbuf_save_to_streamv (GdkPixbuf *pixbuf, /** * gdk_pixbuf_save_to_stream: - * @pixbuf: a #GdkPixbuf - * @stream: a #GOutputStream to save the pixbuf to + * @pixbuf: a `GdkPixbuf` + * @stream: a `GOutputStream` to save the pixbuf to * @type: name of file format - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore - * @error: (allow-none): return location for error, or %NULL + * @cancellable: (allow-none): optional `GCancellable` object, `NULL` to ignore + * @error: (allow-none): return location for error, or `NULL` * @...: list of key-value save options * - * Saves @pixbuf to an output stream. + * Saves `pixbuf` to an output stream. * * Supported file formats are currently "jpeg", "tiff", "png", "ico" or - * "bmp". See gdk_pixbuf_save_to_buffer() for more details. + * "bmp". See `gdk_pixbuf_save_to_buffer()` for more details. * - * The @cancellable can be used to abort the operation from another - * thread. If the operation was cancelled, the error %G_IO_ERROR_CANCELLED - * will be returned. Other possible errors are in the #GDK_PIXBUF_ERROR - * and %G_IO_ERROR domains. + * The `cancellable` can be used to abort the operation from another + * thread. If the operation was cancelled, the error `G_IO_ERROR_CANCELLED` + * will be returned. Other possible errors are in the `GDK_PIXBUF_ERROR` + * and `G_IO_ERROR` domains. * - * The stream is not closed. + * The stream is not closed at the end of this call. * - * Returns: %TRUE if the pixbuf was saved successfully, %FALSE if an - * error was set. + * Returns: `TRUE` if the pixbuf was saved successfully, `FALSE` if an + * error was set. * * Since: 2.14 */ @@ -3055,22 +3078,24 @@ save_to_stream_thread (GTask *task, /** * gdk_pixbuf_save_to_streamv_async: - * @pixbuf: a #GdkPixbuf - * @stream: a #GOutputStream to which to save the pixbuf + * @pixbuf: a `GdkPixbuf` + * @stream: a `GOutputStream` to which to save the pixbuf * @type: name of file format - * @option_keys: (array zero-terminated=1): name of options to set, %NULL-terminated - * @option_values: (array zero-terminated=1): values for named options - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore - * @callback: a #GAsyncReadyCallback to call when the pixbuf is saved + * @option_keys: (array zero-terminated=1) (element-type utf8) (nullable): name of options to set + * @option_values: (array zero-terminated=1) (element-type utf8) (nullable): values for named options + * @cancellable: (allow-none): optional `GCancellable` object, `NULL` to ignore + * @callback: a `GAsyncReadyCallback` to call when the pixbuf is saved * @user_data: the data to pass to the callback function * - * Saves @pixbuf to an output stream asynchronously. + * Saves `pixbuf` to an output stream asynchronously. * * For more details see gdk_pixbuf_save_to_streamv(), which is the synchronous * version of this function. * - * When the operation is finished, @callback will be called in the main thread. - * You can then call gdk_pixbuf_save_to_stream_finish() to get the result of the operation. + * When the operation is finished, `callback` will be called in the main thread. + * + * You can then call gdk_pixbuf_save_to_stream_finish() to get the result of + * the operation. * * Since: 2.36 **/ @@ -3111,21 +3136,23 @@ gdk_pixbuf_save_to_streamv_async (GdkPixbuf *pixbuf, /** * gdk_pixbuf_save_to_stream_async: - * @pixbuf: a #GdkPixbuf - * @stream: a #GOutputStream to which to save the pixbuf + * @pixbuf: a `GdkPixbuf` + * @stream: a `GOutputStream` to which to save the pixbuf * @type: name of file format - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore - * @callback: a #GAsyncReadyCallback to call when the pixbuf is saved + * @cancellable: (allow-none): optional `GCancellable` object, `NULL` to ignore + * @callback: a `GAsyncReadyCallback` to call when the pixbuf is saved * @user_data: the data to pass to the callback function * @...: list of key-value save options * - * Saves @pixbuf to an output stream asynchronously. + * Saves `pixbuf` to an output stream asynchronously. * * For more details see gdk_pixbuf_save_to_stream(), which is the synchronous * version of this function. * - * When the operation is finished, @callback will be called in the main thread. - * You can then call gdk_pixbuf_save_to_stream_finish() to get the result of the operation. + * When the operation is finished, `callback` will be called in the main thread. + * + * You can then call gdk_pixbuf_save_to_stream_finish() to get the result of + * the operation. * * Since: 2.24 **/ @@ -3164,13 +3191,13 @@ gdk_pixbuf_save_to_stream_async (GdkPixbuf *pixbuf, /** * gdk_pixbuf_save_to_stream_finish: - * @async_result: a #GAsyncResult - * @error: a #GError, or %NULL + * @async_result: a `GAsyncResult` + * @error: a `GError`, or `NULL` * * Finishes an asynchronous pixbuf save operation started with * gdk_pixbuf_save_to_stream_async(). * - * Return value: %TRUE if the pixbuf was saved successfully, %FALSE if an error was set. + * Return value: `TRUE` if the pixbuf was saved successfully, `FALSE` if an error was set. * * Since: 2.24 **/ @@ -3196,7 +3223,7 @@ gdk_pixbuf_save_to_stream_finish (GAsyncResult *async_result, /** * gdk_pixbuf_format_get_name: - * @format: a #GdkPixbufFormat + * @format: a `GdkPixbufFormat` * * Returns the name of the format. * @@ -3214,7 +3241,7 @@ gdk_pixbuf_format_get_name (GdkPixbufFormat *format) /** * gdk_pixbuf_format_get_description: - * @format: a #GdkPixbufFormat + * @format: a `GdkPixbufFormat` * * Returns a description of the format. * @@ -3240,12 +3267,11 @@ gdk_pixbuf_format_get_description (GdkPixbufFormat *format) /** * gdk_pixbuf_format_get_mime_types: - * @format: a #GdkPixbufFormat + * @format: a `GdkPixbufFormat` * * Returns the mime types supported by the format. * - * Return value: (transfer full): a %NULL-terminated array of mime types which must be freed with - * g_strfreev() when it is no longer needed. + * Return value: (transfer full) (array zero-terminated=1): an array of mime types * * Since: 2.2 */ @@ -3259,13 +3285,13 @@ gdk_pixbuf_format_get_mime_types (GdkPixbufFormat *format) /** * gdk_pixbuf_format_get_extensions: - * @format: a #GdkPixbufFormat + * @format: a `GdkPixbufFormat` * * Returns the filename extensions typically used for files in the * given format. * - * Return value: (transfer full): a %NULL-terminated array of filename extensions which must be - * freed with g_strfreev() when it is no longer needed. + * Return value: (transfer full) (array zero-terminated=1): an array of + * filename extensions * * Since: 2.2 */ @@ -3279,7 +3305,7 @@ gdk_pixbuf_format_get_extensions (GdkPixbufFormat *format) /** * gdk_pixbuf_format_is_writable: - * @format: a #GdkPixbufFormat + * @format: a `GdkPixbufFormat` * * Returns whether pixbufs can be saved in the given format. * @@ -3297,12 +3323,13 @@ gdk_pixbuf_format_is_writable (GdkPixbufFormat *format) /** * gdk_pixbuf_format_is_scalable: - * @format: a #GdkPixbufFormat + * @format: a `GdkPixbufFormat` + * + * Returns whether this image format is scalable. * - * Returns whether this image format is scalable. If a file is in a - * scalable format, it is preferable to load it at the desired size, - * rather than loading it at the default size and scaling the - * resulting pixbuf to the desired size. + * If a file is in a scalable format, it is preferable to load it at + * the desired size, rather than loading it at the default size and + * scaling the resulting pixbuf to the desired size. * * Return value: whether this image format is scalable. * @@ -3318,10 +3345,11 @@ gdk_pixbuf_format_is_scalable (GdkPixbufFormat *format) /** * gdk_pixbuf_format_is_disabled: - * @format: a #GdkPixbufFormat + * @format: a `GdkPixbufFormat` * - * Returns whether this image format is disabled. See - * gdk_pixbuf_format_set_disabled(). + * Returns whether this image format is disabled. + * + * See gdk_pixbuf_format_set_disabled(). * * Return value: whether this image format is disabled. * @@ -3337,13 +3365,16 @@ gdk_pixbuf_format_is_disabled (GdkPixbufFormat *format) /** * gdk_pixbuf_format_set_disabled: - * @format: a #GdkPixbufFormat - * @disabled: %TRUE to disable the format @format + * @format: a `GdkPixbufFormat` + * @disabled: `TRUE` to disable the format @format + * + * Disables or enables an image format. + * + * If a format is disabled, GdkPixbuf won't use the image loader for + * this format to load images. * - * Disables or enables an image format. If a format is disabled, - * gdk-pixbuf won't use the image loader for this format to load - * images. Applications can use this to avoid using image loaders - * with an inappropriate license, see gdk_pixbuf_format_get_license(). + * Applications can use this to avoid using image loaders with an + * inappropriate license, see gdk_pixbuf_format_get_license(). * * Since: 2.6 */ @@ -3358,14 +3389,14 @@ gdk_pixbuf_format_set_disabled (GdkPixbufFormat *format, /** * gdk_pixbuf_format_get_license: - * @format: a #GdkPixbufFormat + * @format: a pixbuf format * - * Returns information about the license of the image loader for the format. The - * returned string should be a shorthand for a wellknown license, e.g. "LGPL", - * "GPL", "QPL", "GPL/QPL", or "other" to indicate some other license. This - * string should be freed with g_free() when it's no longer needed. + * Returns information about the license of the image loader for the format. * - * Returns: a string describing the license of @format. + * The returned string should be a shorthand for a well known license, e.g. + * "LGPL", "GPL", "QPL", "GPL/QPL", or "other" to indicate some other license. + * + * Returns: (transfer full): a string describing the license of the pixbuf format * * Since: 2.6 */ @@ -3392,9 +3423,7 @@ _gdk_pixbuf_get_format (GdkPixbufModule *module) * by GdkPixbuf. * * Returns: (transfer container) (element-type GdkPixbufFormat): A list of - * #GdkPixbufFormats describing the supported image formats. The list should - * be freed when it is no longer needed, but the structures themselves are - * owned by #GdkPixbuf and should not be freed. + * support image formats. * * Since: 2.2 */ @@ -3415,11 +3444,11 @@ gdk_pixbuf_get_formats (void) /** * gdk_pixbuf_format_copy: - * @format: a #GdkPixbufFormat + * @format: a pixbuf format * - * Creates a copy of @format + * Creates a copy of `format`. * - * Return value: the newly allocated copy of a #GdkPixbufFormat. Use + * Return value: the newly allocated copy of a `GdkPixbufFormat`. Use * gdk_pixbuf_format_free() to free the resources when done * * Since: 2.22 @@ -3435,9 +3464,9 @@ gdk_pixbuf_format_copy (const GdkPixbufFormat *format) /** * gdk_pixbuf_format_free: - * @format: a #GdkPixbufFormat + * @format: a pixbuf format * - * Frees the resources allocated when copying a #GdkPixbufFormat + * Frees the resources allocated when copying a `GdkPixbufFormat` * using gdk_pixbuf_format_copy() * * Since: 2.22 @@ -3451,14 +3480,15 @@ gdk_pixbuf_format_free (GdkPixbufFormat *format) /** * gdk_pixbuf_format_is_save_option_supported: - * @format: a #GdkPixbufFormat + * @format: a pixbuf format * @option_key: the name of an option * - * Returns %TRUE if the save option specified by @option_key is supported when + * Returns `TRUE` if the save option specified by @option_key is supported when * saving a pixbuf using the module implementing @format. + * * See gdk_pixbuf_save() for more information about option keys. * - * Returns: %TRUE if the specified option is supported + * Returns: `TRUE` if the specified option is supported * * Since: 2.36 */ diff --git a/gdk-pixbuf/gdk-pixbuf-io.h b/gdk-pixbuf/gdk-pixbuf-io.h index 89b0830e1..f8270f52c 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.h +++ b/gdk-pixbuf/gdk-pixbuf-io.h @@ -173,34 +173,37 @@ typedef void (* GdkPixbufModuleUpdatedFunc) (GdkPixbuf *pixbuf, * @mask: mask containing bytes which modify how the prefix is matched against * test data * @relevance: relevance of this pattern + * + * The signature prefix for a module. * * The signature of a module is a set of prefixes. Prefixes are encoded as * pairs of ordinary strings, where the second string, called the mask, if - * not %NULL, must be of the same length as the first one and may contain + * not `NULL`, must be of the same length as the first one and may contain * ' ', '!', 'x', 'z', and 'n' to indicate bytes that must be matched, - * not matched, "don't-care"-bytes, zeros and non-zeros. + * not matched, "don't-care"-bytes, zeros and non-zeros, respectively. + * * Each prefix has an associated integer that describes the relevance of * the prefix, with 0 meaning a mismatch and 100 a "perfect match". * * Starting with gdk-pixbuf 2.8, the first byte of the mask may be '*', * indicating an unanchored pattern that matches not only at the beginning, * but also in the middle. Versions prior to 2.8 will interpret the '*' - * like an 'x'. + * like an 'x'. * * The signature of a module is stored as an array of - * #GdkPixbufModulePatterns. The array is terminated by a pattern - * where the @prefix is %NULL. - * + * `GdkPixbufModulePatterns`. The array is terminated by a pattern + * where the `prefix` is `NULL`. * - * <informalexample><programlisting> + * ```c * GdkPixbufModulePattern *signature[] = { * { "abcdx", " !x z", 100 }, * { "bla", NULL, 90 }, * { NULL, NULL, 0 } * }; - * </programlisting> - * The example matches e.g. "auud\0" with relevance 100, and "blau" with - * relevance 90.</informalexample> + * ``` + * + * In the example above, the signature matches e.g. "auud\0" with + * relevance 100, and "blau" with relevance 90. * * Since: 2.2 */ @@ -211,31 +214,6 @@ struct _GdkPixbufModulePattern { int relevance; }; -/** - * GdkPixbufModule: - * @module_name: the name of the module, usually the same as the - * usual file extension for images of this type, eg. "xpm", "jpeg" or "png". - * @module_path: the path from which the module is loaded. - * @module: the loaded #GModule. - * @info: a #GdkPixbufFormat holding information about the module. - * @load: loads an image from a file. - * @load_xpm_data: loads an image from data in memory. - * @begin_load: begins an incremental load. - * @stop_load: stops an incremental load. - * @load_increment: continues an incremental load. - * @load_animation: loads an animation from a file. - * @save: saves a #GdkPixbuf to a file. - * @save_to_callback: saves a #GdkPixbuf by calling the given #GdkPixbufSaveFunc. - * @is_save_option_supported: returns whether a save option key is supported by the module - * - * A #GdkPixbufModule contains the necessary functions to load and save - * images in a certain file format. - * - * A #GdkPixbufModule can be loaded dynamically from a #GModule. - * Each loadable module must contain a #GdkPixbufModuleFillVtableFunc function - * named <function>fill_vtable</function>, which will get called when the module - * is loaded and must set the function pointers of the #GdkPixbufModule. - */ typedef struct _GdkPixbufModule GdkPixbufModule; struct _GdkPixbufModule { char *module_name; @@ -332,21 +310,23 @@ typedef enum /*< skip >*/ /** * GdkPixbufFormat: - * @name: the name of the image format. - * @signature: the signature of the module. - * @domain: the message domain for the @description. - * @description: a description of the image format. - * @mime_types: a %NULL-terminated array of MIME types for the image format. - * @extensions: a %NULL-terminated array of typical filename extensions for the - * image format. - * @flags: a combination of #GdkPixbufFormatFlags. - * @disabled: a boolean determining whether the loader is disabled. + * @name: the name of the image format + * @signature: the signature of the module + * @domain: the message domain for the `description` + * @description: a description of the image format + * @mime_types: (array zero-terminated=1): the MIME types for the image format + * @extensions: (array zero-terminated=1): typical filename extensions for the + * image format + * @flags: a combination of `GdkPixbufFormatFlags` + * @disabled: a boolean determining whether the loader is disabled` * @license: a string containing license information, typically set to - * shorthands like "GPL", "LGPL", etc. + * shorthands like "GPL", "LGPL", etc. * - * A #GdkPixbufFormat contains information about the image format accepted by a - * module. Only modules should access the fields directly, applications should - * use the <function>gdk_pixbuf_format_*</function> functions. + * A `GdkPixbufFormat` contains information about the image format accepted + * by a module. + * + * Only modules should access the fields directly, applications should + * use the `gdk_pixbuf_format_*` family of functions. * * Since: 2.2 */ diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c index 81c5afb75..51202b6f1 100644 --- a/gdk-pixbuf/gdk-pixbuf-loader.c +++ b/gdk-pixbuf/gdk-pixbuf-loader.c @@ -32,52 +32,53 @@ #include "gdk-pixbuf-marshal.h" /** - * SECTION:gdk-pixbuf-loader - * @Short_description: Application-driven progressive image loading. - * @Title: GdkPixbufLoader - * @See_also: gdk_pixbuf_new_from_file(), gdk_pixbuf_animation_new_from_file() + * GdkPixbufLoader: + * + * Incremental image loader. * - * #GdkPixbufLoader provides a way for applications to drive the + * `GdkPixbufLoader` provides a way for applications to drive the * process of loading an image, by letting them send the image data * directly to the loader instead of having the loader read the data - * from a file. Applications can use this functionality instead of - * gdk_pixbuf_new_from_file() or gdk_pixbuf_animation_new_from_file() - * when they need to parse image data in - * small chunks. For example, it should be used when reading an - * image from a (potentially) slow network connection, or when - * loading an extremely large file. - * - * - * To use #GdkPixbufLoader to load an image, just create a new one, and - * call gdk_pixbuf_loader_write() to send the data to it. When done, - * gdk_pixbuf_loader_close() should be called to end the stream and - * finalize everything. The loader will emit three important signals - * throughout the process. The first, #GdkPixbufLoader::size-prepared, - * will be emitted as soon as the image has enough information to - * determine the size of the image to be used. If you want to scale - * the image while loading it, you can call gdk_pixbuf_loader_set_size() - * in response to this signal. - * - * - * The second signal, #GdkPixbufLoader::area-prepared, will be emitted as - * soon as the pixbuf of the desired has been allocated. You can obtain it - * by calling gdk_pixbuf_loader_get_pixbuf(). If you want to use it, simply - * ref it. You can also call gdk_pixbuf_loader_get_pixbuf() later and get - * the same pixbuf. - * - * The last signal, #GdkPixbufLoader::area-updated, gets emitted every time - * a region is updated. This way you can update a partially completed image. - * Note that you do not know anything about the completeness of an image - * from the updated area. For example, in an interlaced image, you need to - * make several passes before the image is done loading. + * from a file. Applications can use this functionality instead of + * `gdk_pixbuf_new_from_file()` or `gdk_pixbuf_animation_new_from_file()` + * when they need to parse image data in small chunks. For example, + * it should be used when reading an image from a (potentially) slow + * network connection, or when loading an extremely large file. + * + * To use `GdkPixbufLoader` to load an image, create a new instance, + * and call [method@GdkPixbuf.PixbufLoader.write] to send the data + * to it. When done, [method@GdkPixbuf.PixbufLoader.close] should be + * called to end the stream and finalize everything. + * + * The loader will emit three important signals throughout the process: + * + * - [signal@GdkPixbuf.PixbufLoader::size-prepared] will be emitted as + * soon as the image has enough information to determine the size of + * the image to be used. If you want to scale the image while loading + * it, you can call [method@GdkPixbuf.PixbufLoader.set_size] in + * response to this signal. + * - [signal@GdkPixbuf.PixbufLoader::area-prepared] will be emitted as + * soon as the pixbuf of the desired has been allocated. You can obtain + * the `GdkPixbuf` instance by calling [method@GdkPixbuf.PixbufLoader.get_pixbuf]. + * If you want to use it, simply acquire a reference to it. You can + * also call `gdk_pixbuf_loader_get_pixbuf()` later to get the same + * pixbuf. + * - [signal@GdkPixbuf.PixbufLoader::area-updated] will be emitted every + * time a region is updated. This way you can update a partially + * completed image. Note that you do not know anything about the + * completeness of an image from the updated area. For example, in an + * interlaced image you will need to make several passes before the + * image is done loading. * - * # Loading an animation + * ## Loading an animation * - * Loading an animation is almost as easy as loading an image. Once the first - * #GdkPixbufLoader::area-prepared signal has been emitted, you can call - * gdk_pixbuf_loader_get_animation() to get the #GdkPixbufAnimation struct - * and gdk_pixbuf_animation_get_iter() to get a #GdkPixbufAnimationIter for - * displaying it. + * Loading an animation is almost as easy as loading an image. Once the + * first [signal@GdkPixbuf.PixbufLoader::area-prepared] signal has been + * emitted, you can call [method@GdkPixbuf.PixbufLoader.get_animation] to + * get the [class@GdkPixbuf.PixbufAnimation] instance, and then call + * and [method@GdkPixbuf.PixbufAnimation.get_iter] to get a + * [class@GdkPixbuf.PixbufAnimationIter] to retrieve the pixbuf for the + * desired time stamp. */ @@ -133,9 +134,11 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class) * * This signal is emitted when the pixbuf loader has been fed the * initial amount of data that is required to figure out the size - * of the image that it will create. Applications can call - * gdk_pixbuf_loader_set_size() in response to this signal to set - * the desired size to which the image should be scaled. + * of the image that it will create. + * + * Applications can call gdk_pixbuf_loader_set_size() in response + * to this signal to set the desired size to which the image + * should be scaled. */ pixbuf_loader_signals[SIZE_PREPARED] = g_signal_new ("size-prepared", @@ -153,9 +156,11 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class) * @loader: the object which received the signal. * * This signal is emitted when the pixbuf loader has allocated the - * pixbuf in the desired size. After this signal is emitted, - * applications can call gdk_pixbuf_loader_get_pixbuf() to fetch - * the partially-loaded pixbuf. + * pixbuf in the desired size. + * + * After this signal is emitted, applications can call + * gdk_pixbuf_loader_get_pixbuf() to fetch the partially-loaded + * pixbuf. */ pixbuf_loader_signals[AREA_PREPARED] = g_signal_new ("area-prepared", @@ -175,9 +180,12 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class) * @height: Height of updated area. * * This signal is emitted when a significant area of the image being - * loaded has been updated. Normally it means that a complete - * scanline has been read in, but it could be a different area as - * well. Applications can use this signal to know when to repaint + * loaded has been updated. + * + * Normally it means that a complete scanline has been read in, but + * it could be a different area as well. + * + * Applications can use this signal to know when to repaint * areas of an image that is being loaded. */ pixbuf_loader_signals[AREA_UPDATED] = @@ -198,6 +206,7 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class) * @loader: the object which received the signal. * * This signal is emitted when gdk_pixbuf_loader_close() is called. + * * It can be used by different parts of an application to receive * notification when an image loader is closed by the code that * drives it. @@ -254,9 +263,10 @@ gdk_pixbuf_loader_finalize (GObject *object) * @width: The desired width of the image being loaded. * @height: The desired height of the image being loaded. * - * Causes the image to be scaled while it is loaded. The desired - * image size can be determined relative to the original size of - * the image by calling gdk_pixbuf_loader_set_size() from a + * Causes the image to be scaled while it is loaded. + * + * The desired image size can be determined relative to the original + * size of the image by calling gdk_pixbuf_loader_set_size() from a * signal handler for the ::size-prepared signal. * * Attempts to set the desired image size are ignored after the @@ -500,15 +510,10 @@ gdk_pixbuf_loader_eat_header_write (GdkPixbufLoader *loader, * @count: Length of the @buf buffer in bytes. * @error: return location for errors * - * This will cause a pixbuf loader to parse the next @count bytes of - * an image. It will return %TRUE if the data was loaded successfully, - * and %FALSE if an error occurred. In the latter case, the loader - * will be closed, and will not accept further writes. If %FALSE is - * returned, @error will be set to an error from the #GDK_PIXBUF_ERROR - * or #G_FILE_ERROR domains. + * Parses the next `count` bytes in the given image buffer. * - * Return value: %TRUE if the write was successful, or %FALSE if the loader - * cannot parse the buffer. + * Return value: `TRUE` if the write was successful, or + * `FALSE` if the loader cannot parse the buffer **/ gboolean gdk_pixbuf_loader_write (GdkPixbufLoader *loader, @@ -562,20 +567,13 @@ gdk_pixbuf_loader_write (GdkPixbufLoader *loader, /** * gdk_pixbuf_loader_write_bytes: * @loader: A pixbuf loader. - * @buffer: The image data as a #GBytes + * @buffer: The image data as a `GBytes` buffer. * @error: return location for errors * - * This will cause a pixbuf loader to parse a buffer inside a #GBytes - * for an image. It will return %TRUE if the data was loaded successfully, - * and %FALSE if an error occurred. In the latter case, the loader - * will be closed, and will not accept further writes. If %FALSE is - * returned, @error will be set to an error from the #GDK_PIXBUF_ERROR - * or #G_FILE_ERROR domains. - * - * See also: gdk_pixbuf_loader_write() + * Parses the next contents of the given image buffer. * - * Return value: %TRUE if the write was successful, or %FALSE if the loader - * cannot parse the buffer. + * Return value: `TRUE` if the write was successful, or `FALSE` if + * the loader cannot parse the buffer * * Since: 2.30 */ @@ -611,14 +609,16 @@ gdk_pixbuf_loader_new (void) /** * gdk_pixbuf_loader_new_with_type: * @image_type: name of the image format to be loaded with the image - * @error: (allow-none): return location for an allocated #GError, or %NULL to ignore errors + * @error: (allow-none): return location for an allocated #GError, or `NULL` to ignore errors * * Creates a new pixbuf loader object that always attempts to parse * image data as if it were an image of type @image_type, instead of - * identifying the type automatically. Useful if you want an error if - * the image isn't the expected type, for loading image formats - * that can't be reliably identified by looking at the data, or if - * the user manually forces a specific type. + * identifying the type automatically. + * + * This function is useful if you want an error if the image isn't the + * expected type; for loading image formats that can't be reliably + * identified by looking at the data; or if the user manually forces + * a specific type. * * The list of supported image formats depends on what image loaders * are installed, but typically "png", "jpeg", "gif", "tiff" and @@ -654,14 +654,16 @@ gdk_pixbuf_loader_new_with_type (const char *image_type, /** * gdk_pixbuf_loader_new_with_mime_type: * @mime_type: the mime type to be loaded - * @error: (allow-none): return location for an allocated #GError, or %NULL to ignore errors + * @error: (allow-none): return location for an allocated #GError, or `NULL` to ignore errors * * Creates a new pixbuf loader object that always attempts to parse - * image data as if it were an image of mime type @mime_type, instead of - * identifying the type automatically. Useful if you want an error if - * the image isn't the expected mime type, for loading image formats - * that can't be reliably identified by looking at the data, or if - * the user manually forces a specific mime type. + * image data as if it were an image of MIME type @mime_type, instead of + * identifying the type automatically. + * + * This function is useful if you want an error if the image isn't the + * expected MIME type; for loading image formats that can't be reliably + * identified by looking at the data; or if the user manually forces a + * specific MIME type. * * The list of supported mime types depends on what image loaders * are installed, but typically "image/png", "image/jpeg", "image/gif", @@ -671,6 +673,7 @@ gdk_pixbuf_loader_new_with_type (const char *image_type, * structs returned by gdk_pixbuf_get_formats(). * * Return value: A newly-created pixbuf loader. + * * Since: 2.4 **/ GdkPixbufLoader * @@ -736,19 +739,23 @@ _gdk_pixbuf_loader_new_with_filename (const char *filename) * @loader: A pixbuf loader. * * Queries the #GdkPixbuf that a pixbuf loader is currently creating. + * * In general it only makes sense to call this function after the - * "area-prepared" signal has been emitted by the loader; this means - * that enough data has been read to know the size of the image that - * will be allocated. If the loader has not received enough data via - * gdk_pixbuf_loader_write(), then this function returns %NULL. The - * returned pixbuf will be the same in all future calls to the loader, - * so simply calling g_object_ref() should be sufficient to continue - * using it. Additionally, if the loader is an animation, it will - * return the "static image" of the animation - * (see gdk_pixbuf_animation_get_static_image()). + * [signal@GdkPixbuf.PixbufLoader::area-prepared] signal has been + * emitted by the loader; this means that enough data has been read + * to know the size of the image that will be allocated. + * + * If the loader has not received enough data via gdk_pixbuf_loader_write(), + * then this function returns `NULL`. + * + * The returned pixbuf will be the same in all future calls to the loader, + * so if you want to keep using it, you should acquire a reference to it. + * + * Additionally, if the loader is an animation, it will return the "static + * image" of the animation (see gdk_pixbuf_animation_get_static_image()). * - * Return value: (transfer none): The #GdkPixbuf that the loader is creating, or %NULL if not - * enough data has been read to determine how to create the image buffer. + * Return value: (transfer none) (nullable): The pixbuf that the loader is + * creating **/ GdkPixbuf * gdk_pixbuf_loader_get_pixbuf (GdkPixbufLoader *loader) @@ -770,14 +777,17 @@ gdk_pixbuf_loader_get_pixbuf (GdkPixbufLoader *loader) * @loader: A pixbuf loader * * Queries the #GdkPixbufAnimation that a pixbuf loader is currently creating. - * In general it only makes sense to call this function after the "area-prepared" - * signal has been emitted by the loader. If the loader doesn't have enough - * bytes yet (hasn't emitted the "area-prepared" signal) this function will - * return %NULL. - * - * Return value: (transfer none): The #GdkPixbufAnimation that the loader is loading, or %NULL if - * not enough data has been read to determine the information. -**/ + * + * In general it only makes sense to call this function after the + * [signal@GdkPixbuf.PixbufLoader::area-prepared] signal has been emitted by + * the loader. + * + * If the loader doesn't have enough bytes yet, and hasn't emitted the `area-prepared` + * signal, this function will return `NULL`. + * + * Return value: (transfer none) (nullable): The animation that the loader is + * currently loading + */ GdkPixbufAnimation * gdk_pixbuf_loader_get_animation (GdkPixbufLoader *loader) { @@ -793,24 +803,27 @@ gdk_pixbuf_loader_get_animation (GdkPixbufLoader *loader) /** * gdk_pixbuf_loader_close: * @loader: A pixbuf loader. - * @error: (allow-none): return location for a #GError, or %NULL to ignore errors + * @error: (allow-none): return location for a #GError, or `NULL` to ignore errors * * Informs a pixbuf loader that no further writes with * gdk_pixbuf_loader_write() will occur, so that it can free its - * internal loading structures. Also, tries to parse any data that - * hasn't yet been parsed; if the remaining data is partial or - * corrupt, an error will be returned. If %FALSE is returned, @error - * will be set to an error from the #GDK_PIXBUF_ERROR or #G_FILE_ERROR - * domains. If you're just cancelling a load rather than expecting it - * to be finished, passing %NULL for @error to ignore it is - * reasonable. - * - * Remember that this does not unref the loader, so if you plan not to - * use it anymore, please g_object_unref() it. - * - * Returns: %TRUE if all image data written so far was successfully - passed out via the update_area signal - **/ + * internal loading structures. + * + * This function also tries to parse any data that hasn't yet been parsed; + * if the remaining data is partial or corrupt, an error will be returned. + * + * If `FALSE` is returned, `error` will be set to an error from the + * `GDK_PIXBUF_ERROR` or `G_FILE_ERROR` domains. + * + * If you're just cancelling a load rather than expecting it to be finished, + * passing `NULL` for `error` to ignore it is reasonable. + * + * Remember that this function does not release a reference on the loader, so + * you will need to explicitly release any reference you hold. + * + * Returns: `TRUE` if all image data written so far was successfully + * passed out via the update_area signal + */ gboolean gdk_pixbuf_loader_close (GdkPixbufLoader *loader, GError **error) @@ -882,9 +895,7 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader, * Obtains the available information about the format of the * currently loading image file. * - * Returns: (nullable) (transfer none): A #GdkPixbufFormat or - * %NULL. The return value is owned by GdkPixbuf and should not be - * freed. + * Returns: (nullable) (transfer none): A #GdkPixbufFormat * * Since: 2.2 */ diff --git a/gdk-pixbuf/gdk-pixbuf-loader.h b/gdk-pixbuf/gdk-pixbuf-loader.h index 83648205f..1cc34136b 100644 --- a/gdk-pixbuf/gdk-pixbuf-loader.h +++ b/gdk-pixbuf/gdk-pixbuf-loader.h @@ -43,18 +43,12 @@ G_BEGIN_DECLS #define GDK_IS_PIXBUF_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_LOADER)) #define GDK_PIXBUF_LOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoaderClass)) -/** - * GdkPixbufLoader: - * - * The GdkPixbufLoader struct contains only private - * fields. - */ typedef struct _GdkPixbufLoader GdkPixbufLoader; struct _GdkPixbufLoader { + /*< private >*/ GObject parent_instance; - /*< private >*/ gpointer priv; }; diff --git a/gdk-pixbuf/gdk-pixbuf-scale.c b/gdk-pixbuf/gdk-pixbuf-scale.c index 84e8e10c3..82dfad77b 100644 --- a/gdk-pixbuf/gdk-pixbuf-scale.c +++ b/gdk-pixbuf/gdk-pixbuf-scale.c @@ -26,49 +26,6 @@ #include "pixops/pixops.h" /** - * SECTION:scaling - * @Short_description: Scaling pixbufs and scaling and alpha blending pixbufs - * @Title: Scaling - * - * The GdkPixBuf contains functions to scale pixbufs, to scale - * pixbufs and alpha blend against an existing image, and to scale - * pixbufs and alpha blend against a solid color or checkerboard. - * Alpha blending a checkerboard is a common way to show an image with - * an alpha channel in image-viewing and editing software. - * - * Note that in these functions, the terms ‘alpha blending’ and ‘compositing’ - * are used synonymously. - * - * Since the full-featured functions (gdk_pixbuf_scale(), - * gdk_pixbuf_composite(), and gdk_pixbuf_composite_color()) are - * rather complex to use and have many arguments, two simple - * convenience functions are provided, gdk_pixbuf_scale_simple() and - * gdk_pixbuf_composite_color_simple() which create a new pixbuf of a - * given size, scale an original image to fit, and then return the - * new pixbuf. - * - * If the destination pixbuf was created from a readonly source, these - * operations will force a copy into a mutable buffer. - * - * Scaling and alpha blending functions take advantage of MMX hardware - * acceleration on systems where MMX is supported. If gdk-pixbuf is built - * with the Sun mediaLib library, these functions are instead accelerated - * using mediaLib, which provides hardware acceleration on Intel, AMD, - * and Sparc chipsets. If desired, mediaLib support can be turned off by - * setting the `GDK_DISABLE_MEDIALIB` environment variable. - * - * The alpha blending function used is: - * - * |[<!-- language="plain" --> - * Cd = Cs·As + Cd(1-As) - * ]| - * - * where `Cd` is the destination pixel color, `Cs` is the source pixel color, - * and `As` is the source pixel alpha. - */ - - -/** * gdk_pixbuf_scale: * @src: a #GdkPixbuf * @dest: the #GdkPixbuf into which to render the results @@ -88,8 +45,8 @@ * @dest_height) of the resulting image onto the destination image * replacing the previous contents. * - * Try to use gdk_pixbuf_scale_simple() first, this function is - * the industrial-strength power tool you can fall back to if + * Try to use gdk_pixbuf_scale_simple() first; this function is + * the industrial-strength power tool you can fall back to, if * gdk_pixbuf_scale_simple() isn't powerful enough. * * If the source rectangle overlaps the destination rectangle on the @@ -148,6 +105,7 @@ gdk_pixbuf_scale (const GdkPixbuf *src, * * Creates a transformation of the source image @src by scaling by * @scale_x and @scale_y then translating by @offset_x and @offset_y. + * * This gives an image in the coordinates of the destination pixbuf. * The rectangle (@dest_x, @dest_y, @dest_width, @dest_height) * is then alpha blended onto the corresponding rectangle of the @@ -229,7 +187,6 @@ gdk_pixbuf_composite (const GdkPixbuf *src, * * See gdk_pixbuf_composite_color_simple() for a simpler variant of this * function suitable for many tasks. - * **/ void gdk_pixbuf_composite_color (const GdkPixbuf *src, @@ -283,24 +240,26 @@ gdk_pixbuf_composite_color (const GdkPixbuf *src, * @dest_height: the height of destination image * @interp_type: the interpolation type for the transformation. * - * Create a new #GdkPixbuf containing a copy of @src scaled to - * @dest_width x @dest_height. Leaves @src unaffected. @interp_type - * should be #GDK_INTERP_NEAREST if you want maximum speed (but when - * scaling down #GDK_INTERP_NEAREST is usually unusably ugly). The - * default @interp_type should be #GDK_INTERP_BILINEAR which offers - * reasonable quality and speed. + * Create a new pixbuf containing a copy of `src` scaled to + * `dest_width` x `dest_height`. + * + * This function leaves `src` unaffected. + * + * The `interp_type` should be `GDK_INTERP_NEAREST` if you want maximum + * speed (but when scaling down `GDK_INTERP_NEAREST` is usually unusably + * ugly). The default `interp_type` should be `GDK_INTERP_BILINEAR` which + * offers reasonable quality and speed. * - * You can scale a sub-portion of @src by creating a sub-pixbuf - * pointing into @src; see gdk_pixbuf_new_subpixbuf(). + * You can scale a sub-portion of `src` by creating a sub-pixbuf + * pointing into `src`; see [method@GdkPixbuf.Pixbuf.new_subpixbuf]. * - * If @dest_width and @dest_height are equal to the @src width and height, a - * copy of @src is returned, avoiding any scaling. + * If `dest_width` and `dest_height` are equal to the width and height of + * `src`, this function will return an unscaled copy of `src`. * - * For more complicated scaling/alpha blending see gdk_pixbuf_scale() - * and gdk_pixbuf_composite(). + * For more complicated scaling/alpha blending see [method@GdkPixbuf.Pixbuf.scale] + * and [method@GdkPixbuf.Pixbuf.composite]. * - * Return value: (nullable) (transfer full): the new #GdkPixbuf, or %NULL if not enough memory could be - * allocated for it. + * Return value: (nullable) (transfer full): the new pixbuf **/ GdkPixbuf * gdk_pixbuf_scale_simple (const GdkPixbuf *src, @@ -341,12 +300,11 @@ gdk_pixbuf_scale_simple (const GdkPixbuf *src, * @color1: the color of check at upper left * @color2: the color of the other check * - * Creates a new #GdkPixbuf by scaling @src to @dest_width x - * @dest_height and alpha blending the result with a checkboard of colors - * @color1 and @color2. + * Creates a new pixbuf by scaling `src` to `dest_width` x `dest_height` + * and alpha blending the result with a checkboard of colors `color1` + * and `color2`. * - * Return value: (nullable) (transfer full): the new #GdkPixbuf, or %NULL if not enough memory could be - * allocated for it. + * Return value: (nullable) (transfer full): the new pixbuf **/ GdkPixbuf * gdk_pixbuf_composite_color_simple (const GdkPixbuf *src, @@ -387,10 +345,9 @@ gdk_pixbuf_composite_color_simple (const GdkPixbuf *src, * Rotates a pixbuf by a multiple of 90 degrees, and returns the * result in a new pixbuf. * - * If @angle is 0, a copy of @src is returned, avoiding any rotation. + * If `angle` is 0, this function will return a copy of `src`. * - * Returns: (nullable) (transfer full): the new #GdkPixbuf, or %NULL - * if not enough memory could be allocated for it. + * Returns: (nullable) (transfer full): the new pixbuf * * Since: 2.6 */ @@ -489,13 +446,12 @@ gdk_pixbuf_rotate_simple (const GdkPixbuf *src, /** * gdk_pixbuf_flip: * @src: a #GdkPixbuf - * @horizontal: %TRUE to flip horizontally, %FALSE to flip vertically + * @horizontal: `TRUE` to flip horizontally, `FALSE` to flip vertically * * Flips a pixbuf horizontally or vertically and returns the * result in a new pixbuf. * - * Returns: (nullable) (transfer full): the new #GdkPixbuf, or %NULL - * if not enough memory could be allocated for it. + * Returns: (nullable) (transfer full): the new pixbuf * * Since: 2.6 */ diff --git a/gdk-pixbuf/gdk-pixbuf-transform.h b/gdk-pixbuf/gdk-pixbuf-transform.h index 24e5ad5ae..2ba28c49f 100644 --- a/gdk-pixbuf/gdk-pixbuf-transform.h +++ b/gdk-pixbuf/gdk-pixbuf-transform.h @@ -59,12 +59,13 @@ G_BEGIN_DECLS * **Deprecated**: this interpolation filter is deprecated, as in reality * it has a lower quality than the @GDK_INTERP_BILINEAR filter * (Since: 2.38) - * - * This enumeration describes the different interpolation modes that - * can be used with the scaling functions. @GDK_INTERP_NEAREST is - * the fastest scaling method, but has horrible quality when - * scaling down. @GDK_INTERP_BILINEAR is the best choice if you - * aren't sure what to choose, it has a good speed/quality balance. + * + * Interpolation modes for scaling functions. + * + * The `GDK_INTERP_NEAREST` mode is the fastest scaling method, but has + * horrible quality when scaling down; `GDK_INTERP_BILINEAR` is the best + * choice if you aren't sure what to choose, it has a good speed/quality + * balance. * * **Note**: Cubic filtering is missing from the list; hyperbolic * interpolation is just as fast and results in higher quality. @@ -84,6 +85,7 @@ typedef enum { * @GDK_PIXBUF_ROTATE_CLOCKWISE: Rotate by 270 degrees. * * The possible rotations which can be passed to gdk_pixbuf_rotate_simple(). + * * To make them easier to use, their numerical values are the actual degrees. */ typedef enum { diff --git a/gdk-pixbuf/gdk-pixbuf-util.c b/gdk-pixbuf/gdk-pixbuf-util.c index db1562b76..0e80299f5 100644 --- a/gdk-pixbuf/gdk-pixbuf-util.c +++ b/gdk-pixbuf/gdk-pixbuf-util.c @@ -27,41 +27,35 @@ #include "gdk-pixbuf-private.h" /** - * SECTION:util - * @Short_description: Utility and miscellaneous convenience functions. - * @Title: Utilities - * @See_also: #GdkPixbuf - * - * These functions provide miscellaneous utilities for manipulating - * pixbufs. The pixel data in pixbufs may of course be manipulated - * directly by applications, but several common operations can be - * performed by these functions instead. - */ - - -/** * gdk_pixbuf_add_alpha: * @pixbuf: A #GdkPixbuf. - * @substitute_color: Whether to set a color to zero opacity. If this - * is %FALSE, then the (@r, @g, @b) arguments will be ignored. + * @substitute_color: Whether to set a color to zero opacity. * @r: Red value to substitute. * @g: Green value to substitute. * @b: Blue value to substitute. * * Takes an existing pixbuf and adds an alpha channel to it. + * * If the existing pixbuf already had an alpha channel, the channel * values are copied from the original; otherwise, the alpha channel * is initialized to 255 (full opacity). * - * If @substitute_color is %TRUE, then the color specified by (@r, @g, @b) will be - * assigned zero opacity. That is, if you pass (255, 255, 255) for the - * substitute color, all white pixels will become fully transparent. + * If `substitute_color` is `TRUE`, then the color specified by the + * (`r`, `g`, `b`) arguments will be assigned zero opacity. That is, + * if you pass `(255, 255, 255)` for the substitute color, all white + * pixels will become fully transparent. + * + * If `substitute_color` is `FALSE`, then the (`r`, `g`, `b`) arguments + * will be ignored. * - * Return value: (transfer full): A newly-created pixbuf with a reference count of 1. + * Return value: (transfer full): A newly-created pixbuf **/ GdkPixbuf * gdk_pixbuf_add_alpha (const GdkPixbuf *pixbuf, - gboolean substitute_color, guchar r, guchar g, guchar b) + gboolean substitute_color, + guchar r, + guchar g, + guchar b) { GdkPixbuf *new_pixbuf; int x, y; @@ -135,8 +129,9 @@ gdk_pixbuf_add_alpha (const GdkPixbuf *pixbuf, * @dest_x: X coordinate within @dest_pixbuf. * @dest_y: Y coordinate within @dest_pixbuf. * - * Copies a rectangular area from @src_pixbuf to @dest_pixbuf. Conversion of - * pixbuf formats is done automatically. + * Copies a rectangular area from `src_pixbuf` to `dest_pixbuf`. + * + * Conversion of pixbuf formats is done automatically. * * If the source rectangle overlaps the destination rectangle on the * same pixbuf, it will be overwritten during the copy operation. @@ -181,21 +176,27 @@ gdk_pixbuf_copy_area (const GdkPixbuf *src_pixbuf, * @saturation: saturation factor * @pixelate: whether to pixelate * - * Modifies saturation and optionally pixelates @src, placing the result in - * @dest. @src and @dest may be the same pixbuf with no ill effects. If - * @saturation is 1.0 then saturation is not changed. If it's less than 1.0, - * saturation is reduced (the image turns toward grayscale); if greater than - * 1.0, saturation is increased (the image gets more vivid colors). If @pixelate - * is %TRUE, then pixels are faded in a checkerboard pattern to create a - * pixelated image. @src and @dest must have the same image format, size, and + * Modifies saturation and optionally pixelates `src`, placing the result in + * `dest`. + * + * The `src` and `dest` pixbufs must have the same image format, size, and * rowstride. + * + * The `src` and `dest` arguments may be the same pixbuf with no ill effects. + * + * If `saturation` is 1.0 then saturation is not changed. If it's less than 1.0, + * saturation is reduced (the image turns toward grayscale); if greater than + * 1.0, saturation is increased (the image gets more vivid colors). + * + * If `pixelate` is `TRUE`, then pixels are faded in a checkerboard pattern to + * create a pixelated image. * **/ void -gdk_pixbuf_saturate_and_pixelate(const GdkPixbuf *src, - GdkPixbuf *dest, - gfloat saturation, - gboolean pixelate) +gdk_pixbuf_saturate_and_pixelate (const GdkPixbuf *src, + GdkPixbuf *dest, + gfloat saturation, + gboolean pixelate) { /* NOTE that src and dest MAY be the same pixbuf! */ @@ -271,20 +272,20 @@ gdk_pixbuf_saturate_and_pixelate(const GdkPixbuf *src, /** * gdk_pixbuf_apply_embedded_orientation: - * @src: A #GdkPixbuf. + * @src: a pixbuf with an orientation option * * Takes an existing pixbuf and checks for the presence of an - * associated "orientation" option, which may be provided by the - * jpeg loader (which reads the exif orientation tag) or the - * tiff loader (which reads the tiff orientation tag, and - * compensates it for the partial transforms performed by - * libtiff). If an orientation option/tag is present, the - * appropriate transform will be performed so that the pixbuf - * is oriented correctly. + * associated "orientation" option. + * + * The orientation option may be provided by the JPEG loader (which + * reads the exif orientation tag) or the TIFF loader (which reads + * the TIFF orientation tag, and compensates it for the partial + * transforms performed by libtiff). + * + * If an orientation option/tag is present, the appropriate transform + * will be performed so that the pixbuf is oriented correctly. * - * Return value: (transfer full): A newly-created pixbuf, %NULL if - * not enough memory could be allocated for it, or a reference to the - * input pixbuf (with an increased reference count). + * Return value: (transfer full) (nullable): A newly-created pixbuf * * Since: 2.12 **/ diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c index 2594b99e9..01b53f088 100644 --- a/gdk-pixbuf/gdk-pixbuf.c +++ b/gdk-pixbuf/gdk-pixbuf.c @@ -21,152 +21,162 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - -#include <math.h> -#include <stdlib.h> -#include <string.h> - -#define GDK_PIXBUF_C_COMPILATION -#include "gdk-pixbuf-private.h" -#include "gdk-pixbuf-features.h" -#include "gdk-pixbuf-enum-types.h" - -/* Include the marshallers */ -#include <glib-object.h> -#include <gio/gio.h> -#include "gdk-pixbuf-marshal.h" - /** - * SECTION:creating - * @Short_description: Creating a pixbuf from image data that is already in memory. - * @Title: Image Data in Memory - * @See_also: gdk_pixbuf_finalize(). + * GdkPixbuf: + * + * A pixel buffer. + * + * `GdkPixbuf` contains information about an image's pixel data, + * its color space, bits per sample, width and height, and the + * rowstride (the number of bytes between the start of one row + * and the start of the next). + * + * ## Creating new `GdkPixbuf` * * The most basic way to create a pixbuf is to wrap an existing pixel - * buffer with a #GdkPixbuf structure. You can use the - * gdk_pixbuf_new_from_data() function to do this You need to specify - * the destroy notification function that will be called when the - * data buffer needs to be freed; this will happen when a #GdkPixbuf - * is finalized by the reference counting functions If you have a - * chunk of static data compiled into your application, you can pass - * in %NULL as the destroy notification function so that the data - * will not be freed. + * buffer with a [class@GdkPixbuf.Pixbuf] instance. You can use the + * [`ctor@GdkPixbuf.Pixbuf.new_from_data`] function to do this. * - * The gdk_pixbuf_new() function can be used as a convenience to - * create a pixbuf with an empty buffer. This is equivalent to - * allocating a data buffer using malloc() and then wrapping it with - * gdk_pixbuf_new_from_data(). The gdk_pixbuf_new() function will - * compute an optimal rowstride so that rendering can be performed - * with an efficient algorithm. + * Every time you create a new `GdkPixbuf` instance for some data, you + * will need to specify the destroy notification function that will be + * called when the data buffer needs to be freed; this will happen when + * a `GdkPixbuf` is finalized by the reference counting functions. If + * you have a chunk of static data compiled into your application, you + * can pass in `NULL` as the destroy notification function so that the + * data will not be freed. * - * As a special case, you can use the gdk_pixbuf_new_from_xpm_data() + * The [`ctor@GdkPixbuf.Pixbuf.new`] constructor function can be used + * as a convenience to create a pixbuf with an empty buffer; this is + * equivalent to allocating a data buffer using `malloc()` and then + * wrapping it with `gdk_pixbuf_new_from_data()`. The `gdk_pixbuf_new()` + * function will compute an optimal rowstride so that rendering can be + * performed with an efficient algorithm. + * + * As a special case, you can use the [`ctor@GdkPixbuf.Pixbuf.new_from_xpm_data`] * function to create a pixbuf from inline XPM image data. * - * You can also copy an existing pixbuf with the gdk_pixbuf_copy() - * function. This is not the same as just doing a g_object_ref() - * on the old pixbuf; the copy function will actually duplicate the - * pixel data in memory and create a new #GdkPixbuf structure for it. - */ - -/** - * SECTION:refcounting - * @Short_description: Functions for reference counting and memory management on pixbufs. - * @Title: Reference Counting and Memory Mangement - * @See_also: #GdkPixbuf, gdk_pixbuf_new_from_data(). + * You can also copy an existing pixbuf with the [method@Pixbuf.copy] + * function. This is not the same as just acquiring a reference to + * the old pixbuf instance: the copy function will actually duplicate + * the pixel data in memory and create a new [class@Pixbuf] instance + * for it. + * + * ## Reference counting * - * #GdkPixbuf structures are reference counted. This means that an + * `GdkPixbuf` structures are reference counted. This means that an * application can share a single pixbuf among many parts of the - * code. When a piece of the program needs to keep a pointer to a - * pixbuf, it should add a reference to it by calling g_object_ref(). - * When it no longer needs the pixbuf, it should subtract a reference - * by calling g_object_unref(). The pixbuf will be destroyed when - * its reference count drops to zero. Newly-created #GdkPixbuf - * structures start with a reference count of one. - * - * > As #GdkPixbuf is derived from #GObject now, gdk_pixbuf_ref() and - * > gdk_pixbuf_unref() are deprecated in favour of g_object_ref() - * > and g_object_unref() resp. - * - * Finalizing a pixbuf means to free its pixel data and to free the - * #GdkPixbuf structure itself. Most of the library functions that - * create #GdkPixbuf structures create the pixel data by themselves - * and define the way it should be freed; you do not need to worry - * about those. - * - * To provide preallocated pixel data, use - * gdk_pixbuf_new_from_bytes(). The gdk_pixbuf_new_from_data() API is - * an older variant that predates the existence of #GBytes. - */ - -/** - * SECTION:gdk-pixbuf - * @Short_description: Information that describes an image. - * @Title: The GdkPixbuf Structure + * code. When a piece of the program needs to use a pixbuf, it should + * acquire a reference to it by calling `g_object_ref()`; when it no + * longer needs the pixbuf, it should release the reference it acquired + * by calling `g_object_unref()`. The resources associated with a + * `GdkPixbuf` will be freed when its reference count drops to zero. + * Newly-created `GdkPixbuf` instances start with a reference count + * of one. * - * The #GdkPixbuf structure contains - * information that describes an image in memory. + * ## Image Data * - * ## Image Data ## {#image-data} + * Image data in a pixbuf is stored in memory in an uncompressed, + * packed format. Rows in the image are stored top to bottom, and + * in each row pixels are stored from left to right. * - * Image data in a pixbuf is stored in memory in uncompressed, - * packed format. Rows in the image are stored top to bottom, and - * in each row pixels are stored from left to right. There may be - * padding at the end of a row. The "rowstride" value of a pixbuf, - * as returned by gdk_pixbuf_get_rowstride(), indicates the number - * of bytes between rows. + * There may be padding at the end of a row. * - * ## put_pixel() Example ## {#put-pixel} + * The "rowstride" value of a pixbuf, as returned by [`method@GdkPixbuf.Pixbuf.get_rowstride`], + * indicates the number of bytes between rows. * - * The following code illustrates a simple put_pixel() + * **NOTE**: If you are copying raw pixbuf data with `memcpy()` note that the + * last row in the pixbuf may not be as wide as the full rowstride, but rather + * just as wide as the pixel data needs to be; that is: it is unsafe to do + * `memcpy (dest, pixels, rowstride * height)` to copy a whole pixbuf. Use + * [method@GdkPixbuf.Pixbuf.copy] instead, or compute the width in bytes of the + * last row as: + * + * ```c + * last_row = width * ((n_channels * bits_per_sample + 7) / 8); + * ``` + * + * The same rule applies when iterating over each row of a `GdkPixbuf` pixels + * array. + * + * The following code illustrates a simple `put_pixel()` * function for RGB pixbufs with 8 bits per channel with an alpha - * channel. It is not included in the gdk-pixbuf library for - * performance reasons; rather than making several function calls - * for each pixel, your own code can take shortcuts. + * channel. * - * |[<!-- language="C" --> + * ```c * static void - * put_pixel (GdkPixbuf *pixbuf, int x, int y, guchar red, guchar green, guchar blue, guchar alpha) + * put_pixel (GdkPixbuf *pixbuf, + * int x, + * int y, + * guchar red, + * guchar green, + * guchar blue, + * guchar alpha) * { - * int width, height, rowstride, n_channels; - * guchar *pixels, *p; - * - * n_channels = gdk_pixbuf_get_n_channels (pixbuf); + * int n_channels = gdk_pixbuf_get_n_channels (pixbuf); * + * // Ensure that the pixbuf is valid * g_assert (gdk_pixbuf_get_colorspace (pixbuf) == GDK_COLORSPACE_RGB); * g_assert (gdk_pixbuf_get_bits_per_sample (pixbuf) == 8); * g_assert (gdk_pixbuf_get_has_alpha (pixbuf)); * g_assert (n_channels == 4); * - * width = gdk_pixbuf_get_width (pixbuf); - * height = gdk_pixbuf_get_height (pixbuf); + * int width = gdk_pixbuf_get_width (pixbuf); + * int height = gdk_pixbuf_get_height (pixbuf); * + * // Ensure that the coordinates are in a valid range * g_assert (x >= 0 && x < width); * g_assert (y >= 0 && y < height); * - * rowstride = gdk_pixbuf_get_rowstride (pixbuf); - * pixels = gdk_pixbuf_get_pixels (pixbuf); + * int rowstride = gdk_pixbuf_get_rowstride (pixbuf); * - * p = pixels + y * rowstride + x * n_channels; + * // The pixel buffer in the GdkPixbuf instance + * guchar *pixels = gdk_pixbuf_get_pixels (pixbuf); + * + * // The pixel we wish to modify + * guchar *p = pixels + y * rowstride + x * n_channels; * p[0] = red; * p[1] = green; * p[2] = blue; * p[3] = alpha; * } - * ]| - * - * This function will not work for pixbufs with images that are - * other than 8 bits per sample or channel, but it will work for - * most of the pixbufs that GTK+ uses. - * - * If you are doing memcpy() of raw pixbuf data, note that the last row - * in the pixbuf may not be as wide as the full rowstride, but rather - * just as wide as the pixel data needs to be. That is, it is unsafe to - * do `memcpy (dest, pixels, rowstride * height)` to copy a whole pixbuf. - * Use gdk_pixbuf_copy() instead, or compute the width in bytes of the - * last row as `width * ((n_channels * bits_per_sample + 7) / 8)`. + * ``` + * + * ## Loading images + * + * The `GdkPixBuf` class provides a simple mechanism for loading + * an image from a file in synchronous and asynchronous fashion. + * + * For GUI applications, it is recommended to use the asynchronous + * stream API to avoid blocking the control flow of the application. + * + * Additionally, `GdkPixbuf` provides the [class@GdkPixbuf.PixbufLoader`] + * API for progressive image loading. + * + * ## Saving images + * + * The `GdkPixbuf` class provides methods for saving image data in + * a number of file formats. The formatted data can be written to a + * file or to a memory buffer. `GdkPixbuf` can also call a user-defined + * callback on the data, which allows to e.g. write the image + * to a socket or store it in a database. */ +#include "config.h" + +#include <math.h> +#include <stdlib.h> +#include <string.h> + +#define GDK_PIXBUF_C_COMPILATION +#include "gdk-pixbuf-private.h" +#include "gdk-pixbuf-features.h" +#include "gdk-pixbuf-enum-types.h" + +/* Include the marshallers */ +#include <glib-object.h> +#include <gio/gio.h> +#include "gdk-pixbuf-marshal.h" + static void gdk_pixbuf_finalize (GObject *object); static void gdk_pixbuf_set_property (GObject *object, guint prop_id, @@ -228,7 +238,8 @@ gdk_pixbuf_class_init (GdkPixbufClass *klass) /** * GdkPixbuf:n-channels: * - * The number of samples per pixel. + * The number of samples per pixel. + * * Currently, only 3 or 4 samples per pixel are supported. */ g_object_class_install_property (object_class, @@ -240,7 +251,13 @@ gdk_pixbuf_class_init (GdkPixbufClass *klass) G_MAXINT, 3, PIXBUF_PARAM_FLAGS)); - + /** + * GdkPixbuf:colorspace: + * + * The color space of the pixbuf. + * + * Currently, only `GDK_COLORSPACE_RGB` is supported. + */ g_object_class_install_property (object_class, PROP_COLORSPACE, g_param_spec_enum ("colorspace", @@ -249,7 +266,11 @@ gdk_pixbuf_class_init (GdkPixbufClass *klass) GDK_TYPE_COLORSPACE, GDK_COLORSPACE_RGB, PIXBUF_PARAM_FLAGS)); - + /** + * GdkPixbuf:has-alpha: + * + * Whether the pixbuf has an alpha channel. + */ g_object_class_install_property (object_class, PROP_HAS_ALPHA, g_param_spec_boolean ("has-alpha", @@ -257,11 +278,11 @@ gdk_pixbuf_class_init (GdkPixbufClass *klass) _("Whether the pixbuf has an alpha channel"), FALSE, PIXBUF_PARAM_FLAGS)); - /** * GdkPixbuf:bits-per-sample: * * The number of bits per sample. + * * Currently only 8 bit per sample are supported. */ g_object_class_install_property (object_class, @@ -273,7 +294,11 @@ gdk_pixbuf_class_init (GdkPixbufClass *klass) 16, 8, PIXBUF_PARAM_FLAGS)); - + /** + * GdkPixbuf:width: + * + * The number of columns of the pixbuf. + */ g_object_class_install_property (object_class, PROP_WIDTH, g_param_spec_int ("width", @@ -283,7 +308,11 @@ gdk_pixbuf_class_init (GdkPixbufClass *klass) G_MAXINT, 1, PIXBUF_PARAM_FLAGS)); - + /** + * GdkPixbuf:height: + * + * The number of rows of the pixbuf. + */ g_object_class_install_property (object_class, PROP_HEIGHT, g_param_spec_int ("height", @@ -293,13 +322,14 @@ gdk_pixbuf_class_init (GdkPixbufClass *klass) G_MAXINT, 1, PIXBUF_PARAM_FLAGS)); - /** * GdkPixbuf:rowstride: * * The number of bytes between the start of a row and - * the start of the next row. This number must (obviously) - * be at least as large as the width of the pixbuf. + * the start of the next row. + * + * This number must (obviously) be at least as large as the + * width of the pixbuf. */ g_object_class_install_property (object_class, PROP_ROWSTRIDE, @@ -310,18 +340,22 @@ gdk_pixbuf_class_init (GdkPixbufClass *klass) G_MAXINT, 1, PIXBUF_PARAM_FLAGS)); - + /** + * GdkPixbuf:pixels: + * + * A pointer to the pixel data of the pixbuf. + */ g_object_class_install_property (object_class, PROP_PIXELS, g_param_spec_pointer ("pixels", _("Pixels"), _("A pointer to the pixel data of the pixbuf"), PIXBUF_PARAM_FLAGS)); - /** * GdkPixbuf::pixel-bytes: * * If set, this pixbuf was created from read-only #GBytes. + * * Replaces GdkPixbuf::pixels. * * Since: 2.32 @@ -529,8 +563,10 @@ free_buffer (guchar *pixels, gpointer data) * @height: Height of image in pixels, must be > 0 * * Calculates the rowstride that an image created with those values would - * have. This is useful for front-ends and backends that want to sanity - * check image values without needing to create them. + * have. + * + * This function is useful for front-ends and backends that want to check + * image values without needing to create a `GdkPixbuf`. * * Return value: the rowstride for the given values, or -1 in case of error. * @@ -568,12 +604,14 @@ gdk_pixbuf_calculate_rowstride (GdkColorspace colorspace, * @width: Width of image in pixels, must be > 0 * @height: Height of image in pixels, must be > 0 * - * Creates a new #GdkPixbuf structure and allocates a buffer for it. The - * buffer has an optimal rowstride. Note that the buffer is not cleared; + * Creates a new `GdkPixbuf` structure and allocates a buffer for it. + * + * If the allocation of the buffer failed, this function will return `NULL`. + * + * The buffer has an optimal rowstride. Note that the buffer is not cleared; * you will have to fill it completely yourself. * - * Return value: (nullable): A newly-created #GdkPixbuf with a reference count of 1, or - * %NULL if not enough memory could be allocated for the image buffer. + * Return value: (transfer full) (nullable): A newly-created pixel buffer **/ GdkPixbuf * gdk_pixbuf_new (GdkColorspace colorspace, @@ -606,12 +644,13 @@ gdk_pixbuf_new (GdkColorspace colorspace, * gdk_pixbuf_copy: * @pixbuf: A pixbuf. * - * Creates a new #GdkPixbuf with a copy of the information in the specified - * @pixbuf. Note that this does not copy the options set on the original #GdkPixbuf, + * Creates a new `GdkPixbuf` with a copy of the information in the specified + * `pixbuf`. + * + * Note that this does not copy the options set on the original `GdkPixbuf`, * use gdk_pixbuf_copy_options() for this. * - * Return value: (nullable) (transfer full): A newly-created pixbuf with a reference count of 1, or %NULL if - * not enough memory could be allocated. + * Return value: (nullable) (transfer full): A newly-created pixbuf **/ GdkPixbuf * gdk_pixbuf_copy (const GdkPixbuf *pixbuf) @@ -645,19 +684,20 @@ gdk_pixbuf_copy (const GdkPixbuf *pixbuf) /** * gdk_pixbuf_new_subpixbuf: - * @src_pixbuf: a #GdkPixbuf + * @src_pixbuf: a `GdkPixbuf` * @src_x: X coord in @src_pixbuf * @src_y: Y coord in @src_pixbuf * @width: width of region in @src_pixbuf * @height: height of region in @src_pixbuf * - * Creates a new pixbuf which represents a sub-region of @src_pixbuf. + * Creates a new pixbuf which represents a sub-region of `src_pixbuf`. + * * The new pixbuf shares its pixels with the original pixbuf, so * writing to one affects both. The new pixbuf holds a reference to - * @src_pixbuf, so @src_pixbuf will not be finalized until the new + * `src_pixbuf`, so `src_pixbuf` will not be finalized until the new * pixbuf is finalized. * - * Note that if @src_pixbuf is read-only, this function will force it + * Note that if `src_pixbuf` is read-only, this function will force it * to be mutable. * * Return value: (transfer full): a new pixbuf @@ -742,7 +782,7 @@ gdk_pixbuf_get_n_channels (const GdkPixbuf *pixbuf) * * Queries whether a pixbuf has an alpha channel (opacity information). * - * Return value: %TRUE if it has an alpha channel, %FALSE otherwise. + * Return value: `TRUE` if it has an alpha channel, `FALSE` otherwise. **/ gboolean gdk_pixbuf_get_has_alpha (const GdkPixbuf *pixbuf) @@ -774,12 +814,13 @@ gdk_pixbuf_get_bits_per_sample (const GdkPixbuf *pixbuf) * * Queries a pointer to the pixel data of a pixbuf. * - * Return value: (array): A pointer to the pixbuf's pixel data. - * Please see the section on [image data][image-data] for information - * about how the pixel data is stored in memory. - * * This function will cause an implicit copy of the pixbuf data if the * pixbuf was created from read-only data. + * + * Please see the section on [image data](#image-data) for information + * about how the pixel data is stored in memory. + * + * Return value: (array): A pointer to the pixbuf's pixel data. **/ guchar * gdk_pixbuf_get_pixels (const GdkPixbuf *pixbuf) @@ -820,13 +861,15 @@ downgrade_to_pixels (const GdkPixbuf *pixbuf) * * Queries a pointer to the pixel data of a pixbuf. * - * Return value: (array length=length): A pointer to the pixbuf's - * pixel data. Please see the section on [image data][image-data] - * for information about how the pixel data is stored in memory. - * * This function will cause an implicit copy of the pixbuf data if the * pixbuf was created from read-only data. * + * Please see the section on [image data](#image-data) for information + * about how the pixel data is stored in memory. + * + * Return value: (array length=length): A pointer to the pixbuf's + * pixel data. + * * Since: 2.26 */ guchar * @@ -848,10 +891,10 @@ gdk_pixbuf_get_pixels_with_length (const GdkPixbuf *pixbuf, * gdk_pixbuf_read_pixels: * @pixbuf: A pixbuf * - * Provides a read-only pointer to the raw pixel data; must not be - * modified. This function allows skipping the implicit copy that - * must be made if gdk_pixbuf_get_pixels() is called on a read-only - * pixbuf. + * Provides a read-only pointer to the raw pixel data. + * + * This function allows skipping the implicit copy that must be made + * if gdk_pixbuf_get_pixels() is called on a read-only pixbuf. * * Returns: a read-only pointer to the raw pixel data * @@ -883,9 +926,10 @@ gdk_pixbuf_read_pixels (const GdkPixbuf *pixbuf) * @pixbuf: A pixbuf * * Provides a #GBytes buffer containing the raw pixel data; the data - * must not be modified. This function allows skipping the implicit - * copy that must be made if gdk_pixbuf_get_pixels() is called on a - * read-only pixbuf. + * must not be modified. + * + * This function allows skipping the implicit copy that must be made + * if gdk_pixbuf_get_pixels() is called on a read-only pixbuf. * * Returns: (transfer full): A new reference to a read-only copy of * the pixel data. Note that for mutable pixbufs, this function will @@ -998,15 +1042,16 @@ gdk_pixbuf_error_quark (void) /** * gdk_pixbuf_fill: - * @pixbuf: a #GdkPixbuf - * @pixel: RGBA pixel to clear to - * (0xffffffff is opaque white, 0x00000000 transparent black) + * @pixbuf: a `GdkPixbuf` + * @pixel: RGBA pixel to used to clear (`0xffffffff` is opaque white, + * `0x00000000` transparent black) * * Clears a pixbuf to the given RGBA value, converting the RGBA value into - * the pixbuf's pixel format. The alpha will be ignored if the pixbuf - * doesn't have an alpha channel. - * - **/ + * the pixbuf's pixel format. + * + * The alpha component will be ignored if the pixbuf doesn't have an alpha + * channel. + */ void gdk_pixbuf_fill (GdkPixbuf *pixbuf, guint32 pixel) @@ -1065,7 +1110,7 @@ gdk_pixbuf_fill (GdkPixbuf *pixbuf, /** * gdk_pixbuf_get_option: - * @pixbuf: a #GdkPixbuf + * @pixbuf: a `GdkPixbuf` * @key: a nul-terminated string. * * Looks up @key in the list of options that may have been attached to the @@ -1084,8 +1129,7 @@ gdk_pixbuf_fill (GdkPixbuf *pixbuf, * Since 2.36.6, the JPEG loader sets the "comment" option with the comment * EXIF tag. * - * Return value: the value associated with @key. This is a nul-terminated - * string that should not be freed or %NULL if @key was not found. + * Return value: (transfer none) (nullable): the value associated with `key` **/ const gchar * gdk_pixbuf_get_option (GdkPixbuf *pixbuf, @@ -1111,15 +1155,14 @@ gdk_pixbuf_get_option (GdkPixbuf *pixbuf, /** * gdk_pixbuf_get_options: - * @pixbuf: a #GdkPixbuf + * @pixbuf: a `GdkPixbuf` * - * Returns a #GHashTable with a list of all the options that may have been - * attached to the @pixbuf when it was loaded, or that may have been - * attached by another function using gdk_pixbuf_set_option(). + * Returns a `GHashTable` with a list of all the options that may have been + * attached to the `pixbuf` when it was loaded, or that may have been + * attached by another function using [method@GdkPixbuf.Pixbuf.set_option]. * - * See gdk_pixbuf_get_option() for more details. - * - * Return value: (transfer container) (element-type utf8 utf8): a #GHashTable of key/values + * Return value: (transfer container) (element-type utf8 utf8): a #GHashTable + * of key/values pairs * * Since: 2.32 **/ @@ -1147,12 +1190,12 @@ gdk_pixbuf_get_options (GdkPixbuf *pixbuf) /** * gdk_pixbuf_remove_option: - * @pixbuf: a #GdkPixbuf + * @pixbuf: a `GdkPixbuf` * @key: a nul-terminated string representing the key to remove. * - * Remove the key/value pair option attached to a #GdkPixbuf. + * Removes the key/value pair option attached to a `GdkPixbuf`. * - * Return value: %TRUE if an option was removed, %FALSE if not. + * Return value: `TRUE` if an option was removed, `FALSE` if not. * * Since: 2.36 **/ @@ -1213,15 +1256,16 @@ gdk_pixbuf_remove_option (GdkPixbuf *pixbuf, /** * gdk_pixbuf_set_option: - * @pixbuf: a #GdkPixbuf + * @pixbuf: a `GdkPixbuf` * @key: a nul-terminated string. * @value: a nul-terminated string. * - * Attaches a key/value pair as an option to a #GdkPixbuf. If @key already - * exists in the list of options attached to @pixbuf, the new value is - * ignored and %FALSE is returned. + * Attaches a key/value pair as an option to a `GdkPixbuf`. + * + * If `key` already exists in the list of options attached to the `pixbuf`, + * the new value is ignored and `FALSE` is returned. * - * Return value: %TRUE on success. + * Return value: `TRUE` on success * * Since: 2.2 **/ @@ -1266,15 +1310,17 @@ gdk_pixbuf_set_option (GdkPixbuf *pixbuf, /** * gdk_pixbuf_copy_options: - * @src_pixbuf: a #GdkPixbuf to copy options from - * @dest_pixbuf: the #GdkPixbuf to copy options to + * @src_pixbuf: the source pixbuf + * @dest_pixbuf: the destination pixbuf + * + * Copies the key/value pair options attached to a `GdkPixbuf` to another + * `GdkPixbuf`. * - * Copy the key/value pair options attached to a #GdkPixbuf to another. * This is useful to keep original metadata after having manipulated * a file. However be careful to remove metadata which you've already * applied, such as the "orientation" option after rotating the image. * - * Return value: %TRUE on success. + * Return value: `TRUE` on success. * * Since: 2.36 **/ diff --git a/gdk-pixbuf/gdk-pixdata.c b/gdk-pixbuf/gdk-pixdata.c index df1036a9a..621167611 100644 --- a/gdk-pixbuf/gdk-pixdata.c +++ b/gdk-pixbuf/gdk-pixdata.c @@ -23,19 +23,32 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS /** - * SECTION:inline - * @Short_description: Functions for inlined pixbuf handling. - * @Title: Inline data + * GdkPixdata: + * @magic: magic number. A valid `GdkPixdata` structure must have + * `GDK_PIXBUF_MAGIC_NUMBER` here + * @length: less than 1 to disable length checks, otherwise + * `GDK_PIXDATA_HEADER_LENGTH` plus the length of `pixel_data` + * @pixdata_type: information about colorspace, sample width and + * encoding, in a `GdkPixdataType` + * @rowstride: Distance in bytes between rows + * @width: Width of the image in pixels + * @height: Height of the image in pixels + * @pixel_data: (array) (element-type guint8): `width` x `height` + * pixels, encoded according to `pixdata_type` and `rowstride` + * + * A pixel buffer suitable for serialization and streaming. * - * Using #GdkPixdata, images can be compiled into an application, + * Using `GdkPixdata`, images can be compiled into an application, * making it unnecessary to refer to external image files at runtime. - * GdkPixBuf includes a utility named gdk-pixbuf-csource, which - * can be used to convert image files into #GdkPixdata structures suitable - * for inclusion in C sources. To convert the #GdkPixdata structures back - * into #GdkPixbufs, use gdk_pixbuf_from_pixdata. * - * #GdkPixdata should not be used any more. #GResource should be used to save - * the original compressed images inside the program's binary. + * `GdkPixbuf` includes a utility named `gdk-pixbuf-csource`, which + * can be used to convert image files into `GdkPixdata` structures suitable + * for inclusion in C sources. To convert the `GdkPixdata` structures back + * into a `GdkPixbuf`, use `gdk_pixbuf_from_pixdata()`. + * + * Deprecated: 2.32: `GdkPixdata` should not be used any more. `GResource` + * should be used to save the original compressed images inside the + * program's binary */ #define APPEND g_string_append_printf @@ -189,20 +202,24 @@ get_uint32 (const guint8 *stream, guint *result) * @stream_length: length of the stream used for deserialization. * @stream: (array length=stream_length): stream of bytes containing a * serialized #GdkPixdata structure. - * @error: #GError location to indicate failures (maybe %NULL to ignore errors). + * @error: #GError location to indicate failures (maybe `NULL` to ignore errors). * * Deserializes (reconstruct) a #GdkPixdata structure from a byte stream. + * * The byte stream consists of a straightforward writeout of the - * #GdkPixdata fields in network byte order, plus the @pixel_data + * `GdkPixdata` fields in network byte order, plus the `pixel_data` * bytes the structure points to. - * The @pixdata contents are reconstructed byte by byte and are checked - * for validity. This function may fail with %GDK_PIXBUF_ERROR_CORRUPT_IMAGE - * or %GDK_PIXBUF_ERROR_UNKNOWN_TYPE. * - * Return value: Upon successful deserialization %TRUE is returned, - * %FALSE otherwise. + * The `pixdata` contents are reconstructed byte by byte and are checked + * for validity. * - * Deprecated: 2.32: Use #GResource instead. + * This function may fail with `GDK_PIXBUF_ERROR_CORRUPT_IMAGE` + * or `GDK_PIXBUF_ERROR_UNKNOWN_TYPE`. + * + * Return value: Upon successful deserialization `TRUE` is returned, + * `FALSE` otherwise. + * + * Deprecated: 2.32: Use `GResource` instead. **/ gboolean gdk_pixdata_deserialize (GdkPixdata *pixdata, @@ -320,17 +337,18 @@ free_buffer (guchar *pixels, gpointer data) /** * gdk_pixdata_from_pixbuf: (skip) - * @pixdata: a #GdkPixdata to fill. - * @pixbuf: the data to fill @pixdata with. + * @pixdata: a `GdkPixdata` to fill. + * @pixbuf: the data to fill `pixdata` with. * @use_rle: whether to use run-length encoding for the pixel data. * - * Converts a #GdkPixbuf to a #GdkPixdata. If @use_rle is %TRUE, the - * pixel data is run-length encoded into newly-allocated memory and a - * pointer to that memory is returned. + * Converts a `GdkPixbuf` to a `GdkPixdata`. + * + * If `use_rle` is `TRUE`, the pixel data is run-length encoded into + * newly-allocated memory and a pointer to that memory is returned. * - * Returns: (nullable): If @use_rle is %TRUE, a pointer to the - * newly-allocated memory for the run-length encoded pixel data, - * otherwise %NULL. + * Returns: (nullable) (array) (element-type guint8): If `use_rle` is + * `TRUE`, a pointer to the newly-allocated memory for the run-length + * encoded pixel data, otherwise `NULL`. * * Deprecated: 2.32: Use #GResource instead. **/ @@ -419,17 +437,20 @@ gdk_pixdata_from_pixbuf (GdkPixdata *pixdata, /** * gdk_pixbuf_from_pixdata: - * @pixdata: a #GdkPixdata to convert into a #GdkPixbuf. + * @pixdata: a #GdkPixdata to convert into a `GdkPixbuf`. * @copy_pixels: whether to copy raw pixel data; run-length encoded - * pixel data is always copied. + * pixel data is always copied. * @error: location to store possible errors. * - * Converts a #GdkPixdata to a #GdkPixbuf. If @copy_pixels is %TRUE or - * if the pixel data is run-length-encoded, the pixel data is copied into - * newly-allocated memory; otherwise it is reused. + * Converts a `GdkPixdata` to a `GdkPixbuf`. * - * Returns: (transfer full): a new #GdkPixbuf. - * Deprecated: 2.32: Use #GResource instead. + * If `copy_pixels` is `TRUE` or if the pixel data is run-length-encoded, + * the pixel data is copied into newly-allocated memory; otherwise it is + * reused. + * + * Returns: (transfer full): a new pixbuf + * + * Deprecated: 2.32: Use `GResource` instead. **/ GdkPixbuf* gdk_pixbuf_from_pixdata (const GdkPixdata *pixdata, @@ -689,20 +710,19 @@ save_rle_decoder (GString *gstring, /** * gdk_pixdata_to_csource: - * @pixdata: a #GdkPixdata to convert to C source. - * @name: used for naming generated data structures or macros. - * @dump_type: a #GdkPixdataDumpType determining the kind of C - * source to be generated. + * @pixdata: a `GdkPixdata` to convert to C source + * @name: used for naming generated data structures or macros + * @dump_type: the kind of C source to be generated * * Generates C source code suitable for compiling images directly * into programs. * - * gdk-pixbuf ships with a program called - * [gdk-pixbuf-csource][gdk-pixbuf-csource], which offers a command - * line interface to this function. + * GdkPixbuf ships with a program called `gdk-pixbuf-csource`, which offers + * a command line interface to this function. + * + * Returns: (transfer full): a newly-allocated string buffer containing + * the C source form of `pixdata`. * - * Returns: a newly-allocated string containing the C source form - * of @pixdata. * Deprecated: 2.32: Use #GResource instead. **/ GString* @@ -930,49 +950,51 @@ gdk_pixdata_to_csource (GdkPixdata *pixdata, /** * gdk_pixbuf_new_from_inline: - * @data_length: Length in bytes of the @data argument or -1 to - * disable length checks + * @data_length: Length in bytes of the `data` argument or -1 to + * disable length checks * @data: (array length=data_length): Byte data containing a - * serialized #GdkPixdata structure + * serialized `GdkPixdata` structure * @copy_pixels: Whether to copy the pixel data, or use direct pointers - * @data for the resulting pixbuf - * @error: #GError return location, may be %NULL to ignore errors + * `data` for the resulting pixbuf + * @error: #GError return location, may be `NULL` to ignore errors * - * Create a #GdkPixbuf from a flat representation that is suitable for - * storing as inline data in a program. This is useful if you want to - * ship a program with images, but don't want to depend on any - * external files. + * Creates a `GdkPixbuf` from a flat representation that is suitable for + * storing as inline data in a program. + * + * This is useful if you want to ship a program with images, but don't want + * to depend on any external files. + * + * GdkPixbuf ships with a program called `gdk-pixbuf-csource`, which allows + * for conversion of `GdkPixbuf`s into such a inline representation. * - * gdk-pixbuf ships with a program called [gdk-pixbuf-csource][gdk-pixbuf-csource], - * which allows for conversion of #GdkPixbufs into such a inline representation. * In almost all cases, you should pass the `--raw` option to * `gdk-pixbuf-csource`. A sample invocation would be: * - * |[ - * gdk-pixbuf-csource --raw --name=myimage_inline myimage.png - * ]| + * ``` + * gdk-pixbuf-csource --raw --name=myimage_inline myimage.png + * ``` * * For the typical case where the inline pixbuf is read-only static data, * you don't need to copy the pixel data unless you intend to write to - * it, so you can pass %FALSE for @copy_pixels. (If you pass `--rle` to - * `gdk-pixbuf-csource`, a copy will be made even if @copy_pixels is %FALSE, - * so using this option is generally a bad idea.) + * it, so you can pass `FALSE` for `copy_pixels`. If you pass `--rle` to + * `gdk-pixbuf-csource`, a copy will be made even if `copy_pixels` is `FALSE`, + * so using this option is generally a bad idea. * * If you create a pixbuf from const inline data compiled into your * program, it's probably safe to ignore errors and disable length checks, * since things will always succeed: - * |[ + * + * ```c * pixbuf = gdk_pixbuf_new_from_inline (-1, myimage_inline, FALSE, NULL); - * ]| + * ``` * * For non-const inline data, you could get out of memory. For untrusted * inline data located at runtime, you could have corrupt inline data in * addition. * - * Return value: A newly-created #GdkPixbuf structure with a reference, - * count of 1, or %NULL if an error occurred. + * Return value: A newly-created pixbuf * - * Deprecated: 2.32: Use #GResource instead. + * Deprecated: 2.32: Use `GResource` instead. **/ GdkPixbuf* gdk_pixbuf_new_from_inline (gint data_length, diff --git a/gdk-pixbuf/gdk-pixdata.h b/gdk-pixbuf/gdk-pixdata.h index 0aa2a2550..4c25698a2 100644 --- a/gdk-pixbuf/gdk-pixdata.h +++ b/gdk-pixbuf/gdk-pixdata.h @@ -47,7 +47,9 @@ G_BEGIN_DECLS * * An enumeration containing three sets of flags for a #GdkPixdata struct: * one for the used colorspace, one for the width of the samples and one - * for the encoding of the pixel data. + * for the encoding of the pixel data. + * + * Deprecated: 2.32 **/ typedef enum { @@ -64,23 +66,6 @@ typedef enum GDK_PIXDATA_ENCODING_MASK = 0x0f << 24 } GdkPixdataType; -/** - * GdkPixdata: - * @magic: magic number. A valid #GdkPixdata structure must have - * #GDK_PIXBUF_MAGIC_NUMBER here. - * @length: less than 1 to disable length checks, otherwise - * #GDK_PIXDATA_HEADER_LENGTH + length of @pixel_data. - * @pixdata_type: information about colorspace, sample width and - * encoding, in a #GdkPixdataType. - * @rowstride: Distance in bytes between rows. - * @width: Width of the image in pixels. - * @height: Height of the image in pixels. - * @pixel_data: (array) (element-type guint8): @width x @height pixels, encoded according to @pixdata_type - * and @rowstride. - * - * A #GdkPixdata contains pixbuf information in a form suitable for - * serialization and streaming. - **/ typedef struct _GdkPixdata GdkPixdata; struct _GdkPixdata { @@ -99,6 +84,8 @@ struct _GdkPixdata * GDK_PIXDATA_HEADER_LENGTH: * * The length of a #GdkPixdata structure without the @pixel_data pointer. + * + * Deprecated: 2.32 **/ #define GDK_PIXDATA_HEADER_LENGTH (4 + 4 + 4 + 4 + 4 + 4) @@ -145,7 +132,9 @@ GdkPixbuf* gdk_pixbuf_from_pixdata (const GdkPixdata *pixdata, * @GDK_PIXDATA_DUMP_PIXDATA_STREAM, @GDK_PIXDATA_DUMP_PIXDATA_STRUCT * and @GDK_PIXDATA_DUMP_MACROS are mutually exclusive, as are * @GDK_PIXBUF_DUMP_GTYPES and @GDK_PIXBUF_DUMP_CTYPES. The remaining - * elements are optional flags that can be freely added. + * elements are optional flags that can be freely added. + * + * Deprecated: 2.32 **/ typedef enum { diff --git a/meson.build b/meson.build index 1acc43595..7880577dc 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gdk-pixbuf', 'c', - version: '2.42.3', + version: '2.42.5', license: 'LGPL-2.1-or-later', default_options: [ 'buildtype=debugoptimized', @@ -94,7 +94,7 @@ if cc.has_function('lrint', dependencies: mathlib_dep) endif intl_dep = cc.find_library('intl', required: false) -if cc.has_function('bind_textdomain_codeset', prefix: '#include <libintl.h>', dependency: intl_dep) +if cc.has_function('bind_textdomain_codeset', prefix: '#include <libintl.h>', dependencies: intl_dep) gdk_pixbuf_conf.set('HAVE_BIND_TEXTDOMAIN_CODESET', 1) endif @@ -408,6 +408,10 @@ if not meson.is_cross_build() endif endif +if not meson.is_subproject() + meson.add_dist_script('build-aux/dist.py') +endif + summary = [ '', 'GDK-Pixbuf @0@'.format(meson.project_version()), diff --git a/meson_options.txt b/meson_options.txt index 930f3bdf8..b6d82e9b6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -15,7 +15,7 @@ option('builtin_loaders', type: 'string', value: 'none') option('gtk_doc', - description: 'Whether to generate the API reference (requires GTK-Doc)', + description: 'Whether to generate the API reference', type: 'boolean', value: false) option('docs', diff --git a/po/en_GB.po b/po/en_GB.po index 894f1976c..005ed4a2d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,14 +4,14 @@ # Abigail Brady <morwen@evilmagic.org>, Gareth Owen <gowen72@yahoo.com> 2004 # Bruce Cowan <bruce@bcowan.eu>, 2009, 2010, 2012, 2018. # Philip Withnall <philip@tecnocode.co.uk>, 2010. -# Zander Brown <zbrown@gnome.org>, 2019. +# Zander Brown <zbrown@gnome.org>, 2019-2021. # msgid "" msgstr "" "Project-Id-Version: gtk+\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gdk-pixbuf/issues\n" -"POT-Creation-Date: 2019-07-29 22:11+0000\n" -"PO-Revision-Date: 2019-08-25 17:02+0100\n" +"POT-Creation-Date: 2020-12-12 18:15+0000\n" +"PO-Revision-Date: 2021-02-18 21:04+0000\n" "Last-Translator: Zander Brown <zbrown@gnome.org>\n" "Language-Team: English - United Kingdom <en_GB@li.org>\n" "Language: en_GB\n" @@ -19,20 +19,20 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 3.32.1\n" +"X-Generator: Gtranslator 3.38.0\n" -#: gdk-pixbuf/gdk-pixbuf-animation.c:158 gdk-pixbuf/gdk-pixbuf-io.c:1115 -#: gdk-pixbuf/gdk-pixbuf-io.c:1377 +#: gdk-pixbuf/gdk-pixbuf-animation.c:175 gdk-pixbuf/gdk-pixbuf-io.c:1125 +#: gdk-pixbuf/gdk-pixbuf-io.c:1387 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Failed to open file “%s”: %s" -#: gdk-pixbuf/gdk-pixbuf-animation.c:171 gdk-pixbuf/gdk-pixbuf-io.c:999 +#: gdk-pixbuf/gdk-pixbuf-animation.c:188 gdk-pixbuf/gdk-pixbuf-io.c:992 #, c-format msgid "Image file “%s” contains no data" msgstr "Image file “%s” contains no data" -#: gdk-pixbuf/gdk-pixbuf-animation.c:209 +#: gdk-pixbuf/gdk-pixbuf-animation.c:226 #, c-format msgid "" "Failed to load animation “%s”: reason not known, probably a corrupt " @@ -41,94 +41,94 @@ msgstr "" "Failed to load animation “%s”: reason not known, probably a corrupt " "animation file" -#: gdk-pixbuf/gdk-pixbuf-animation.c:277 gdk-pixbuf/gdk-pixbuf-io.c:1151 -#: gdk-pixbuf/gdk-pixbuf-io.c:1429 +#: gdk-pixbuf/gdk-pixbuf-animation.c:294 gdk-pixbuf/gdk-pixbuf-io.c:1161 +#: gdk-pixbuf/gdk-pixbuf-io.c:1439 #, c-format msgid "" "Failed to load image “%s”: reason not known, probably a corrupt image file" msgstr "" "Failed to load image “%s”: reason not known, probably a corrupt image file" -#: gdk-pixbuf/gdk-pixbuf.c:166 +#: gdk-pixbuf/gdk-pixbuf.c:237 msgid "Number of Channels" msgstr "Number of Channels" -#: gdk-pixbuf/gdk-pixbuf.c:167 +#: gdk-pixbuf/gdk-pixbuf.c:238 msgid "The number of samples per pixel" msgstr "The number of samples per pixel" -#: gdk-pixbuf/gdk-pixbuf.c:176 +#: gdk-pixbuf/gdk-pixbuf.c:247 msgid "Colorspace" msgstr "Colourspace" -#: gdk-pixbuf/gdk-pixbuf.c:177 +#: gdk-pixbuf/gdk-pixbuf.c:248 msgid "The colorspace in which the samples are interpreted" msgstr "The colourspace in which the samples are interpreted" -#: gdk-pixbuf/gdk-pixbuf.c:185 +#: gdk-pixbuf/gdk-pixbuf.c:256 msgid "Has Alpha" msgstr "Has Alpha" -#: gdk-pixbuf/gdk-pixbuf.c:186 +#: gdk-pixbuf/gdk-pixbuf.c:257 msgid "Whether the pixbuf has an alpha channel" msgstr "Whether the pixbuf has an alpha channel" -#: gdk-pixbuf/gdk-pixbuf.c:199 +#: gdk-pixbuf/gdk-pixbuf.c:270 msgid "Bits per Sample" msgstr "Bits per Sample" -#: gdk-pixbuf/gdk-pixbuf.c:200 +#: gdk-pixbuf/gdk-pixbuf.c:271 msgid "The number of bits per sample" msgstr "The number of bits per sample" -#: gdk-pixbuf/gdk-pixbuf.c:209 +#: gdk-pixbuf/gdk-pixbuf.c:280 msgid "Width" msgstr "Width" -#: gdk-pixbuf/gdk-pixbuf.c:210 +#: gdk-pixbuf/gdk-pixbuf.c:281 msgid "The number of columns of the pixbuf" msgstr "The number of columns of the pixbuf" -#: gdk-pixbuf/gdk-pixbuf.c:219 +#: gdk-pixbuf/gdk-pixbuf.c:290 msgid "Height" msgstr "Height" -#: gdk-pixbuf/gdk-pixbuf.c:220 +#: gdk-pixbuf/gdk-pixbuf.c:291 msgid "The number of rows of the pixbuf" msgstr "The number of rows of the pixbuf" -#: gdk-pixbuf/gdk-pixbuf.c:236 +#: gdk-pixbuf/gdk-pixbuf.c:307 msgid "Rowstride" msgstr "Rowstride" -#: gdk-pixbuf/gdk-pixbuf.c:237 +#: gdk-pixbuf/gdk-pixbuf.c:308 msgid "" "The number of bytes between the start of a row and the start of the next row" msgstr "" "The number of bytes between the start of a row and the start of the next row" -#: gdk-pixbuf/gdk-pixbuf.c:246 +#: gdk-pixbuf/gdk-pixbuf.c:317 msgid "Pixels" msgstr "Pixels" -#: gdk-pixbuf/gdk-pixbuf.c:247 +#: gdk-pixbuf/gdk-pixbuf.c:318 msgid "A pointer to the pixel data of the pixbuf" msgstr "A pointer to the pixel data of the pixbuf" -#: gdk-pixbuf/gdk-pixbuf.c:261 +#: gdk-pixbuf/gdk-pixbuf.c:332 msgid "Pixel Bytes" msgstr "Pixel Bytes" -#: gdk-pixbuf/gdk-pixbuf.c:262 +#: gdk-pixbuf/gdk-pixbuf.c:333 msgid "Readonly pixel data" msgstr "Readonly pixel data" -#: gdk-pixbuf/gdk-pixbuf-io.c:819 +#: gdk-pixbuf/gdk-pixbuf-io.c:812 #, c-format msgid "Unable to load image-loading module: %s: %s" msgstr "Unable to load image-loading module: %s: %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:834 +#: gdk-pixbuf/gdk-pixbuf-io.c:827 #, c-format msgid "" "Image-loading module %s does not export the proper interface; perhaps it’s " @@ -137,53 +137,53 @@ msgstr "" "Image-loading module %s does not export the proper interface; perhaps it’s " "from a different gdk-pixbuf version?" -#: gdk-pixbuf/gdk-pixbuf-io.c:843 gdk-pixbuf/gdk-pixbuf-io.c:886 +#: gdk-pixbuf/gdk-pixbuf-io.c:836 gdk-pixbuf/gdk-pixbuf-io.c:879 #, c-format msgid "Image type “%s” is not supported" msgstr "Image type “%s” is not supported" -#: gdk-pixbuf/gdk-pixbuf-io.c:971 +#: gdk-pixbuf/gdk-pixbuf-io.c:964 #, c-format msgid "Couldn’t recognize the image file format for file “%s”" msgstr "Couldn’t recognise the image file format for file “%s”" -#: gdk-pixbuf/gdk-pixbuf-io.c:979 +#: gdk-pixbuf/gdk-pixbuf-io.c:972 msgid "Unrecognized image file format" msgstr "Unrecognised image file format" -#: gdk-pixbuf/gdk-pixbuf-io.c:1162 +#: gdk-pixbuf/gdk-pixbuf-io.c:1172 #, c-format msgid "Failed to load image “%s”: %s" msgstr "Failed to load image “%s”: %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2232 gdk-pixbuf/io-gdip-utils.c:838 +#: gdk-pixbuf/gdk-pixbuf-io.c:2242 gdk-pixbuf/io-gdip-utils.c:840 #, c-format msgid "Error writing to image file: %s" msgstr "Error writing to image file: %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2274 gdk-pixbuf/gdk-pixbuf-io.c:2395 +#: gdk-pixbuf/gdk-pixbuf-io.c:2284 gdk-pixbuf/gdk-pixbuf-io.c:2405 #, c-format msgid "This build of gdk-pixbuf does not support saving the image format: %s" msgstr "This build of gdk-pixbuf does not support saving the image format: %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2305 +#: gdk-pixbuf/gdk-pixbuf-io.c:2315 msgid "Insufficient memory to save image to callback" msgstr "Insufficient memory to save image to callback" -#: gdk-pixbuf/gdk-pixbuf-io.c:2318 +#: gdk-pixbuf/gdk-pixbuf-io.c:2328 msgid "Failed to open temporary file" msgstr "Failed to open temporary file" -#: gdk-pixbuf/gdk-pixbuf-io.c:2341 +#: gdk-pixbuf/gdk-pixbuf-io.c:2351 msgid "Failed to read from temporary file" msgstr "Failed to read from temporary file" -#: gdk-pixbuf/gdk-pixbuf-io.c:2551 +#: gdk-pixbuf/gdk-pixbuf-io.c:2561 #, c-format msgid "Failed to open “%s” for writing: %s" msgstr "Failed to open “%s” for writing: %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2577 +#: gdk-pixbuf/gdk-pixbuf-io.c:2587 #, c-format msgid "" "Failed to close “%s” while writing image, all data may not have been saved: " @@ -192,11 +192,11 @@ msgstr "" "Failed to close “%s” while writing image, all data may not have been saved: " "%s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2798 gdk-pixbuf/gdk-pixbuf-io.c:2850 +#: gdk-pixbuf/gdk-pixbuf-io.c:2808 gdk-pixbuf/gdk-pixbuf-io.c:2860 msgid "Insufficient memory to save image into a buffer" msgstr "Insufficient memory to save image into a buffer" -#: gdk-pixbuf/gdk-pixbuf-io.c:2896 +#: gdk-pixbuf/gdk-pixbuf-io.c:2906 msgid "Error writing to image stream" msgstr "Error writing to image stream" @@ -242,36 +242,36 @@ msgid_plural "failed to allocate image buffer of %u bytes" msgstr[0] "failed to allocate image buffer of %u byte" msgstr[1] "failed to allocate image buffer of %u bytes" -#: gdk-pixbuf/io-ani.c:241 +#: gdk-pixbuf/io-ani.c:239 msgid "Unexpected icon chunk in animation" msgstr "Unexpected icon chunk in animation" -#: gdk-pixbuf/io-ani.c:339 gdk-pixbuf/io-ani.c:397 gdk-pixbuf/io-ani.c:423 -#: gdk-pixbuf/io-ani.c:446 gdk-pixbuf/io-ani.c:473 gdk-pixbuf/io-ani.c:560 +#: gdk-pixbuf/io-ani.c:337 gdk-pixbuf/io-ani.c:395 gdk-pixbuf/io-ani.c:421 +#: gdk-pixbuf/io-ani.c:444 gdk-pixbuf/io-ani.c:471 gdk-pixbuf/io-ani.c:558 msgid "Invalid header in animation" msgstr "Invalid header in animation" -#: gdk-pixbuf/io-ani.c:349 gdk-pixbuf/io-ani.c:371 gdk-pixbuf/io-ani.c:455 -#: gdk-pixbuf/io-ani.c:482 gdk-pixbuf/io-ani.c:533 gdk-pixbuf/io-ani.c:605 +#: gdk-pixbuf/io-ani.c:347 gdk-pixbuf/io-ani.c:369 gdk-pixbuf/io-ani.c:453 +#: gdk-pixbuf/io-ani.c:480 gdk-pixbuf/io-ani.c:531 gdk-pixbuf/io-ani.c:607 msgid "Not enough memory to load animation" msgstr "Not enough memory to load animation" -#: gdk-pixbuf/io-ani.c:389 gdk-pixbuf/io-ani.c:415 gdk-pixbuf/io-ani.c:434 +#: gdk-pixbuf/io-ani.c:387 gdk-pixbuf/io-ani.c:413 gdk-pixbuf/io-ani.c:432 msgid "Malformed chunk in animation" msgstr "Malformed chunk in animation" -#: gdk-pixbuf/io-ani.c:627 +#: gdk-pixbuf/io-ani.c:629 msgid "ANI image was truncated or incomplete." msgstr "ANI image was truncated or incomplete." -#: gdk-pixbuf/io-ani.c:668 +#: gdk-pixbuf/io-ani.c:670 msgctxt "image format" msgid "Windows animated cursor" msgstr "Windows animated cursor" #: gdk-pixbuf/io-bmp.c:231 gdk-pixbuf/io-bmp.c:269 gdk-pixbuf/io-bmp.c:376 #: gdk-pixbuf/io-bmp.c:403 gdk-pixbuf/io-bmp.c:428 gdk-pixbuf/io-bmp.c:463 -#: gdk-pixbuf/io-bmp.c:485 gdk-pixbuf/io-bmp.c:564 +#: gdk-pixbuf/io-bmp.c:485 gdk-pixbuf/io-bmp.c:563 msgid "BMP image has bogus header data" msgstr "BMP image has bogus header data" @@ -299,28 +299,29 @@ msgstr "Topdown BMP images cannot be compressed" msgid "BMP image width too large" msgstr "BMP image width too large" -#: gdk-pixbuf/io-bmp.c:788 gdk-pixbuf/io-png.c:560 gdk-pixbuf/io-pnm.c:722 +#: gdk-pixbuf/io-bmp.c:792 gdk-pixbuf/io-png.c:564 gdk-pixbuf/io-pnm.c:722 +#: gdk-pixbuf/io-pnm.c:879 msgid "Premature end-of-file encountered" msgstr "Premature end-of-file encountered" -#: gdk-pixbuf/io-bmp.c:1314 +#: gdk-pixbuf/io-bmp.c:1313 #, c-format msgid "Error while decoding colormap" msgstr "Error while decoding colourmap" -#: gdk-pixbuf/io-bmp.c:1377 gdk-pixbuf/io-bmp.c:1389 +#: gdk-pixbuf/io-bmp.c:1376 gdk-pixbuf/io-bmp.c:1388 msgid "Image is too wide for BMP format." msgstr "Image is too wide for BMP format." -#: gdk-pixbuf/io-bmp.c:1422 +#: gdk-pixbuf/io-bmp.c:1421 msgid "Couldn’t allocate memory for saving BMP file" msgstr "Couldn’t allocate memory for saving BMP file" -#: gdk-pixbuf/io-bmp.c:1463 +#: gdk-pixbuf/io-bmp.c:1462 msgid "Couldn’t write to BMP file" msgstr "Couldn’t write to BMP file" -#: gdk-pixbuf/io-bmp.c:1516 gdk-pixbuf/io-gdip-bmp.c:83 +#: gdk-pixbuf/io-bmp.c:1515 gdk-pixbuf/io-gdip-bmp.c:83 msgctxt "image format" msgid "BMP" msgstr "BMP" @@ -330,17 +331,17 @@ msgctxt "image format" msgid "EMF" msgstr "EMF" -#: gdk-pixbuf/io-gdip-gif.c:81 gdk-pixbuf/io-gif.c:1121 +#: gdk-pixbuf/io-gdip-gif.c:81 gdk-pixbuf/io-gif.c:1044 msgctxt "image format" msgid "GIF" msgstr "GIF" -#: gdk-pixbuf/io-gdip-ico.c:60 gdk-pixbuf/io-ico.c:1410 +#: gdk-pixbuf/io-gdip-ico.c:60 gdk-pixbuf/io-ico.c:1412 msgctxt "image format" msgid "Windows icon" msgstr "Windows icon" -#: gdk-pixbuf/io-gdip-jpeg.c:54 gdk-pixbuf/io-jpeg.c:1383 +#: gdk-pixbuf/io-gdip-jpeg.c:54 gdk-pixbuf/io-jpeg.c:1382 #, c-format msgid "" "JPEG quality must be a value between 0 and 100; value “%s” could not be " @@ -349,19 +350,19 @@ msgstr "" "JPEG quality must be a value between 0 and 100; value “%s” could not be " "parsed." -#: gdk-pixbuf/io-gdip-jpeg.c:69 gdk-pixbuf/io-jpeg.c:1399 +#: gdk-pixbuf/io-gdip-jpeg.c:69 gdk-pixbuf/io-jpeg.c:1398 #, c-format msgid "" "JPEG quality must be a value between 0 and 100; value “%d” is not allowed." msgstr "" "JPEG quality must be a value between 0 and 100; value “%d” is not allowed." -#: gdk-pixbuf/io-gdip-jpeg.c:147 gdk-pixbuf/io-jpeg.c:1683 +#: gdk-pixbuf/io-gdip-jpeg.c:147 gdk-pixbuf/io-jpeg.c:1682 msgctxt "image format" msgid "JPEG" msgstr "JPEG" -#: gdk-pixbuf/io-gdip-tiff.c:83 gdk-pixbuf/io-tiff.c:1082 +#: gdk-pixbuf/io-gdip-tiff.c:83 gdk-pixbuf/io-tiff.c:1086 msgctxt "image format" msgid "TIFF" msgstr "TIFF" @@ -387,19 +388,19 @@ msgstr "Could not seek stream: %s" msgid "Could not read from stream: %s" msgstr "Could not read from stream: %s" -#: gdk-pixbuf/io-gdip-utils.c:618 +#: gdk-pixbuf/io-gdip-utils.c:620 msgid "Couldn’t load bitmap" msgstr "Couldn’t load bitmap" -#: gdk-pixbuf/io-gdip-utils.c:774 +#: gdk-pixbuf/io-gdip-utils.c:776 msgid "Couldn’t load metafile" msgstr "Couldn’t load metafile" -#: gdk-pixbuf/io-gdip-utils.c:879 +#: gdk-pixbuf/io-gdip-utils.c:881 msgid "Unsupported image format for GDI+" msgstr "Unsupported image format for GDI+" -#: gdk-pixbuf/io-gdip-utils.c:886 +#: gdk-pixbuf/io-gdip-utils.c:888 msgid "Couldn’t save" msgstr "Couldn’t save" @@ -408,34 +409,34 @@ msgctxt "image format" msgid "WMF" msgstr "WMF" -#: gdk-pixbuf/io-gif.c:187 +#: gdk-pixbuf/io-gif.c:158 #, c-format msgid "Failure reading GIF: %s" msgstr "Failure reading GIF: %s" -#: gdk-pixbuf/io-gif.c:436 gdk-pixbuf/io-gif.c:883 gdk-pixbuf/io-gif.c:935 -#: gdk-pixbuf/io-gif.c:1058 +#: gdk-pixbuf/io-gif.c:381 gdk-pixbuf/io-gif.c:855 gdk-pixbuf/io-gif.c:908 +#: gdk-pixbuf/io-gif.c:981 msgid "Not enough memory to load GIF file" msgstr "Not enough memory to load GIF file" -#: gdk-pixbuf/io-gif.c:562 +#: gdk-pixbuf/io-gif.c:507 msgid "GIF image is corrupt (incorrect LZW compression)" msgstr "GIF image is corrupt (incorrect LZW compression)" -#: gdk-pixbuf/io-gif.c:590 +#: gdk-pixbuf/io-gif.c:536 msgid "File does not appear to be a GIF file" msgstr "File does not appear to be a GIF file" -#: gdk-pixbuf/io-gif.c:605 +#: gdk-pixbuf/io-gif.c:551 #, c-format msgid "Version %s of the GIF file format is not supported" msgstr "Version %s of the GIF file format is not supported" -#: gdk-pixbuf/io-gif.c:646 +#: gdk-pixbuf/io-gif.c:586 msgid "Resulting GIF image has zero size" msgstr "Resulting GIF image has zero size" -#: gdk-pixbuf/io-gif.c:725 +#: gdk-pixbuf/io-gif.c:664 msgid "" "GIF image has no global colormap, and a frame inside it has no local " "colormap." @@ -443,15 +444,15 @@ msgstr "" "GIF image has no global colourmap, and a frame inside it has no local " "colourmap." -#: gdk-pixbuf/io-gif.c:896 gdk-pixbuf/io-gif.c:1070 +#: gdk-pixbuf/io-gif.c:868 gdk-pixbuf/io-gif.c:993 msgid "GIF file was missing some data (perhaps it was truncated somehow?)" msgstr "GIF file was missing some data (perhaps it was truncated somehow?)" -#: gdk-pixbuf/io-gif.c:958 +#: gdk-pixbuf/io-gif.c:927 msgid "GIF image was truncated or incomplete." msgstr "GIF image was truncated or incomplete." -#: gdk-pixbuf/io-gif.c:965 +#: gdk-pixbuf/io-gif.c:934 msgid "Not all frames of the GIF image were loaded." msgstr "Not all frames of the GIF image were loaded." @@ -460,11 +461,11 @@ msgstr "Not all frames of the GIF image were loaded." msgid "Error reading ICNS image: %s" msgstr "Error reading ICNS image: %s" -#: gdk-pixbuf/io-icns.c:380 gdk-pixbuf/io-icns.c:457 +#: gdk-pixbuf/io-icns.c:380 gdk-pixbuf/io-icns.c:461 msgid "Could not decode ICNS file" msgstr "Could not decode ICNS file" -#: gdk-pixbuf/io-icns.c:516 +#: gdk-pixbuf/io-icns.c:517 msgctxt "image format" msgid "MacOS X icon" msgstr "MacOS X icon" @@ -492,60 +493,27 @@ msgstr "Compressed icons are not supported" msgid "Unsupported icon type" msgstr "Unsupported icon type" -#: gdk-pixbuf/io-ico.c:581 +#: gdk-pixbuf/io-ico.c:583 msgid "Not enough memory to load ICO file" msgstr "Not enough memory to load ICO file" -#: gdk-pixbuf/io-ico.c:627 +#: gdk-pixbuf/io-ico.c:629 msgid "ICO image was truncated or incomplete." msgstr "ICO image was truncated or incomplete." -#: gdk-pixbuf/io-ico.c:1068 +#: gdk-pixbuf/io-ico.c:1070 msgid "Image too large to be saved as ICO" msgstr "Image too large to be saved as ICO" -#: gdk-pixbuf/io-ico.c:1079 +#: gdk-pixbuf/io-ico.c:1081 msgid "Cursor hotspot outside image" msgstr "Cursor hotspot outside image" -#: gdk-pixbuf/io-ico.c:1102 +#: gdk-pixbuf/io-ico.c:1104 #, c-format msgid "Unsupported depth for ICO file: %d" msgstr "Unsupported depth for ICO file: %d" -#: gdk-pixbuf/io-jasper.c:74 -msgid "Couldn’t allocate memory for stream" -msgstr "Couldn’t allocate memory for stream" - -#: gdk-pixbuf/io-jasper.c:125 -msgid "Couldn’t decode image" -msgstr "Couldn’t decode image" - -#: gdk-pixbuf/io-jasper.c:143 -msgid "Transformed JPEG2000 has zero width or height" -msgstr "Transformed JPEG2000 has zero width or height" - -#: gdk-pixbuf/io-jasper.c:159 -msgid "Image type currently not supported" -msgstr "Image type currently not supported" - -#: gdk-pixbuf/io-jasper.c:171 gdk-pixbuf/io-jasper.c:179 -msgid "Couldn’t allocate memory for color profile" -msgstr "Couldn’t allocate memory for colour profile" - -#: gdk-pixbuf/io-jasper.c:205 gdk-pixbuf/io-jasper.c:230 -msgid "Insufficient memory to open JPEG 2000 file" -msgstr "Insufficient memory to open JPEG 2000 file" - -#: gdk-pixbuf/io-jasper.c:292 -msgid "Couldn’t allocate memory to buffer image data" -msgstr "Couldn’t allocate memory to buffer image data" - -#: gdk-pixbuf/io-jasper.c:336 -msgctxt "image format" -msgid "JPEG 2000" -msgstr "JPEG 2000" - #: gdk-pixbuf/io-jpeg.c:129 #, c-format msgid "Error interpreting JPEG image file (%s)" @@ -559,17 +527,17 @@ msgstr "" "Insufficient memory to load image, try exiting some applications to free " "memory" -#: gdk-pixbuf/io-jpeg.c:710 gdk-pixbuf/io-jpeg.c:943 +#: gdk-pixbuf/io-jpeg.c:710 gdk-pixbuf/io-jpeg.c:947 #, c-format msgid "Unsupported JPEG color space (%s)" msgstr "Unsupported JPEG colour space (%s)" -#: gdk-pixbuf/io-jpeg.c:821 gdk-pixbuf/io-jpeg.c:1142 gdk-pixbuf/io-jpeg.c:1490 -#: gdk-pixbuf/io-jpeg.c:1500 +#: gdk-pixbuf/io-jpeg.c:825 gdk-pixbuf/io-jpeg.c:1142 gdk-pixbuf/io-jpeg.c:1489 +#: gdk-pixbuf/io-jpeg.c:1499 msgid "Couldn’t allocate memory for loading JPEG file" msgstr "Couldn’t allocate memory for loading JPEG file" -#: gdk-pixbuf/io-jpeg.c:1099 +#: gdk-pixbuf/io-jpeg.c:1100 msgid "Transformed JPEG has zero width or height." msgstr "Transformed JPEG has zero width or height." @@ -578,21 +546,21 @@ msgstr "Transformed JPEG has zero width or height." msgid "Unsupported number of color components (%d)" msgstr "Unsupported number of colour components (%d)" -#: gdk-pixbuf/io-jpeg.c:1420 +#: gdk-pixbuf/io-jpeg.c:1419 #, c-format msgid "" "JPEG x-dpi must be a value between 1 and 65535; value “%s” is not allowed." msgstr "" "JPEG x-dpi must be a value between 1 and 65535; value “%s” is not allowed." -#: gdk-pixbuf/io-jpeg.c:1441 +#: gdk-pixbuf/io-jpeg.c:1440 #, c-format msgid "" "JPEG y-dpi must be a value between 1 and 65535; value “%s” is not allowed." msgstr "" "JPEG y-dpi must be a value between 1 and 65535; value “%s” is not allowed." -#: gdk-pixbuf/io-jpeg.c:1455 +#: gdk-pixbuf/io-jpeg.c:1454 #, c-format msgid "Color profile has invalid length “%u”." msgstr "Colour profile has invalid length “%u”." @@ -601,7 +569,7 @@ msgstr "Colour profile has invalid length “%u”." msgid "Bits per channel of PNG image is invalid." msgstr "Bits per channel of PNG image is invalid." -#: gdk-pixbuf/io-png.c:144 gdk-pixbuf/io-png.c:700 +#: gdk-pixbuf/io-png.c:144 gdk-pixbuf/io-png.c:703 msgid "Transformed PNG has zero width or height." msgstr "Transformed PNG has zero width or height." @@ -626,12 +594,11 @@ msgstr "Fatal error in PNG image file: %s" msgid "Insufficient memory to load PNG file" msgstr "Insufficient memory to load PNG file" -#: gdk-pixbuf/io-png.c:494 gdk-pixbuf/io-png.c:515 -#| msgid "Couldn’t allocate memory for loading JPEG file" +#: gdk-pixbuf/io-png.c:498 gdk-pixbuf/io-png.c:519 msgid "Couldn’t allocate memory for loading PNG" msgstr "Couldn’t allocate memory for loading PNG" -#: gdk-pixbuf/io-png.c:713 +#: gdk-pixbuf/io-png.c:716 #, c-format msgid "" "Insufficient memory to store a %lu by %lu image; try exiting some " @@ -640,65 +607,64 @@ msgstr "" "Insufficient memory to store a %lu by %lu image; try exiting some " "applications to reduce memory usage" -#: gdk-pixbuf/io-png.c:789 +#: gdk-pixbuf/io-png.c:791 msgid "Fatal error reading PNG image file" msgstr "Fatal error reading PNG image file" -#: gdk-pixbuf/io-png.c:838 +#: gdk-pixbuf/io-png.c:840 #, c-format msgid "Fatal error reading PNG image file: %s" msgstr "Fatal error reading PNG image file: %s" -#: gdk-pixbuf/io-png.c:930 +#: gdk-pixbuf/io-png.c:937 +#, c-format +#| msgid "" +#| "Keys for PNG text chunks must have at least 1 and at most 79 characters." msgid "" -"Keys for PNG text chunks must have at least 1 and at most 79 characters." +"Invalid key “%s”. Keys for PNG text chunks must have at least 1 and at most " +"79 characters." msgstr "" -"Keys for PNG text chunks must have at least 1 and at most 79 characters." - -#: gdk-pixbuf/io-png.c:939 -msgid "Keys for PNG text chunks must be ASCII characters." -msgstr "Keys for PNG text chunks must be ASCII characters." +"Invalid key “%s”. Keys for PNG text chunks must have at least 1 and at most " +"79 characters." -#: gdk-pixbuf/io-png.c:953 gdk-pixbuf/io-tiff.c:846 +#: gdk-pixbuf/io-png.c:950 #, c-format -msgid "Color profile has invalid length %d." -msgstr "Colour profile has invalid length %d." +#| msgid "Keys for PNG text chunks must be ASCII characters." +msgid "Invalid key “%s”. Keys for PNG text chunks must be ASCII characters." +msgstr "Invalid key “%s”. Keys for PNG text chunks must be ASCII characters." -#: gdk-pixbuf/io-png.c:966 +#: gdk-pixbuf/io-png.c:980 #, c-format +#| msgid "" +#| "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding." msgid "" -"PNG compression level must be a value between 0 and 9; value “%s” could not " -"be parsed." +"Value for PNG text chunk '%s' cannot be converted to ISO-8859-1 encoding." msgstr "" -"PNG compression level must be a value between 0 and 9; value “%s” could not " -"be parsed." +"Value for PNG text chunk “%s” cannot be converted to ISO-8859-1 encoding." -#: gdk-pixbuf/io-png.c:979 +#: gdk-pixbuf/io-png.c:992 #, c-format -msgid "" -"PNG compression level must be a value between 0 and 9; value “%d” is not " -"allowed." -msgstr "" -"PNG compression level must be a value between 0 and 9; value “%d” is not " -"allowed." +#| msgid "Color profile has invalid length %d." +msgid "Color profile has invalid length %d" +msgstr "Colour profile has invalid length %d" -#: gdk-pixbuf/io-png.c:998 +#: gdk-pixbuf/io-png.c:1004 #, c-format -msgid "PNG x-dpi must be greater than zero; value “%s” is not allowed." -msgstr "PNG x-dpi must be greater than zero; value “%s” is not allowed." +#| msgid "" +#| "PNG compression level must be a value between 0 and 9; value “%d” is not " +#| "allowed." +msgid "" +"PNG compression level must be a value between 0 and 9; value “%s” is invalid" +msgstr "" +"PNG compression level must be a value between 0 and 9; value “%s” is invalid" #: gdk-pixbuf/io-png.c:1018 #, c-format -msgid "PNG y-dpi must be greater than zero; value “%s” is not allowed." -msgstr "PNG y-dpi must be greater than zero; value “%s” is not allowed." - -#: gdk-pixbuf/io-png.c:1067 -#, c-format -msgid "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding." -msgstr "" -"Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding." +#| msgid "PNG x-dpi must be greater than zero; value “%s” is not allowed." +msgid "PNG %s must be greater than zero; value “%s” is not allowed" +msgstr "PNG %s must be greater than zero; value “%s” is not allowed" -#: gdk-pixbuf/io-png.c:1252 +#: gdk-pixbuf/io-png.c:1246 msgctxt "image format" msgid "PNG" msgstr "PNG" @@ -747,7 +713,7 @@ msgstr "Raw PNM image type is invalid" msgid "PNM image loader does not support this PNM subformat" msgstr "PNM image loader does not support this PNM subformat" -#: gdk-pixbuf/io-pnm.c:754 gdk-pixbuf/io-pnm.c:981 +#: gdk-pixbuf/io-pnm.c:754 gdk-pixbuf/io-pnm.c:991 msgid "Raw PNM formats require exactly one whitespace before sample data" msgstr "Raw PNM formats require exactly one whitespace before sample data" @@ -755,19 +721,19 @@ msgstr "Raw PNM formats require exactly one whitespace before sample data" msgid "Cannot allocate memory for loading PNM image" msgstr "Cannot allocate memory for loading PNM image" -#: gdk-pixbuf/io-pnm.c:831 +#: gdk-pixbuf/io-pnm.c:835 msgid "Insufficient memory to load PNM context struct" msgstr "Insufficient memory to load PNM context struct" -#: gdk-pixbuf/io-pnm.c:882 +#: gdk-pixbuf/io-pnm.c:892 msgid "Unexpected end of PNM image data" msgstr "Unexpected end of PNM image data" -#: gdk-pixbuf/io-pnm.c:1010 +#: gdk-pixbuf/io-pnm.c:1020 msgid "Insufficient memory to load PNM file" msgstr "Insufficient memory to load PNM file" -#: gdk-pixbuf/io-pnm.c:1094 +#: gdk-pixbuf/io-pnm.c:1103 msgctxt "image format" msgid "PNM/PBM/PGM/PPM" msgstr "PNM/PBM/PGM/PPM" @@ -780,7 +746,7 @@ msgstr "Input file descriptor is NULL." msgid "Failed to read QTIF header" msgstr "Failed to read QTIF header" -#: gdk-pixbuf/io-qtif.c:150 gdk-pixbuf/io-qtif.c:187 gdk-pixbuf/io-qtif.c:454 +#: gdk-pixbuf/io-qtif.c:150 gdk-pixbuf/io-qtif.c:187 gdk-pixbuf/io-qtif.c:449 #, c-format msgid "QTIF atom size too large (%d byte)" msgid_plural "QTIF atom size too large (%d bytes)" @@ -806,48 +772,48 @@ msgid_plural "Failed to skip the next %d bytes with seek()." msgstr[0] "Failed to skip the next %d byte with seek()." msgstr[1] "Failed to skip the next %d bytes with seek()." -#: gdk-pixbuf/io-qtif.c:265 +#: gdk-pixbuf/io-qtif.c:269 msgid "Failed to allocate QTIF context structure." msgstr "Failed to allocate QTIF context structure." -#: gdk-pixbuf/io-qtif.c:325 +#: gdk-pixbuf/io-qtif.c:329 msgid "Failed to create GdkPixbufLoader object." msgstr "Failed to create GdkPixbufLoader object." -#: gdk-pixbuf/io-qtif.c:429 +#: gdk-pixbuf/io-qtif.c:424 msgid "Failed to find an image data atom." msgstr "Failed to find an image data atom." -#: gdk-pixbuf/io-qtif.c:613 +#: gdk-pixbuf/io-qtif.c:599 msgctxt "image format" msgid "QuickTime" msgstr "QuickTime" -#: gdk-pixbuf/io-tga.c:349 +#: gdk-pixbuf/io-tga.c:346 msgid "Cannot allocate colormap" msgstr "Cannot allocate colourmap" -#: gdk-pixbuf/io-tga.c:374 +#: gdk-pixbuf/io-tga.c:371 msgid "Cannot allocate new pixbuf" msgstr "Cannot allocate new pixbuf" -#: gdk-pixbuf/io-tga.c:522 +#: gdk-pixbuf/io-tga.c:519 msgid "Unexpected bitdepth for colormap entries" msgstr "Unexpected bitdepth for colourmap entries" -#: gdk-pixbuf/io-tga.c:538 +#: gdk-pixbuf/io-tga.c:535 msgid "Pseudocolor image does not contain a colormap" msgstr "Pseudocolor image does not contain a colourmap" -#: gdk-pixbuf/io-tga.c:581 +#: gdk-pixbuf/io-tga.c:578 msgid "Cannot allocate TGA header memory" msgstr "Cannot allocate TGA header memory" -#: gdk-pixbuf/io-tga.c:612 +#: gdk-pixbuf/io-tga.c:609 msgid "TGA image has invalid dimensions" msgstr "TGA image has invalid dimensions" -#: gdk-pixbuf/io-tga.c:618 gdk-pixbuf/io-tga.c:625 +#: gdk-pixbuf/io-tga.c:615 gdk-pixbuf/io-tga.c:622 msgid "TGA image type not supported" msgstr "TGA image type not supported" @@ -855,11 +821,11 @@ msgstr "TGA image type not supported" msgid "Cannot allocate memory for TGA context struct" msgstr "Cannot allocate memory for TGA context struct" -#: gdk-pixbuf/io-tga.c:711 +#: gdk-pixbuf/io-tga.c:712 msgid "TGA image was truncated or incomplete." msgstr "TGA image was truncated or incomplete." -#: gdk-pixbuf/io-tga.c:763 +#: gdk-pixbuf/io-tga.c:764 msgctxt "image format" msgid "Targa" msgstr "Targa" @@ -880,7 +846,7 @@ msgstr "Width or height of TIFF image is zero" msgid "Dimensions of TIFF image too large" msgstr "Dimensions of TIFF image too large" -#: gdk-pixbuf/io-tiff.c:176 gdk-pixbuf/io-tiff.c:188 gdk-pixbuf/io-tiff.c:580 +#: gdk-pixbuf/io-tiff.c:176 gdk-pixbuf/io-tiff.c:188 gdk-pixbuf/io-tiff.c:584 msgid "Insufficient memory to open TIFF file" msgstr "Insufficient memory to open TIFF file" @@ -892,37 +858,42 @@ msgstr "Failed to load RGB data from TIFF file" msgid "Failed to open TIFF image" msgstr "Failed to open TIFF image" -#: gdk-pixbuf/io-tiff.c:511 gdk-pixbuf/io-tiff.c:523 +#: gdk-pixbuf/io-tiff.c:515 gdk-pixbuf/io-tiff.c:527 msgid "Failed to load TIFF image" msgstr "Failed to load TIFF image" -#: gdk-pixbuf/io-tiff.c:755 +#: gdk-pixbuf/io-tiff.c:759 msgid "Failed to save TIFF image" msgstr "Failed to save TIFF image" -#: gdk-pixbuf/io-tiff.c:816 +#: gdk-pixbuf/io-tiff.c:820 msgid "TIFF compression doesn’t refer to a valid codec." msgstr "TIFF compression doesn’t refer to a valid codec." -#: gdk-pixbuf/io-tiff.c:861 +#: gdk-pixbuf/io-tiff.c:850 +#, c-format +msgid "Color profile has invalid length %d." +msgstr "Colour profile has invalid length %d." + +#: gdk-pixbuf/io-tiff.c:865 msgid "TIFF bits-per-sample doesn’t contain a supported value." msgstr "TIFF bits-per-sample doesn’t contain a supported value." -#: gdk-pixbuf/io-tiff.c:942 +#: gdk-pixbuf/io-tiff.c:946 msgid "Failed to write TIFF data" msgstr "Failed to write TIFF data" -#: gdk-pixbuf/io-tiff.c:960 +#: gdk-pixbuf/io-tiff.c:964 #, c-format msgid "TIFF x-dpi must be greater than zero; value “%s” is not allowed." msgstr "TIFF x-dpi must be greater than zero; value “%s” is not allowed." -#: gdk-pixbuf/io-tiff.c:972 +#: gdk-pixbuf/io-tiff.c:976 #, c-format msgid "TIFF y-dpi must be greater than zero; value “%s” is not allowed." msgstr "TIFF y-dpi must be greater than zero; value “%s” is not allowed." -#: gdk-pixbuf/io-tiff.c:1013 +#: gdk-pixbuf/io-tiff.c:1017 msgid "Couldn’t write to TIFF file" msgstr "Couldn’t write to TIFF file" @@ -930,15 +901,15 @@ msgstr "Couldn’t write to TIFF file" msgid "Invalid XBM file" msgstr "Invalid XBM file" -#: gdk-pixbuf/io-xbm.c:330 +#: gdk-pixbuf/io-xbm.c:331 msgid "Insufficient memory to load XBM image file" msgstr "Insufficient memory to load XBM image file" -#: gdk-pixbuf/io-xbm.c:478 +#: gdk-pixbuf/io-xbm.c:482 msgid "Failed to write to temporary file when loading XBM image" msgstr "Failed to write to temporary file when loading XBM image" -#: gdk-pixbuf/io-xbm.c:517 +#: gdk-pixbuf/io-xbm.c:521 msgctxt "image format" msgid "XBM" msgstr "XBM" @@ -976,19 +947,53 @@ msgid "Cannot read XPM colormap" msgstr "Cannot read XPM colourmap" #: gdk-pixbuf/io-xpm.c:610 -#| msgid "Dimensions of TIFF image too large" msgid "Dimensions do not match data" msgstr "Dimensions do not match data" -#: gdk-pixbuf/io-xpm.c:804 +#: gdk-pixbuf/io-xpm.c:806 msgid "Failed to write to temporary file when loading XPM image" msgstr "Failed to write to temporary file when loading XPM image" -#: gdk-pixbuf/io-xpm.c:843 +#: gdk-pixbuf/io-xpm.c:845 msgctxt "image format" msgid "XPM" msgstr "XPM" +#~ msgid "Couldn’t allocate memory for stream" +#~ msgstr "Couldn’t allocate memory for stream" + +#~ msgid "Couldn’t decode image" +#~ msgstr "Couldn’t decode image" + +#~ msgid "Transformed JPEG2000 has zero width or height" +#~ msgstr "Transformed JPEG2000 has zero width or height" + +#~ msgid "Image type currently not supported" +#~ msgstr "Image type currently not supported" + +#~ msgid "Couldn’t allocate memory for color profile" +#~ msgstr "Couldn’t allocate memory for colour profile" + +#~ msgid "Insufficient memory to open JPEG 2000 file" +#~ msgstr "Insufficient memory to open JPEG 2000 file" + +#~ msgid "Couldn’t allocate memory to buffer image data" +#~ msgstr "Couldn’t allocate memory to buffer image data" + +#~ msgctxt "image format" +#~ msgid "JPEG 2000" +#~ msgstr "JPEG 2000" + +#~ msgid "" +#~ "PNG compression level must be a value between 0 and 9; value “%s” could " +#~ "not be parsed." +#~ msgstr "" +#~ "PNG compression level must be a value between 0 and 9; value “%s” could " +#~ "not be parsed." + +#~ msgid "PNG y-dpi must be greater than zero; value “%s” is not allowed." +#~ msgstr "PNG y-dpi must be greater than zero; value “%s” is not allowed." + #~ msgid "Internal error in the GIF loader (%s)" #~ msgstr "Internal error in the GIF loader (%s)" @@ -1,19 +1,19 @@ # This is the Italian locale definition for gdk-pixbuf # Based on GTK+ translation # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2014, 2015 Free Software Foundation, Inc. -# Copyright (C) 2016, 2017, 2018, 2019 Free Software Foundation, Inc. +# Copyright (C) 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc. # Tristan Tarrant <ttarrant@etnoteam.it>, 1999. # Christopher Gabriel <cgabriel@gnu.org>, 2000, 2001, 2002. # Alessio Dessì <alessiodessi@tiscali.it>, 2003, 2004, 2005, 2006, 2007. # Luca Ferretti <lferrett@gnome.org>, 2007, 2008, 2009, 2010, 2012. -# Milo Casagrande <milo@milo.name>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019. +# Milo Casagrande <milo@milo.name>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2021. # msgid "" msgstr "" "Project-Id-Version: gdk-pixbuf\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gdk-pixbuf/issues\n" -"POT-Creation-Date: 2019-03-01 11:34+0000\n" -"PO-Revision-Date: 2019-03-04 09:44+0100\n" +"POT-Creation-Date: 2020-11-10 02:27+0000\n" +"PO-Revision-Date: 2021-02-24 18:26+0100\n" "Last-Translator: Milo Casagrande <milo@milo.name>\n" "Language-Team: Italian <tp@lists.linux.it>\n" "Language: it\n" @@ -21,20 +21,20 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Poedit 2.2.1\n" +"X-Generator: Poedit 2.4.2\n" -#: gdk-pixbuf/gdk-pixbuf-animation.c:157 gdk-pixbuf/gdk-pixbuf-io.c:1101 -#: gdk-pixbuf/gdk-pixbuf-io.c:1363 +#: gdk-pixbuf/gdk-pixbuf-animation.c:175 gdk-pixbuf/gdk-pixbuf-io.c:1125 +#: gdk-pixbuf/gdk-pixbuf-io.c:1387 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Apertura del file «%s» non riuscita: %s" -#: gdk-pixbuf/gdk-pixbuf-animation.c:170 gdk-pixbuf/gdk-pixbuf-io.c:985 +#: gdk-pixbuf/gdk-pixbuf-animation.c:188 gdk-pixbuf/gdk-pixbuf-io.c:992 #, c-format msgid "Image file “%s” contains no data" msgstr "Il file d'immagine «%s» non contiene dati" -#: gdk-pixbuf/gdk-pixbuf-animation.c:208 +#: gdk-pixbuf/gdk-pixbuf-animation.c:226 #, c-format msgid "" "Failed to load animation “%s”: reason not known, probably a corrupt " @@ -43,8 +43,8 @@ msgstr "" "Caricamento dell'animazione «%s» non riuscito: causa sconosciuta, " "probabilmente un file d'animazione danneggiato" -#: gdk-pixbuf/gdk-pixbuf-animation.c:276 gdk-pixbuf/gdk-pixbuf-io.c:1137 -#: gdk-pixbuf/gdk-pixbuf-io.c:1415 +#: gdk-pixbuf/gdk-pixbuf-animation.c:294 gdk-pixbuf/gdk-pixbuf-io.c:1161 +#: gdk-pixbuf/gdk-pixbuf-io.c:1439 #, c-format msgid "" "Failed to load image “%s”: reason not known, probably a corrupt image file" @@ -52,87 +52,87 @@ msgstr "" "Caricamento dell'immagine «%s» non riuscito: causa sconosciuta, " "probabilmente un file d'immagine danneggiato" -#: gdk-pixbuf/gdk-pixbuf.c:166 +#: gdk-pixbuf/gdk-pixbuf.c:237 msgid "Number of Channels" msgstr "Numero di canali" -#: gdk-pixbuf/gdk-pixbuf.c:167 +#: gdk-pixbuf/gdk-pixbuf.c:238 msgid "The number of samples per pixel" msgstr "Il numero di campioni per pixel" -#: gdk-pixbuf/gdk-pixbuf.c:176 +#: gdk-pixbuf/gdk-pixbuf.c:247 msgid "Colorspace" msgstr "Spazio colore" -#: gdk-pixbuf/gdk-pixbuf.c:177 +#: gdk-pixbuf/gdk-pixbuf.c:248 msgid "The colorspace in which the samples are interpreted" msgstr "Lo spazio di colore in cui i campioni vengono interpretati" -#: gdk-pixbuf/gdk-pixbuf.c:185 +#: gdk-pixbuf/gdk-pixbuf.c:256 msgid "Has Alpha" msgstr "Con alpha" -#: gdk-pixbuf/gdk-pixbuf.c:186 +#: gdk-pixbuf/gdk-pixbuf.c:257 msgid "Whether the pixbuf has an alpha channel" msgstr "Indica se il pixbuf ha un canale alpha" -#: gdk-pixbuf/gdk-pixbuf.c:199 +#: gdk-pixbuf/gdk-pixbuf.c:270 msgid "Bits per Sample" msgstr "Bit per campione" -#: gdk-pixbuf/gdk-pixbuf.c:200 +#: gdk-pixbuf/gdk-pixbuf.c:271 msgid "The number of bits per sample" msgstr "Il numero di bit per campione" -#: gdk-pixbuf/gdk-pixbuf.c:209 +#: gdk-pixbuf/gdk-pixbuf.c:280 msgid "Width" msgstr "Larghezza" -#: gdk-pixbuf/gdk-pixbuf.c:210 +#: gdk-pixbuf/gdk-pixbuf.c:281 msgid "The number of columns of the pixbuf" msgstr "Il numero di colonne del pixbuf" -#: gdk-pixbuf/gdk-pixbuf.c:219 +#: gdk-pixbuf/gdk-pixbuf.c:290 msgid "Height" msgstr "Altezza" -#: gdk-pixbuf/gdk-pixbuf.c:220 +#: gdk-pixbuf/gdk-pixbuf.c:291 msgid "The number of rows of the pixbuf" msgstr "Il numero di righe del pixbuf" -#: gdk-pixbuf/gdk-pixbuf.c:236 +#: gdk-pixbuf/gdk-pixbuf.c:307 msgid "Rowstride" msgstr "Incremento riga" -#: gdk-pixbuf/gdk-pixbuf.c:237 +#: gdk-pixbuf/gdk-pixbuf.c:308 msgid "" "The number of bytes between the start of a row and the start of the next row" msgstr "" "Il numero di byte tra l'inizio di una riga e l'inizio di una successiva riga" -#: gdk-pixbuf/gdk-pixbuf.c:246 +#: gdk-pixbuf/gdk-pixbuf.c:317 msgid "Pixels" msgstr "Pixel" -#: gdk-pixbuf/gdk-pixbuf.c:247 +#: gdk-pixbuf/gdk-pixbuf.c:318 msgid "A pointer to the pixel data of the pixbuf" msgstr "Un puntatore ai dati pixel del pixbuf" -#: gdk-pixbuf/gdk-pixbuf.c:261 +#: gdk-pixbuf/gdk-pixbuf.c:332 msgid "Pixel Bytes" msgstr "Byte pixel" -#: gdk-pixbuf/gdk-pixbuf.c:262 +#: gdk-pixbuf/gdk-pixbuf.c:333 msgid "Readonly pixel data" msgstr "Dati in sola lettura dei pixel" -#: gdk-pixbuf/gdk-pixbuf-io.c:805 +#: gdk-pixbuf/gdk-pixbuf-io.c:812 #, c-format msgid "Unable to load image-loading module: %s: %s" msgstr "" "Impossibile aprire il modulo «%s» per il caricamento delle immagini: %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:820 +#: gdk-pixbuf/gdk-pixbuf-io.c:827 #, c-format msgid "" "Image-loading module %s does not export the proper interface; perhaps it’s " @@ -141,53 +141,53 @@ msgstr "" "Il modulo per il caricamento delle immagini «%s» non esporta l'interfaccia " "opportuna, forse appartiene a una versione differente di gdk-pixbuf." -#: gdk-pixbuf/gdk-pixbuf-io.c:829 gdk-pixbuf/gdk-pixbuf-io.c:872 +#: gdk-pixbuf/gdk-pixbuf-io.c:836 gdk-pixbuf/gdk-pixbuf-io.c:879 #, c-format msgid "Image type “%s” is not supported" msgstr "Il tipo di immagine «%s» non è supportato" -#: gdk-pixbuf/gdk-pixbuf-io.c:957 +#: gdk-pixbuf/gdk-pixbuf-io.c:964 #, c-format msgid "Couldn’t recognize the image file format for file “%s”" msgstr "Impossibile riconoscere il formato di immagine per il file «%s»" -#: gdk-pixbuf/gdk-pixbuf-io.c:965 +#: gdk-pixbuf/gdk-pixbuf-io.c:972 msgid "Unrecognized image file format" msgstr "Formato del file di immagine non riconosciuto" -#: gdk-pixbuf/gdk-pixbuf-io.c:1148 +#: gdk-pixbuf/gdk-pixbuf-io.c:1172 #, c-format msgid "Failed to load image “%s”: %s" msgstr "Caricamento dell'immagine «%s» non riuscito: %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2218 gdk-pixbuf/io-gdip-utils.c:838 +#: gdk-pixbuf/gdk-pixbuf-io.c:2242 gdk-pixbuf/io-gdip-utils.c:840 #, c-format msgid "Error writing to image file: %s" msgstr "Errore nello scrivere sul file d'immagine: %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2260 gdk-pixbuf/gdk-pixbuf-io.c:2381 +#: gdk-pixbuf/gdk-pixbuf-io.c:2284 gdk-pixbuf/gdk-pixbuf-io.c:2405 #, c-format msgid "This build of gdk-pixbuf does not support saving the image format: %s" msgstr "Questa versione di gdk-pixbuf non permette di salvare nel formato %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2291 +#: gdk-pixbuf/gdk-pixbuf-io.c:2315 msgid "Insufficient memory to save image to callback" msgstr "Memoria insufficiente per salvare l'immagine sulla callback" -#: gdk-pixbuf/gdk-pixbuf-io.c:2304 +#: gdk-pixbuf/gdk-pixbuf-io.c:2328 msgid "Failed to open temporary file" msgstr "Apertura del file temporaneo non riuscita" -#: gdk-pixbuf/gdk-pixbuf-io.c:2327 +#: gdk-pixbuf/gdk-pixbuf-io.c:2351 msgid "Failed to read from temporary file" msgstr "Lettura dal file temporaneo non riuscita" -#: gdk-pixbuf/gdk-pixbuf-io.c:2537 +#: gdk-pixbuf/gdk-pixbuf-io.c:2561 #, c-format msgid "Failed to open “%s” for writing: %s" msgstr "Apertura di «%s» in scrittura non riuscita: %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2563 +#: gdk-pixbuf/gdk-pixbuf-io.c:2587 #, c-format msgid "" "Failed to close “%s” while writing image, all data may not have been saved: " @@ -196,13 +196,13 @@ msgstr "" "Chiusura di «%s» non riuscita durante la scrittura dell'immagine, alcuni " "dati potrebbero non essere stati salvati: %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2784 gdk-pixbuf/gdk-pixbuf-io.c:2836 +#: gdk-pixbuf/gdk-pixbuf-io.c:2808 gdk-pixbuf/gdk-pixbuf-io.c:2860 msgid "Insufficient memory to save image into a buffer" msgstr "Memoria insufficiente per salvare l'immagine in un buffer" # stream lasciato non tradotto come in glib/gio, # credo intenda qualcosa 'tipo' file, ma più generico -#: gdk-pixbuf/gdk-pixbuf-io.c:2882 +#: gdk-pixbuf/gdk-pixbuf-io.c:2906 msgid "Error writing to image stream" msgstr "Errore nello scrivere sullo stream d'immagine" @@ -220,11 +220,11 @@ msgstr "" msgid "Incremental loading of image type “%s” is not supported" msgstr "Caricamento progressivo non supportato per il tipo di immagine «%s»" -#: gdk-pixbuf/gdk-pixbuf-simple-anim.c:161 +#: gdk-pixbuf/gdk-pixbuf-simple-anim.c:162 msgid "Loop" msgstr "Ciclo" -#: gdk-pixbuf/gdk-pixbuf-simple-anim.c:162 +#: gdk-pixbuf/gdk-pixbuf-simple-anim.c:163 msgid "Whether the animation should loop when it reaches the end" msgstr "" "Indica se l'animazione deve riprendere dall'inizio quando raggiunge la fine" @@ -251,36 +251,36 @@ msgstr[0] "" msgstr[1] "" "allocazione di %u byte per il buffer di lettura del file non riuscita" -#: gdk-pixbuf/io-ani.c:241 +#: gdk-pixbuf/io-ani.c:239 msgid "Unexpected icon chunk in animation" msgstr "Segmento di icona inaspettato nell'animazione" -#: gdk-pixbuf/io-ani.c:339 gdk-pixbuf/io-ani.c:397 gdk-pixbuf/io-ani.c:423 -#: gdk-pixbuf/io-ani.c:446 gdk-pixbuf/io-ani.c:473 gdk-pixbuf/io-ani.c:560 +#: gdk-pixbuf/io-ani.c:337 gdk-pixbuf/io-ani.c:395 gdk-pixbuf/io-ani.c:421 +#: gdk-pixbuf/io-ani.c:444 gdk-pixbuf/io-ani.c:471 gdk-pixbuf/io-ani.c:558 msgid "Invalid header in animation" msgstr "Header dell'animazione non valido" -#: gdk-pixbuf/io-ani.c:349 gdk-pixbuf/io-ani.c:371 gdk-pixbuf/io-ani.c:455 -#: gdk-pixbuf/io-ani.c:482 gdk-pixbuf/io-ani.c:533 gdk-pixbuf/io-ani.c:605 +#: gdk-pixbuf/io-ani.c:347 gdk-pixbuf/io-ani.c:369 gdk-pixbuf/io-ani.c:453 +#: gdk-pixbuf/io-ani.c:480 gdk-pixbuf/io-ani.c:531 gdk-pixbuf/io-ani.c:607 msgid "Not enough memory to load animation" msgstr "Memoria insufficiente per caricare l'animazione" -#: gdk-pixbuf/io-ani.c:389 gdk-pixbuf/io-ani.c:415 gdk-pixbuf/io-ani.c:434 +#: gdk-pixbuf/io-ani.c:387 gdk-pixbuf/io-ani.c:413 gdk-pixbuf/io-ani.c:432 msgid "Malformed chunk in animation" msgstr "Segmento malformato nell'animazione" -#: gdk-pixbuf/io-ani.c:627 +#: gdk-pixbuf/io-ani.c:629 msgid "ANI image was truncated or incomplete." msgstr "Immagine ANI troncata o incompleta." -#: gdk-pixbuf/io-ani.c:668 +#: gdk-pixbuf/io-ani.c:670 msgctxt "image format" msgid "Windows animated cursor" msgstr "Cursore animato Windows" #: gdk-pixbuf/io-bmp.c:231 gdk-pixbuf/io-bmp.c:269 gdk-pixbuf/io-bmp.c:376 #: gdk-pixbuf/io-bmp.c:403 gdk-pixbuf/io-bmp.c:428 gdk-pixbuf/io-bmp.c:463 -#: gdk-pixbuf/io-bmp.c:485 gdk-pixbuf/io-bmp.c:564 +#: gdk-pixbuf/io-bmp.c:485 gdk-pixbuf/io-bmp.c:563 msgid "BMP image has bogus header data" msgstr "Immagine BMP con dati fasulli nell'header" @@ -308,28 +308,29 @@ msgstr "Le immagini BMP topdown non possono essere compresse" msgid "BMP image width too large" msgstr "Larghezza immagine BMP troppo grande" -#: gdk-pixbuf/io-bmp.c:788 gdk-pixbuf/io-png.c:560 gdk-pixbuf/io-pnm.c:722 +#: gdk-pixbuf/io-bmp.c:792 gdk-pixbuf/io-png.c:564 gdk-pixbuf/io-pnm.c:722 +#: gdk-pixbuf/io-pnm.c:879 msgid "Premature end-of-file encountered" msgstr "End-of-file raggiunto prematuramente" -#: gdk-pixbuf/io-bmp.c:1314 +#: gdk-pixbuf/io-bmp.c:1313 #, c-format msgid "Error while decoding colormap" msgstr "Errore nel decodificare la colormap" -#: gdk-pixbuf/io-bmp.c:1377 gdk-pixbuf/io-bmp.c:1389 +#: gdk-pixbuf/io-bmp.c:1376 gdk-pixbuf/io-bmp.c:1388 msgid "Image is too wide for BMP format." msgstr "L'immagine è troppo larga per il formato BMP." -#: gdk-pixbuf/io-bmp.c:1422 +#: gdk-pixbuf/io-bmp.c:1421 msgid "Couldn’t allocate memory for saving BMP file" msgstr "Impossibile allocare memoria per salvare il file BMP" -#: gdk-pixbuf/io-bmp.c:1463 +#: gdk-pixbuf/io-bmp.c:1462 msgid "Couldn’t write to BMP file" msgstr "Impossibile scrivere nel file BMP" -#: gdk-pixbuf/io-bmp.c:1516 gdk-pixbuf/io-gdip-bmp.c:83 +#: gdk-pixbuf/io-bmp.c:1515 gdk-pixbuf/io-gdip-bmp.c:83 msgctxt "image format" msgid "BMP" msgstr "BMP" @@ -339,17 +340,17 @@ msgctxt "image format" msgid "EMF" msgstr "EMF" -#: gdk-pixbuf/io-gdip-gif.c:81 gdk-pixbuf/io-gif.c:1703 +#: gdk-pixbuf/io-gdip-gif.c:81 gdk-pixbuf/io-gif.c:1043 msgctxt "image format" msgid "GIF" msgstr "GIF" -#: gdk-pixbuf/io-gdip-ico.c:60 gdk-pixbuf/io-ico.c:1410 +#: gdk-pixbuf/io-gdip-ico.c:60 gdk-pixbuf/io-ico.c:1412 msgctxt "image format" msgid "Windows icon" msgstr "Icona Windows" -#: gdk-pixbuf/io-gdip-jpeg.c:54 gdk-pixbuf/io-jpeg.c:1383 +#: gdk-pixbuf/io-gdip-jpeg.c:54 gdk-pixbuf/io-jpeg.c:1382 #, c-format msgid "" "JPEG quality must be a value between 0 and 100; value “%s” could not be " @@ -358,7 +359,7 @@ msgstr "" "La qualità di un'immagine JPEG deve essere compresa tra 0 e 100; il valore " "«%s» non può essere analizzato." -#: gdk-pixbuf/io-gdip-jpeg.c:69 gdk-pixbuf/io-jpeg.c:1399 +#: gdk-pixbuf/io-gdip-jpeg.c:69 gdk-pixbuf/io-jpeg.c:1398 #, c-format msgid "" "JPEG quality must be a value between 0 and 100; value “%d” is not allowed." @@ -366,12 +367,12 @@ msgstr "" "La qualità di un'immagine JPEG deve essere compresa tra 0 e 100; il valore " "«%d» non è permesso." -#: gdk-pixbuf/io-gdip-jpeg.c:147 gdk-pixbuf/io-jpeg.c:1683 +#: gdk-pixbuf/io-gdip-jpeg.c:147 gdk-pixbuf/io-jpeg.c:1682 msgctxt "image format" msgid "JPEG" msgstr "JPEG" -#: gdk-pixbuf/io-gdip-tiff.c:83 gdk-pixbuf/io-tiff.c:1082 +#: gdk-pixbuf/io-gdip-tiff.c:83 gdk-pixbuf/io-tiff.c:1086 msgctxt "image format" msgid "TIFF" msgstr "TIFF" @@ -406,19 +407,19 @@ msgid "Could not read from stream: %s" msgstr "Impossibile leggere dallo stream: %s" # il bitmap o la bitmap ?? -#: gdk-pixbuf/io-gdip-utils.c:618 +#: gdk-pixbuf/io-gdip-utils.c:620 msgid "Couldn’t load bitmap" msgstr "Impossibile caricare la bitmap" -#: gdk-pixbuf/io-gdip-utils.c:774 +#: gdk-pixbuf/io-gdip-utils.c:776 msgid "Couldn’t load metafile" msgstr "Impossibile caricare i metadati" -#: gdk-pixbuf/io-gdip-utils.c:879 +#: gdk-pixbuf/io-gdip-utils.c:881 msgid "Unsupported image format for GDI+" msgstr "Formato di immagine non supportato per GDI+" -#: gdk-pixbuf/io-gdip-utils.c:886 +#: gdk-pixbuf/io-gdip-utils.c:888 msgid "Couldn’t save" msgstr "Impossibile salvare" @@ -427,64 +428,34 @@ msgctxt "image format" msgid "WMF" msgstr "WMF" -#: gdk-pixbuf/io-gif.c:218 +#: gdk-pixbuf/io-gif.c:158 #, c-format msgid "Failure reading GIF: %s" msgstr "Lettura dell'immagine GIF non riuscita: %s" -#: gdk-pixbuf/io-gif.c:492 gdk-pixbuf/io-gif.c:1478 gdk-pixbuf/io-gif.c:1652 -msgid "GIF file was missing some data (perhaps it was truncated somehow?)" -msgstr "Il file GIF non è completo (forse parte dei dati sono andati persi)" - -#: gdk-pixbuf/io-gif.c:501 -#, c-format -msgid "Internal error in the GIF loader (%s)" -msgstr "Errore interno nel modulo di caricamento GIF (%s)" - -#: gdk-pixbuf/io-gif.c:511 gdk-pixbuf/io-gif.c:628 -msgid "Bad code encountered" -msgstr "Lettura di codice errato" - -#: gdk-pixbuf/io-gif.c:560 -msgid "Stack overflow" -msgstr "Stack overflow" - -#: gdk-pixbuf/io-gif.c:599 -msgid "GIF image loader cannot understand this image." -msgstr "" -"Il modulo di caricamento di immagini GIF non riconosce questa immagine." - -#: gdk-pixbuf/io-gif.c:638 -msgid "Circular table entry in GIF file" -msgstr "Voce tabella circolare nel file GIF" - -#: gdk-pixbuf/io-gif.c:842 gdk-pixbuf/io-gif.c:1464 gdk-pixbuf/io-gif.c:1517 -#: gdk-pixbuf/io-gif.c:1640 +#: gdk-pixbuf/io-gif.c:381 gdk-pixbuf/io-gif.c:854 gdk-pixbuf/io-gif.c:907 +#: gdk-pixbuf/io-gif.c:980 msgid "Not enough memory to load GIF file" msgstr "Memoria insufficiente per caricare il file GIF" -#: gdk-pixbuf/io-gif.c:936 -msgid "Not enough memory to composite a frame in GIF file" -msgstr "Memoria insufficiente per comporre un fotogramma nel file GIF" - -#: gdk-pixbuf/io-gif.c:1107 +#: gdk-pixbuf/io-gif.c:507 msgid "GIF image is corrupt (incorrect LZW compression)" msgstr "Immagine GIF danneggiata (errori nella compressione LZW)" -#: gdk-pixbuf/io-gif.c:1162 +#: gdk-pixbuf/io-gif.c:536 msgid "File does not appear to be a GIF file" msgstr "Il file non sembra essere in formato GIF" -#: gdk-pixbuf/io-gif.c:1174 +#: gdk-pixbuf/io-gif.c:551 #, c-format msgid "Version %s of the GIF file format is not supported" msgstr "La versione %s del formato GIF non è supportata" -#: gdk-pixbuf/io-gif.c:1221 +#: gdk-pixbuf/io-gif.c:586 msgid "Resulting GIF image has zero size" msgstr "La dimensione dell'immagine GIF risultante è zero" -#: gdk-pixbuf/io-gif.c:1300 +#: gdk-pixbuf/io-gif.c:664 msgid "" "GIF image has no global colormap, and a frame inside it has no local " "colormap." @@ -492,11 +463,15 @@ msgstr "" "Immagine GIF priva di colormap globale e in un fotogramma interno manca la " "colormap locale." -#: gdk-pixbuf/io-gif.c:1540 +#: gdk-pixbuf/io-gif.c:867 gdk-pixbuf/io-gif.c:992 +msgid "GIF file was missing some data (perhaps it was truncated somehow?)" +msgstr "Il file GIF non è completo (forse parte dei dati sono andati persi)" + +#: gdk-pixbuf/io-gif.c:926 msgid "GIF image was truncated or incomplete." msgstr "Immagine GIF troncata o incompleta." -#: gdk-pixbuf/io-gif.c:1547 +#: gdk-pixbuf/io-gif.c:933 msgid "Not all frames of the GIF image were loaded." msgstr "Non tutti i frame dell'immagine GIF sono stati caricati." @@ -505,11 +480,11 @@ msgstr "Non tutti i frame dell'immagine GIF sono stati caricati." msgid "Error reading ICNS image: %s" msgstr "Errore nel leggere l'immagine ICNS: %s" -#: gdk-pixbuf/io-icns.c:380 gdk-pixbuf/io-icns.c:457 +#: gdk-pixbuf/io-icns.c:380 gdk-pixbuf/io-icns.c:461 msgid "Could not decode ICNS file" msgstr "Impossibile decodificare il file ICNS" -#: gdk-pixbuf/io-icns.c:516 +#: gdk-pixbuf/io-icns.c:517 msgctxt "image format" msgid "MacOS X icon" msgstr "Icona MacOS X" @@ -537,63 +512,27 @@ msgstr "Icone compresse non supportate" msgid "Unsupported icon type" msgstr "Tipo di icona non supportato" -#: gdk-pixbuf/io-ico.c:581 +#: gdk-pixbuf/io-ico.c:583 msgid "Not enough memory to load ICO file" msgstr "Memoria insufficiente per caricare il file ICO" -#: gdk-pixbuf/io-ico.c:627 +#: gdk-pixbuf/io-ico.c:629 msgid "ICO image was truncated or incomplete." msgstr "Immagine ICO troncata o incompleta." -#: gdk-pixbuf/io-ico.c:1068 +#: gdk-pixbuf/io-ico.c:1070 msgid "Image too large to be saved as ICO" msgstr "Immagine troppo larga per essere salvata come ICO" -#: gdk-pixbuf/io-ico.c:1079 +#: gdk-pixbuf/io-ico.c:1081 msgid "Cursor hotspot outside image" msgstr "Hotspot del cursore esterno all'immagine" -#: gdk-pixbuf/io-ico.c:1102 +#: gdk-pixbuf/io-ico.c:1104 #, c-format msgid "Unsupported depth for ICO file: %d" msgstr "Profondità non supportata per il file ICO: %d" -# stream lasciato non tradotto come in glib/gio, -# credo intenda qualcosa 'tipo' file, ma più generico -#: gdk-pixbuf/io-jasper.c:74 -msgid "Couldn’t allocate memory for stream" -msgstr "Impossibile allocare memoria per lo stream" - -#: gdk-pixbuf/io-jasper.c:125 -msgid "Couldn’t decode image" -msgstr "Impossibile decodificare l'immagine" - -#: gdk-pixbuf/io-jasper.c:143 -msgid "Transformed JPEG2000 has zero width or height" -msgstr "L'immagine trasformata in JPEG2000 ha larghezza o altezza pari a zero" - -#: gdk-pixbuf/io-jasper.c:159 -msgid "Image type currently not supported" -msgstr "Il tipo di immagine non è attualmente supportato" - -#: gdk-pixbuf/io-jasper.c:171 gdk-pixbuf/io-jasper.c:179 -msgid "Couldn’t allocate memory for color profile" -msgstr "Impossibile allocare memoria per il profilo di colore" - -#: gdk-pixbuf/io-jasper.c:205 gdk-pixbuf/io-jasper.c:230 -msgid "Insufficient memory to open JPEG 2000 file" -msgstr "Memoria insufficiente per aprire il file JPEG 2000" - -#: gdk-pixbuf/io-jasper.c:292 -msgid "Couldn’t allocate memory to buffer image data" -msgstr "" -"Impossibile allocare memoria per eseguire il buffering dei dati dell'immagine" - -#: gdk-pixbuf/io-jasper.c:336 -msgctxt "image format" -msgid "JPEG 2000" -msgstr "JPEG 2000" - #: gdk-pixbuf/io-jpeg.c:129 #, c-format msgid "Error interpreting JPEG image file (%s)" @@ -607,17 +546,17 @@ msgstr "" "Memoria insufficiente per caricare l'immagine, provare a chiudere qualche " "applicazione per liberare memoria" -#: gdk-pixbuf/io-jpeg.c:710 gdk-pixbuf/io-jpeg.c:943 +#: gdk-pixbuf/io-jpeg.c:710 gdk-pixbuf/io-jpeg.c:947 #, c-format msgid "Unsupported JPEG color space (%s)" msgstr "Spazio di colore JPEG (%s) non supportato" -#: gdk-pixbuf/io-jpeg.c:821 gdk-pixbuf/io-jpeg.c:1142 gdk-pixbuf/io-jpeg.c:1490 -#: gdk-pixbuf/io-jpeg.c:1500 +#: gdk-pixbuf/io-jpeg.c:825 gdk-pixbuf/io-jpeg.c:1142 gdk-pixbuf/io-jpeg.c:1489 +#: gdk-pixbuf/io-jpeg.c:1499 msgid "Couldn’t allocate memory for loading JPEG file" msgstr "Impossibile allocare memoria per caricare il file JPEG" -#: gdk-pixbuf/io-jpeg.c:1099 +#: gdk-pixbuf/io-jpeg.c:1100 msgid "Transformed JPEG has zero width or height." msgstr "L'immagine convertita in JPEG ha larghezza o altezza pari a zero." @@ -626,7 +565,7 @@ msgstr "L'immagine convertita in JPEG ha larghezza o altezza pari a zero." msgid "Unsupported number of color components (%d)" msgstr "Numero di componenti colore non supportato (%d)" -#: gdk-pixbuf/io-jpeg.c:1420 +#: gdk-pixbuf/io-jpeg.c:1419 #, c-format msgid "" "JPEG x-dpi must be a value between 1 and 65535; value “%s” is not allowed." @@ -634,7 +573,7 @@ msgstr "" "Il valore x-dpi di un'immagine JPEG deve essere compreso tra 1 e 65535; il " "valore «%s» non è permesso." -#: gdk-pixbuf/io-jpeg.c:1441 +#: gdk-pixbuf/io-jpeg.c:1440 #, c-format msgid "" "JPEG y-dpi must be a value between 1 and 65535; value “%s” is not allowed." @@ -642,7 +581,7 @@ msgstr "" "Il valore y-dpi di un'immagine JPEG deve essere compreso tra 1 e 65535; il " "valore «%s» non è permesso." -#: gdk-pixbuf/io-jpeg.c:1455 +#: gdk-pixbuf/io-jpeg.c:1454 #, c-format msgid "Color profile has invalid length “%u”." msgstr "Il profilo di colore presenta la lunghezza «%u» non valida." @@ -651,7 +590,7 @@ msgstr "Il profilo di colore presenta la lunghezza «%u» non valida." msgid "Bits per channel of PNG image is invalid." msgstr "I bit per canale dell'immagine PNG è non valido." -#: gdk-pixbuf/io-png.c:144 gdk-pixbuf/io-png.c:700 +#: gdk-pixbuf/io-png.c:144 gdk-pixbuf/io-png.c:703 msgid "Transformed PNG has zero width or height." msgstr "L'immagine PNG trasformata ha larghezza o altezza pari a zero." @@ -678,11 +617,11 @@ msgstr "Errore critico nel file di immagine PNG: %s" msgid "Insufficient memory to load PNG file" msgstr "Memoria insufficiente per caricare il file PNG" -#: gdk-pixbuf/io-png.c:494 gdk-pixbuf/io-png.c:515 +#: gdk-pixbuf/io-png.c:498 gdk-pixbuf/io-png.c:519 msgid "Couldn’t allocate memory for loading PNG" msgstr "Impossibile allocare memoria per caricare file PNG" -#: gdk-pixbuf/io-png.c:713 +#: gdk-pixbuf/io-png.c:716 #, c-format msgid "" "Insufficient memory to store a %lu by %lu image; try exiting some " @@ -691,71 +630,58 @@ msgstr "" "Memoria insufficiente per contenere un'immagine %lu × %lu; chiudere qualche " "applicazione per liberare memoria" -#: gdk-pixbuf/io-png.c:789 +#: gdk-pixbuf/io-png.c:791 msgid "Fatal error reading PNG image file" msgstr "Errore critico nella lettura del file PNG" -#: gdk-pixbuf/io-png.c:838 +#: gdk-pixbuf/io-png.c:840 #, c-format msgid "Fatal error reading PNG image file: %s" msgstr "Errore critico nella lettura del file PNG: %s" -#: gdk-pixbuf/io-png.c:930 +#: gdk-pixbuf/io-png.c:937 +#, c-format msgid "" -"Keys for PNG text chunks must have at least 1 and at most 79 characters." -msgstr "" -"Le chiavi per i segmenti di testo PNG devono avere da 1 a 79 caratteri." - -#: gdk-pixbuf/io-png.c:939 -msgid "Keys for PNG text chunks must be ASCII characters." +"Invalid key “%s”. Keys for PNG text chunks must have at least 1 and at most " +"79 characters." msgstr "" -"Le chiavi per i segmenti di testo PNG possono contenere solo caratteri ASCII." +"Chiave «%s» non valida. Le chiavi per i segmenti di testo PNG devono avere " +"da 1 a 79 caratteri." -#: gdk-pixbuf/io-png.c:953 gdk-pixbuf/io-tiff.c:846 +#: gdk-pixbuf/io-png.c:950 #, c-format -msgid "Color profile has invalid length %d." -msgstr "Il profilo di colore presenta la lunghezza %d non valida." - -#: gdk-pixbuf/io-png.c:966 -#, c-format -msgid "" -"PNG compression level must be a value between 0 and 9; value “%s” could not " -"be parsed." +msgid "Invalid key “%s”. Keys for PNG text chunks must be ASCII characters." msgstr "" -"Il livello di compressione PNG deve essere un valore tra 0 e 9; il valore " -"«%s» non può essere elaborato." +"Chiave «%s» non valida. Le chiavi per i segmenti di testo PNG possono " +"contenere solo caratteri ASCII." -#: gdk-pixbuf/io-png.c:979 +#: gdk-pixbuf/io-png.c:980 #, c-format msgid "" -"PNG compression level must be a value between 0 and 9; value “%d” is not " -"allowed." +"Value for PNG text chunk '%s' cannot be converted to ISO-8859-1 encoding." msgstr "" -"Il livello di compressione PNG deve essere un valore tra 0 e 9; il valore " -"«%d» non è consentito." +"Il valore per il segmento di testo PNG «%s» non è convertibile nella " +"codifica ISO-8859-1." -#: gdk-pixbuf/io-png.c:998 +#: gdk-pixbuf/io-png.c:992 #, c-format -msgid "PNG x-dpi must be greater than zero; value “%s” is not allowed." -msgstr "" -"Il valore x-dpi di un'immagine PNG deve essere maggiore di zero; il valore " -"«%s» non è permesso." +msgid "Color profile has invalid length %d" +msgstr "Il profilo di colore ha una lunghezza %d non valida" -#: gdk-pixbuf/io-png.c:1018 +#: gdk-pixbuf/io-png.c:1004 #, c-format -msgid "PNG y-dpi must be greater than zero; value “%s” is not allowed." +msgid "" +"PNG compression level must be a value between 0 and 9; value “%s” is invalid" msgstr "" -"Il valore y-dpi di un'immagine PNG deve essere maggiore di zero; il valore " -"«%s» non è permesso." +"Il livello di compressione PNG deve essere un valore tra 0 e 9; il valore " +"«%s» non è consentito" -#: gdk-pixbuf/io-png.c:1067 +#: gdk-pixbuf/io-png.c:1018 #, c-format -msgid "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding." -msgstr "" -"Il valore per il segmento di testo PNG %s non è convertibile nella codifica " -"ISO-8859-1." +msgid "PNG %s must be greater than zero; value “%s” is not allowed" +msgstr "%s PNG deve essere maggiore di zero; il valore «%s» non è permesso" -#: gdk-pixbuf/io-png.c:1252 +#: gdk-pixbuf/io-png.c:1246 msgctxt "image format" msgid "PNG" msgstr "PNG" @@ -807,7 +733,7 @@ msgstr "" "Il modulo di caricamento per le immagini PNM non supporta questo " "sottoformato PNM" -#: gdk-pixbuf/io-pnm.c:754 gdk-pixbuf/io-pnm.c:981 +#: gdk-pixbuf/io-pnm.c:754 gdk-pixbuf/io-pnm.c:991 msgid "Raw PNM formats require exactly one whitespace before sample data" msgstr "" "I formati Raw PNM richiedono esattamente uno spazio bianco prima dei dati " @@ -817,19 +743,19 @@ msgstr "" msgid "Cannot allocate memory for loading PNM image" msgstr "Impossibile allocare memoria per caricare l'immagine PNM" -#: gdk-pixbuf/io-pnm.c:831 +#: gdk-pixbuf/io-pnm.c:835 msgid "Insufficient memory to load PNM context struct" msgstr "Memoria insufficiente per caricare la struttura context del file PNM" -#: gdk-pixbuf/io-pnm.c:882 +#: gdk-pixbuf/io-pnm.c:892 msgid "Unexpected end of PNM image data" msgstr "Fine dei dati dell'immagine PNM inaspettata" -#: gdk-pixbuf/io-pnm.c:1010 +#: gdk-pixbuf/io-pnm.c:1020 msgid "Insufficient memory to load PNM file" msgstr "Memoria insufficiente per caricare il file PNM" -#: gdk-pixbuf/io-pnm.c:1094 +#: gdk-pixbuf/io-pnm.c:1103 msgctxt "image format" msgid "PNM/PBM/PGM/PPM" msgstr "PNM/PBM/PGM/PPM" @@ -842,7 +768,7 @@ msgstr "Il descrittore di file di input è NULL." msgid "Failed to read QTIF header" msgstr "Lettura dell'intestazione QTIF non riuscita" -#: gdk-pixbuf/io-qtif.c:150 gdk-pixbuf/io-qtif.c:187 gdk-pixbuf/io-qtif.c:454 +#: gdk-pixbuf/io-qtif.c:150 gdk-pixbuf/io-qtif.c:187 gdk-pixbuf/io-qtif.c:449 #, c-format msgid "QTIF atom size too large (%d byte)" msgid_plural "QTIF atom size too large (%d bytes)" @@ -870,48 +796,48 @@ msgid_plural "Failed to skip the next %d bytes with seek()." msgstr[0] "Omissione dei successivi %d byte con seek() non riuscita." msgstr[1] "Omissione dei successivi %d byte con seek() non riuscita." -#: gdk-pixbuf/io-qtif.c:265 +#: gdk-pixbuf/io-qtif.c:269 msgid "Failed to allocate QTIF context structure." msgstr "Allocazione della struttura di contesto QTIF non riuscita." -#: gdk-pixbuf/io-qtif.c:325 +#: gdk-pixbuf/io-qtif.c:329 msgid "Failed to create GdkPixbufLoader object." msgstr "Creazione dell'oggetto GdkPixbufLoader non riuscita." -#: gdk-pixbuf/io-qtif.c:429 +#: gdk-pixbuf/io-qtif.c:424 msgid "Failed to find an image data atom." msgstr "Ricerca di un atom dati di immagine non riuscita." -#: gdk-pixbuf/io-qtif.c:613 +#: gdk-pixbuf/io-qtif.c:599 msgctxt "image format" msgid "QuickTime" msgstr "QuickTime" -#: gdk-pixbuf/io-tga.c:349 +#: gdk-pixbuf/io-tga.c:346 msgid "Cannot allocate colormap" msgstr "Impossibile allocare colormap" -#: gdk-pixbuf/io-tga.c:374 +#: gdk-pixbuf/io-tga.c:371 msgid "Cannot allocate new pixbuf" msgstr "Impossibile allocare il nuovo pixbuf" -#: gdk-pixbuf/io-tga.c:522 +#: gdk-pixbuf/io-tga.c:519 msgid "Unexpected bitdepth for colormap entries" msgstr "Profondità di colore inattesa per gli elementi della colormap" -#: gdk-pixbuf/io-tga.c:538 +#: gdk-pixbuf/io-tga.c:535 msgid "Pseudocolor image does not contain a colormap" msgstr "L'immagine in falsi colori non contiene una colormap" -#: gdk-pixbuf/io-tga.c:581 +#: gdk-pixbuf/io-tga.c:578 msgid "Cannot allocate TGA header memory" msgstr "Impossibile allocare memoria per l'header TGA" -#: gdk-pixbuf/io-tga.c:612 +#: gdk-pixbuf/io-tga.c:609 msgid "TGA image has invalid dimensions" msgstr "L'immagine TGA presenta dimensioni non valide" -#: gdk-pixbuf/io-tga.c:618 gdk-pixbuf/io-tga.c:625 +#: gdk-pixbuf/io-tga.c:615 gdk-pixbuf/io-tga.c:622 msgid "TGA image type not supported" msgstr "Tipo di immagine TGA non supportato" @@ -919,11 +845,11 @@ msgstr "Tipo di immagine TGA non supportato" msgid "Cannot allocate memory for TGA context struct" msgstr "Impossibile allocare memoria per la struttura context TGA" -#: gdk-pixbuf/io-tga.c:711 +#: gdk-pixbuf/io-tga.c:712 msgid "TGA image was truncated or incomplete." msgstr "Immagine TGA troncata o incompleta." -#: gdk-pixbuf/io-tga.c:763 +#: gdk-pixbuf/io-tga.c:764 msgctxt "image format" msgid "Targa" msgstr "Targa" @@ -944,7 +870,7 @@ msgstr "La larghezza o altezza dell'immagine TIFF è pari a zero" msgid "Dimensions of TIFF image too large" msgstr "Dimensioni dell'immagine TIFF troppo grandi" -#: gdk-pixbuf/io-tiff.c:176 gdk-pixbuf/io-tiff.c:188 gdk-pixbuf/io-tiff.c:580 +#: gdk-pixbuf/io-tiff.c:176 gdk-pixbuf/io-tiff.c:188 gdk-pixbuf/io-tiff.c:584 msgid "Insufficient memory to open TIFF file" msgstr "Memoria insufficiente per aprire il file TIFF" @@ -956,41 +882,46 @@ msgstr "Impossibile caricare i dati RGB dal file TIFF" msgid "Failed to open TIFF image" msgstr "Impossibile aprire l'immagine TIFF" -#: gdk-pixbuf/io-tiff.c:511 gdk-pixbuf/io-tiff.c:523 +#: gdk-pixbuf/io-tiff.c:515 gdk-pixbuf/io-tiff.c:527 msgid "Failed to load TIFF image" msgstr "Impossibile caricare l'immagine TIFF" -#: gdk-pixbuf/io-tiff.c:755 +#: gdk-pixbuf/io-tiff.c:759 msgid "Failed to save TIFF image" msgstr "Impossibile salvare l'immagine TIFF" -#: gdk-pixbuf/io-tiff.c:816 +#: gdk-pixbuf/io-tiff.c:820 msgid "TIFF compression doesn’t refer to a valid codec." msgstr "La compressione TIFF non fa riferimento a un codec valido." -#: gdk-pixbuf/io-tiff.c:861 +#: gdk-pixbuf/io-tiff.c:850 +#, c-format +msgid "Color profile has invalid length %d." +msgstr "Il profilo di colore presenta la lunghezza %d non valida." + +#: gdk-pixbuf/io-tiff.c:865 msgid "TIFF bits-per-sample doesn’t contain a supported value." msgstr "Il valore bit-per-campione TIFF non è supportato." -#: gdk-pixbuf/io-tiff.c:942 +#: gdk-pixbuf/io-tiff.c:946 msgid "Failed to write TIFF data" msgstr "Scrittura dati TIFF non riuscita" -#: gdk-pixbuf/io-tiff.c:960 +#: gdk-pixbuf/io-tiff.c:964 #, c-format msgid "TIFF x-dpi must be greater than zero; value “%s” is not allowed." msgstr "" "Il valore x-dpi di un'immagine TIFF deve essere maggiore di zero; il valore " "«%s» non è permesso." -#: gdk-pixbuf/io-tiff.c:972 +#: gdk-pixbuf/io-tiff.c:976 #, c-format msgid "TIFF y-dpi must be greater than zero; value “%s” is not allowed." msgstr "" "Il valore y-dpi di un'immagine TIFF deve essere maggiore di zero; il valore " "«%s» non è permesso." -#: gdk-pixbuf/io-tiff.c:1013 +#: gdk-pixbuf/io-tiff.c:1017 msgid "Couldn’t write to TIFF file" msgstr "Impossibile scrivere nel file TIFF" @@ -998,17 +929,17 @@ msgstr "Impossibile scrivere nel file TIFF" msgid "Invalid XBM file" msgstr "File XBM non valido" -#: gdk-pixbuf/io-xbm.c:330 +#: gdk-pixbuf/io-xbm.c:331 msgid "Insufficient memory to load XBM image file" msgstr "Memoria insufficiente per caricare l'immagine XBM" -#: gdk-pixbuf/io-xbm.c:478 +#: gdk-pixbuf/io-xbm.c:482 msgid "Failed to write to temporary file when loading XBM image" msgstr "" "Fallita la scrittura sul file temporaneo durante il caricamento " "dell'immagine XBM" -#: gdk-pixbuf/io-xbm.c:517 +#: gdk-pixbuf/io-xbm.c:521 msgctxt "image format" msgid "XBM" msgstr "XBM" @@ -1049,13 +980,13 @@ msgstr "Impossibile leggere la colormap XPM" msgid "Dimensions do not match data" msgstr "Le dimensioni non corrispondono ai dati" -#: gdk-pixbuf/io-xpm.c:804 +#: gdk-pixbuf/io-xpm.c:806 msgid "Failed to write to temporary file when loading XPM image" msgstr "" "Scrittura nel file temporaneo durante il caricamento dell'immagine XPM non " "riuscita" -#: gdk-pixbuf/io-xpm.c:843 +#: gdk-pixbuf/io-xpm.c:845 msgctxt "image format" msgid "XPM" msgstr "XPM" @@ -3,14 +3,14 @@ # # Sung-Hyun Nam <namsh@lgic.co.kr>, 1998 # Changwoo Ryu <cwryu@debian.org>, 2002-2013, 2015-2017. -# Gwan-gyeong Mun <elongbug@gmail.com>, 2018. +# Gwan-gyeong Mun <elongbug@gmail.com>, 2018-2021. # msgid "" msgstr "" "Project-Id-Version: gdk-pixbuf\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gdk-pixbuf/issues\n" -"POT-Creation-Date: 2019-03-01 12:03+0000\n" -"PO-Revision-Date: 2019-03-04 14:34+0200\n" +"POT-Creation-Date: 2021-03-13 17:26+0000\n" +"PO-Revision-Date: 2021-03-15 12:03+0200\n" "Last-Translator: Gwan-gyeong Mun <elongbug@gmail.com>\n" "Language-Team: Gnome Korea <gnome-kr@googlegroups.com>\n" "Language: ko\n" @@ -18,20 +18,20 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.2.1\n" +"X-Generator: Poedit 2.4.1\n" -#: gdk-pixbuf/gdk-pixbuf-animation.c:157 gdk-pixbuf/gdk-pixbuf-io.c:1101 -#: gdk-pixbuf/gdk-pixbuf-io.c:1363 +#: gdk-pixbuf/gdk-pixbuf-animation.c:175 gdk-pixbuf/gdk-pixbuf-io.c:1127 +#: gdk-pixbuf/gdk-pixbuf-io.c:1389 #, c-format msgid "Failed to open file “%s”: %s" msgstr "파일 “%s” 열기 실패: %s" -#: gdk-pixbuf/gdk-pixbuf-animation.c:170 gdk-pixbuf/gdk-pixbuf-io.c:985 +#: gdk-pixbuf/gdk-pixbuf-animation.c:188 gdk-pixbuf/gdk-pixbuf-io.c:994 #, c-format msgid "Image file “%s” contains no data" msgstr "이미지 파일 “%s”에 데이터가 없습니다" -#: gdk-pixbuf/gdk-pixbuf-animation.c:208 +#: gdk-pixbuf/gdk-pixbuf-animation.c:226 #, c-format msgid "" "Failed to load animation “%s”: reason not known, probably a corrupt " @@ -40,8 +40,8 @@ msgstr "" "애니메이션 이미지 “%s” 읽기 실패: 이유를 알 수 없습니다. 아마 애니메이션 이미" "지 파일이 깨졌을 겁니다" -#: gdk-pixbuf/gdk-pixbuf-animation.c:276 gdk-pixbuf/gdk-pixbuf-io.c:1137 -#: gdk-pixbuf/gdk-pixbuf-io.c:1415 +#: gdk-pixbuf/gdk-pixbuf-animation.c:294 gdk-pixbuf/gdk-pixbuf-io.c:1163 +#: gdk-pixbuf/gdk-pixbuf-io.c:1441 #, c-format msgid "" "Failed to load image “%s”: reason not known, probably a corrupt image file" @@ -49,85 +49,85 @@ msgstr "" "이미지 “%s” 읽기 실패: 이유를 알 수 없습니다. 아마 이미지 파일이 깨졌을 겁니" "다" -#: gdk-pixbuf/gdk-pixbuf.c:166 +#: gdk-pixbuf/gdk-pixbuf.c:237 msgid "Number of Channels" msgstr "채널 수" -#: gdk-pixbuf/gdk-pixbuf.c:167 +#: gdk-pixbuf/gdk-pixbuf.c:238 msgid "The number of samples per pixel" msgstr "픽셀당 샘플 수" -#: gdk-pixbuf/gdk-pixbuf.c:176 +#: gdk-pixbuf/gdk-pixbuf.c:247 msgid "Colorspace" msgstr "컬러스페이스" -#: gdk-pixbuf/gdk-pixbuf.c:177 +#: gdk-pixbuf/gdk-pixbuf.c:248 msgid "The colorspace in which the samples are interpreted" msgstr "샘플을 해석할 컬러스페이스" -#: gdk-pixbuf/gdk-pixbuf.c:185 +#: gdk-pixbuf/gdk-pixbuf.c:256 msgid "Has Alpha" msgstr "알파 있음" -#: gdk-pixbuf/gdk-pixbuf.c:186 +#: gdk-pixbuf/gdk-pixbuf.c:257 msgid "Whether the pixbuf has an alpha channel" msgstr "픽셀버퍼에 알파 채널이 있는지 여부" -#: gdk-pixbuf/gdk-pixbuf.c:199 +#: gdk-pixbuf/gdk-pixbuf.c:270 msgid "Bits per Sample" msgstr "샘플당 비트 수" -#: gdk-pixbuf/gdk-pixbuf.c:200 +#: gdk-pixbuf/gdk-pixbuf.c:271 msgid "The number of bits per sample" msgstr "샘플당 비트 수" -#: gdk-pixbuf/gdk-pixbuf.c:209 +#: gdk-pixbuf/gdk-pixbuf.c:280 msgid "Width" msgstr "너비" -#: gdk-pixbuf/gdk-pixbuf.c:210 +#: gdk-pixbuf/gdk-pixbuf.c:281 msgid "The number of columns of the pixbuf" msgstr "픽셀버퍼의 열 수" -#: gdk-pixbuf/gdk-pixbuf.c:219 +#: gdk-pixbuf/gdk-pixbuf.c:290 msgid "Height" msgstr "높이" -#: gdk-pixbuf/gdk-pixbuf.c:220 +#: gdk-pixbuf/gdk-pixbuf.c:291 msgid "The number of rows of the pixbuf" msgstr "픽셀버퍼의 행 수" -#: gdk-pixbuf/gdk-pixbuf.c:236 +#: gdk-pixbuf/gdk-pixbuf.c:307 msgid "Rowstride" msgstr "행 크기" -#: gdk-pixbuf/gdk-pixbuf.c:237 +#: gdk-pixbuf/gdk-pixbuf.c:308 msgid "" "The number of bytes between the start of a row and the start of the next row" msgstr "행의 시작에서 다음 행 시작까지의 바이트 수" -#: gdk-pixbuf/gdk-pixbuf.c:246 +#: gdk-pixbuf/gdk-pixbuf.c:317 msgid "Pixels" msgstr "픽셀" -#: gdk-pixbuf/gdk-pixbuf.c:247 +#: gdk-pixbuf/gdk-pixbuf.c:318 msgid "A pointer to the pixel data of the pixbuf" msgstr "픽셀버퍼의 픽셀 데이터에 대한 포인터" -#: gdk-pixbuf/gdk-pixbuf.c:261 +#: gdk-pixbuf/gdk-pixbuf.c:332 msgid "Pixel Bytes" msgstr "픽셀 바이트" -#: gdk-pixbuf/gdk-pixbuf.c:262 +#: gdk-pixbuf/gdk-pixbuf.c:333 msgid "Readonly pixel data" msgstr "읽기 전용 픽셀 데이터" -#: gdk-pixbuf/gdk-pixbuf-io.c:805 +#: gdk-pixbuf/gdk-pixbuf-io.c:814 #, c-format msgid "Unable to load image-loading module: %s: %s" msgstr "이미지 읽기 모듈을 읽을 수 없습니다: %s: %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:820 +#: gdk-pixbuf/gdk-pixbuf-io.c:829 #, c-format msgid "" "Image-loading module %s does not export the proper interface; perhaps it’s " @@ -136,53 +136,53 @@ msgstr "" "%s 이미지 읽기 모듈이 올바른 인터페이스를 내놓지 않습니다. 아마 다른 gdk-" "pixbuf 버전의 모듈로 보입니다." -#: gdk-pixbuf/gdk-pixbuf-io.c:829 gdk-pixbuf/gdk-pixbuf-io.c:872 +#: gdk-pixbuf/gdk-pixbuf-io.c:838 gdk-pixbuf/gdk-pixbuf-io.c:881 #, c-format msgid "Image type “%s” is not supported" msgstr "이미지 형식 “%s”을(를) 지원하지 않습니다" -#: gdk-pixbuf/gdk-pixbuf-io.c:957 +#: gdk-pixbuf/gdk-pixbuf-io.c:966 #, c-format msgid "Couldn’t recognize the image file format for file “%s”" msgstr "파일 “%s”의 이미지 파일 형식을 알 수 없습니다" -#: gdk-pixbuf/gdk-pixbuf-io.c:965 +#: gdk-pixbuf/gdk-pixbuf-io.c:974 msgid "Unrecognized image file format" msgstr "알 수 없는 이미지 파일 형식" -#: gdk-pixbuf/gdk-pixbuf-io.c:1148 +#: gdk-pixbuf/gdk-pixbuf-io.c:1174 #, c-format msgid "Failed to load image “%s”: %s" msgstr "이미지 “%s” 읽기 실패: %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2218 gdk-pixbuf/io-gdip-utils.c:838 +#: gdk-pixbuf/gdk-pixbuf-io.c:2244 gdk-pixbuf/io-gdip-utils.c:840 #, c-format msgid "Error writing to image file: %s" msgstr "이미지 파일을 쓰는 중 오류가 발생했습니다: %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2260 gdk-pixbuf/gdk-pixbuf-io.c:2381 +#: gdk-pixbuf/gdk-pixbuf-io.c:2286 gdk-pixbuf/gdk-pixbuf-io.c:2407 #, c-format msgid "This build of gdk-pixbuf does not support saving the image format: %s" msgstr "gdk-pixbuf의 이 빌드에서는 이미지 형식 저장을 지원하지 않습니다: %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2291 +#: gdk-pixbuf/gdk-pixbuf-io.c:2317 msgid "Insufficient memory to save image to callback" msgstr "콜백에 이미지를 저장하기에는 메모리가 부족합니다" -#: gdk-pixbuf/gdk-pixbuf-io.c:2304 +#: gdk-pixbuf/gdk-pixbuf-io.c:2330 msgid "Failed to open temporary file" msgstr "임시 파일을 여는데 실패했습니다" -#: gdk-pixbuf/gdk-pixbuf-io.c:2327 +#: gdk-pixbuf/gdk-pixbuf-io.c:2353 msgid "Failed to read from temporary file" msgstr "임시 파일을 읽는데 실패했습니다" -#: gdk-pixbuf/gdk-pixbuf-io.c:2537 +#: gdk-pixbuf/gdk-pixbuf-io.c:2563 #, c-format msgid "Failed to open “%s” for writing: %s" msgstr "쓰기 용 “%s” 열기 실패: %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2563 +#: gdk-pixbuf/gdk-pixbuf-io.c:2589 #, c-format msgid "" "Failed to close “%s” while writing image, all data may not have been saved: " @@ -191,11 +191,11 @@ msgstr "" "이미지를 저장하는 동안 “%s”을(를) 닫는데 실패했습니다. 모든 데이터를 저장하" "지 않았을 겁니다: %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2784 gdk-pixbuf/gdk-pixbuf-io.c:2836 +#: gdk-pixbuf/gdk-pixbuf-io.c:2810 gdk-pixbuf/gdk-pixbuf-io.c:2862 msgid "Insufficient memory to save image into a buffer" msgstr "버퍼에 이미지를 저장하기에는 메모리가 부족합니다" -#: gdk-pixbuf/gdk-pixbuf-io.c:2882 +#: gdk-pixbuf/gdk-pixbuf-io.c:2908 msgid "Error writing to image stream" msgstr "이미지 스트림을 쓰는 중 오류가 발생했습니다" @@ -213,11 +213,11 @@ msgstr "" msgid "Incremental loading of image type “%s” is not supported" msgstr "“%s” 타입의 이미지에서는 점진적 읽어 들이기를 지원하지 않습니다" -#: gdk-pixbuf/gdk-pixbuf-simple-anim.c:161 +#: gdk-pixbuf/gdk-pixbuf-simple-anim.c:162 msgid "Loop" msgstr "반복" -#: gdk-pixbuf/gdk-pixbuf-simple-anim.c:162 +#: gdk-pixbuf/gdk-pixbuf-simple-anim.c:163 msgid "Whether the animation should loop when it reaches the end" msgstr "애니메이션이 끝나면 처음부터 반복할지 여부" @@ -240,36 +240,36 @@ msgid "failed to allocate image buffer of %u byte" msgid_plural "failed to allocate image buffer of %u bytes" msgstr[0] "이미지 버퍼에 %u 바이트를 할당하는데 실패" -#: gdk-pixbuf/io-ani.c:241 +#: gdk-pixbuf/io-ani.c:239 msgid "Unexpected icon chunk in animation" msgstr "움직이는 이미지 안에 뜻밖의 아이콘 부분이 있습니다" -#: gdk-pixbuf/io-ani.c:339 gdk-pixbuf/io-ani.c:397 gdk-pixbuf/io-ani.c:423 -#: gdk-pixbuf/io-ani.c:446 gdk-pixbuf/io-ani.c:473 gdk-pixbuf/io-ani.c:560 +#: gdk-pixbuf/io-ani.c:337 gdk-pixbuf/io-ani.c:395 gdk-pixbuf/io-ani.c:421 +#: gdk-pixbuf/io-ani.c:444 gdk-pixbuf/io-ani.c:471 gdk-pixbuf/io-ani.c:558 msgid "Invalid header in animation" msgstr "움직이는 이미지의 헤더가 잘못되었습니다" -#: gdk-pixbuf/io-ani.c:349 gdk-pixbuf/io-ani.c:371 gdk-pixbuf/io-ani.c:455 -#: gdk-pixbuf/io-ani.c:482 gdk-pixbuf/io-ani.c:533 gdk-pixbuf/io-ani.c:605 +#: gdk-pixbuf/io-ani.c:347 gdk-pixbuf/io-ani.c:369 gdk-pixbuf/io-ani.c:453 +#: gdk-pixbuf/io-ani.c:480 gdk-pixbuf/io-ani.c:531 gdk-pixbuf/io-ani.c:607 msgid "Not enough memory to load animation" msgstr "애니메이션을 읽어 들이는데 메모리가 부족합니다" -#: gdk-pixbuf/io-ani.c:389 gdk-pixbuf/io-ani.c:415 gdk-pixbuf/io-ani.c:434 +#: gdk-pixbuf/io-ani.c:387 gdk-pixbuf/io-ani.c:413 gdk-pixbuf/io-ani.c:432 msgid "Malformed chunk in animation" msgstr "움직이는 이미지에 잘못된 부분이 있습니다" -#: gdk-pixbuf/io-ani.c:627 +#: gdk-pixbuf/io-ani.c:629 msgid "ANI image was truncated or incomplete." msgstr "ANI 이미지가 잘려져 있거나 불완전합니다." -#: gdk-pixbuf/io-ani.c:668 +#: gdk-pixbuf/io-ani.c:670 msgctxt "image format" msgid "Windows animated cursor" msgstr "윈도우 애니메이션 커서" #: gdk-pixbuf/io-bmp.c:231 gdk-pixbuf/io-bmp.c:269 gdk-pixbuf/io-bmp.c:376 #: gdk-pixbuf/io-bmp.c:403 gdk-pixbuf/io-bmp.c:428 gdk-pixbuf/io-bmp.c:463 -#: gdk-pixbuf/io-bmp.c:485 gdk-pixbuf/io-bmp.c:564 +#: gdk-pixbuf/io-bmp.c:485 gdk-pixbuf/io-bmp.c:563 msgid "BMP image has bogus header data" msgstr "BMP 이미지의 헤더 데이터가 잘못되었습니다" @@ -297,28 +297,29 @@ msgstr "톱다운 BMP 이미지는 압축할 수 없습니다" msgid "BMP image width too large" msgstr "BMP 이미지 너비가 너무 큽니다" -#: gdk-pixbuf/io-bmp.c:788 gdk-pixbuf/io-png.c:560 gdk-pixbuf/io-pnm.c:722 +#: gdk-pixbuf/io-bmp.c:792 gdk-pixbuf/io-png.c:564 gdk-pixbuf/io-pnm.c:722 +#: gdk-pixbuf/io-pnm.c:879 msgid "Premature end-of-file encountered" msgstr "파일이 갑작스럽게 끝났습니다" -#: gdk-pixbuf/io-bmp.c:1314 +#: gdk-pixbuf/io-bmp.c:1313 #, c-format msgid "Error while decoding colormap" msgstr "컬러맵을 디코딩하는데 오류" -#: gdk-pixbuf/io-bmp.c:1377 gdk-pixbuf/io-bmp.c:1389 +#: gdk-pixbuf/io-bmp.c:1376 gdk-pixbuf/io-bmp.c:1388 msgid "Image is too wide for BMP format." msgstr "이미지가 BMP 포맷으로는 너무 넓습니다." -#: gdk-pixbuf/io-bmp.c:1422 +#: gdk-pixbuf/io-bmp.c:1421 msgid "Couldn’t allocate memory for saving BMP file" msgstr "BMP 파일을 저장하는데 필요한 메모리 할당을 할 수 없습니다" -#: gdk-pixbuf/io-bmp.c:1463 +#: gdk-pixbuf/io-bmp.c:1462 msgid "Couldn’t write to BMP file" msgstr "BMP 파일에 쓸 수 없습니다" -#: gdk-pixbuf/io-bmp.c:1516 gdk-pixbuf/io-gdip-bmp.c:83 +#: gdk-pixbuf/io-bmp.c:1515 gdk-pixbuf/io-gdip-bmp.c:83 msgctxt "image format" msgid "BMP" msgstr "BMP" @@ -328,17 +329,17 @@ msgctxt "image format" msgid "EMF" msgstr "EMF" -#: gdk-pixbuf/io-gdip-gif.c:81 gdk-pixbuf/io-gif.c:1703 +#: gdk-pixbuf/io-gdip-gif.c:81 gdk-pixbuf/io-gif.c:1037 msgctxt "image format" msgid "GIF" msgstr "GIF" -#: gdk-pixbuf/io-gdip-ico.c:60 gdk-pixbuf/io-ico.c:1410 +#: gdk-pixbuf/io-gdip-ico.c:60 gdk-pixbuf/io-ico.c:1412 msgctxt "image format" msgid "Windows icon" msgstr "윈도우 아이콘" -#: gdk-pixbuf/io-gdip-jpeg.c:54 gdk-pixbuf/io-jpeg.c:1383 +#: gdk-pixbuf/io-gdip-jpeg.c:54 gdk-pixbuf/io-jpeg.c:1382 #, c-format msgid "" "JPEG quality must be a value between 0 and 100; value “%s” could not be " @@ -346,19 +347,19 @@ msgid "" msgstr "" "JPEG 화질은 0에서 100 사이의 값이어야 합니다. “%s” 값을 분석할 수 없습니다." -#: gdk-pixbuf/io-gdip-jpeg.c:69 gdk-pixbuf/io-jpeg.c:1399 +#: gdk-pixbuf/io-gdip-jpeg.c:69 gdk-pixbuf/io-jpeg.c:1398 #, c-format msgid "" "JPEG quality must be a value between 0 and 100; value “%d” is not allowed." msgstr "" "JPEG 화질은 0에서 100 사이의 값이어야 합니다. “%d” 값은 쓸 수 없습니다." -#: gdk-pixbuf/io-gdip-jpeg.c:147 gdk-pixbuf/io-jpeg.c:1683 +#: gdk-pixbuf/io-gdip-jpeg.c:147 gdk-pixbuf/io-jpeg.c:1682 msgctxt "image format" msgid "JPEG" msgstr "JPEG" -#: gdk-pixbuf/io-gdip-tiff.c:83 gdk-pixbuf/io-tiff.c:1082 +#: gdk-pixbuf/io-gdip-tiff.c:83 gdk-pixbuf/io-tiff.c:1086 msgctxt "image format" msgid "TIFF" msgstr "TIFF" @@ -384,19 +385,19 @@ msgstr "스트림에서 이동할 수 없습니다: %s" msgid "Could not read from stream: %s" msgstr "스트림을 읽을 수 없습니다: %s" -#: gdk-pixbuf/io-gdip-utils.c:618 +#: gdk-pixbuf/io-gdip-utils.c:620 msgid "Couldn’t load bitmap" msgstr "비트맵을 읽어 들일 수 없습니다" -#: gdk-pixbuf/io-gdip-utils.c:774 +#: gdk-pixbuf/io-gdip-utils.c:776 msgid "Couldn’t load metafile" msgstr "메타파일을 읽어 들일 수 없습니다" -#: gdk-pixbuf/io-gdip-utils.c:879 +#: gdk-pixbuf/io-gdip-utils.c:881 msgid "Unsupported image format for GDI+" msgstr "GDI+에서 지원하지 않는 이미지 형식" -#: gdk-pixbuf/io-gdip-utils.c:886 +#: gdk-pixbuf/io-gdip-utils.c:888 msgid "Couldn’t save" msgstr "저장할 수 없습니다" @@ -405,73 +406,48 @@ msgctxt "image format" msgid "WMF" msgstr "WMF" -#: gdk-pixbuf/io-gif.c:218 +#: gdk-pixbuf/io-gif.c:158 #, c-format msgid "Failure reading GIF: %s" msgstr "GIF 읽는 중 실패: %s" -#: gdk-pixbuf/io-gif.c:492 gdk-pixbuf/io-gif.c:1478 gdk-pixbuf/io-gif.c:1652 -msgid "GIF file was missing some data (perhaps it was truncated somehow?)" -msgstr "GIF 파일에 데이터가 부족합니다(중간에 잘린 파일?)" - -#: gdk-pixbuf/io-gif.c:501 -#, c-format -msgid "Internal error in the GIF loader (%s)" -msgstr "GIF 읽기에서 내부 오류 (%s)" - -#: gdk-pixbuf/io-gif.c:511 gdk-pixbuf/io-gif.c:628 -msgid "Bad code encountered" -msgstr "잘못된 코드 발견" - -#: gdk-pixbuf/io-gif.c:560 -msgid "Stack overflow" -msgstr "스택 넘침" - -#: gdk-pixbuf/io-gif.c:599 -msgid "GIF image loader cannot understand this image." -msgstr "GIF 이미지 읽기에서 이 이미지를 이해할 수 없습니다." - -#: gdk-pixbuf/io-gif.c:638 -msgid "Circular table entry in GIF file" -msgstr "GIF 파일에 순환 테이블 항목" - -#: gdk-pixbuf/io-gif.c:842 gdk-pixbuf/io-gif.c:1464 gdk-pixbuf/io-gif.c:1517 -#: gdk-pixbuf/io-gif.c:1640 +#: gdk-pixbuf/io-gif.c:381 gdk-pixbuf/io-gif.c:848 gdk-pixbuf/io-gif.c:901 +#: gdk-pixbuf/io-gif.c:974 msgid "Not enough memory to load GIF file" msgstr "GIF 파일을 읽는데 메모리가 충분하지 않습니다" -#: gdk-pixbuf/io-gif.c:936 -msgid "Not enough memory to composite a frame in GIF file" -msgstr "GIF 파일의 프레임을 만드는데 메모리가 충분하지 않습니다" - -#: gdk-pixbuf/io-gif.c:1107 +#: gdk-pixbuf/io-gif.c:507 msgid "GIF image is corrupt (incorrect LZW compression)" msgstr "GIF 이미지가 잘못되었습니다(잘못된 LZW 압축)" -#: gdk-pixbuf/io-gif.c:1162 +#: gdk-pixbuf/io-gif.c:543 msgid "File does not appear to be a GIF file" msgstr "GIF 파일이 아닌 것 같습니다" -#: gdk-pixbuf/io-gif.c:1174 +#: gdk-pixbuf/io-gif.c:558 #, c-format msgid "Version %s of the GIF file format is not supported" msgstr "GIF 파일 형식의 버전 %s은(는) 지원되지 않습니다." -#: gdk-pixbuf/io-gif.c:1221 +#: gdk-pixbuf/io-gif.c:587 msgid "Resulting GIF image has zero size" msgstr "결과 GIF 이미지의 크기가 0입니다" -#: gdk-pixbuf/io-gif.c:1300 +#: gdk-pixbuf/io-gif.c:657 msgid "" "GIF image has no global colormap, and a frame inside it has no local " "colormap." msgstr "GIF 이미지에 전체 컬러맵이 없고, 프레임 내부에 부분 컬러맵이 없습니다." -#: gdk-pixbuf/io-gif.c:1540 +#: gdk-pixbuf/io-gif.c:861 gdk-pixbuf/io-gif.c:986 +msgid "GIF file was missing some data (perhaps it was truncated somehow?)" +msgstr "GIF 파일에 데이터가 부족합니다(중간에 잘린 파일?)" + +#: gdk-pixbuf/io-gif.c:920 msgid "GIF image was truncated or incomplete." msgstr "GIF 이미지가 잘려져 있거나 불완전합니다." -#: gdk-pixbuf/io-gif.c:1547 +#: gdk-pixbuf/io-gif.c:927 msgid "Not all frames of the GIF image were loaded." msgstr "GIF 이미지의 모든 프레임을 읽어들이지 못했습니다." @@ -480,11 +456,11 @@ msgstr "GIF 이미지의 모든 프레임을 읽어들이지 못했습니다." msgid "Error reading ICNS image: %s" msgstr "ICNS 이미지를 읽어들이는데 오류: %s" -#: gdk-pixbuf/io-icns.c:380 gdk-pixbuf/io-icns.c:457 +#: gdk-pixbuf/io-icns.c:380 gdk-pixbuf/io-icns.c:461 msgid "Could not decode ICNS file" msgstr "ICNS 파일을 디코딩할 수 없습니다" -#: gdk-pixbuf/io-icns.c:516 +#: gdk-pixbuf/io-icns.c:517 msgctxt "image format" msgid "MacOS X icon" msgstr "MacOS X 아이콘" @@ -512,60 +488,27 @@ msgstr "압축된 아이콘은 지원하지 않습니다" msgid "Unsupported icon type" msgstr "지원하지 않는 아이콘 형식" -#: gdk-pixbuf/io-ico.c:581 +#: gdk-pixbuf/io-ico.c:583 msgid "Not enough memory to load ICO file" msgstr "ICO 파일을 읽는데 메모리가 충분하지 않습니다" -#: gdk-pixbuf/io-ico.c:627 +#: gdk-pixbuf/io-ico.c:629 msgid "ICO image was truncated or incomplete." msgstr "ICO 이미지가 잘려져 있거나 불완전합니다." -#: gdk-pixbuf/io-ico.c:1068 +#: gdk-pixbuf/io-ico.c:1070 msgid "Image too large to be saved as ICO" msgstr "이미지를 ICO로 저장하기에는 너무 큽니다" -#: gdk-pixbuf/io-ico.c:1079 +#: gdk-pixbuf/io-ico.c:1081 msgid "Cursor hotspot outside image" msgstr "핫스폿이 이미지 바깥에 있습니다" -#: gdk-pixbuf/io-ico.c:1102 +#: gdk-pixbuf/io-ico.c:1104 #, c-format msgid "Unsupported depth for ICO file: %d" msgstr "ICO 파일에서 지원하지 않는 색상 모드: %d" -#: gdk-pixbuf/io-jasper.c:74 -msgid "Couldn’t allocate memory for stream" -msgstr "스트림에 필요한 메모리를 할당할 수 없습니다" - -#: gdk-pixbuf/io-jasper.c:125 -msgid "Couldn’t decode image" -msgstr "이미지를 디코딩할 수 없습니다" - -#: gdk-pixbuf/io-jasper.c:143 -msgid "Transformed JPEG2000 has zero width or height" -msgstr "변환된 JPEG 2000의 너비나 높이가 0입니다." - -#: gdk-pixbuf/io-jasper.c:159 -msgid "Image type currently not supported" -msgstr "이미지 형식을 현재 지원하지 않습니다" - -#: gdk-pixbuf/io-jasper.c:171 gdk-pixbuf/io-jasper.c:179 -msgid "Couldn’t allocate memory for color profile" -msgstr "컬러 프로파일에 필요한 메모리를 할당할 수 없습니다" - -#: gdk-pixbuf/io-jasper.c:205 gdk-pixbuf/io-jasper.c:230 -msgid "Insufficient memory to open JPEG 2000 file" -msgstr "JPEG 2000 파일 여는데 메모리 부족" - -#: gdk-pixbuf/io-jasper.c:292 -msgid "Couldn’t allocate memory to buffer image data" -msgstr "이미지 데이터를 버퍼링 하는데 사용할 메모리를 할당할 수 없습니다" - -#: gdk-pixbuf/io-jasper.c:336 -msgctxt "image format" -msgid "JPEG 2000" -msgstr "JPEG 2000" - #: gdk-pixbuf/io-jpeg.c:129 #, c-format msgid "Error interpreting JPEG image file (%s)" @@ -579,17 +522,17 @@ msgstr "" "이미지를 읽어 들이기에 메모리가 부족합니다. 메모리를 확보하려면 실행중인 프" "로그램을 끝내보십시오" -#: gdk-pixbuf/io-jpeg.c:710 gdk-pixbuf/io-jpeg.c:943 +#: gdk-pixbuf/io-jpeg.c:710 gdk-pixbuf/io-jpeg.c:947 #, c-format msgid "Unsupported JPEG color space (%s)" msgstr "지원하지 않는 JPEG 색 공간 (%s)" -#: gdk-pixbuf/io-jpeg.c:821 gdk-pixbuf/io-jpeg.c:1142 gdk-pixbuf/io-jpeg.c:1490 -#: gdk-pixbuf/io-jpeg.c:1500 +#: gdk-pixbuf/io-jpeg.c:825 gdk-pixbuf/io-jpeg.c:1142 gdk-pixbuf/io-jpeg.c:1489 +#: gdk-pixbuf/io-jpeg.c:1499 msgid "Couldn’t allocate memory for loading JPEG file" msgstr "JPEG 파일을 읽어 들일 때 필요한 메모리를 할당하지 못했습니다" -#: gdk-pixbuf/io-jpeg.c:1099 +#: gdk-pixbuf/io-jpeg.c:1100 msgid "Transformed JPEG has zero width or height." msgstr "변환된 JPEG의 너비나 높이가 0입니다." @@ -598,21 +541,21 @@ msgstr "변환된 JPEG의 너비나 높이가 0입니다." msgid "Unsupported number of color components (%d)" msgstr "지원하지 않는 색 구성 요소 개수 (%d)" -#: gdk-pixbuf/io-jpeg.c:1420 +#: gdk-pixbuf/io-jpeg.c:1419 #, c-format msgid "" "JPEG x-dpi must be a value between 1 and 65535; value “%s” is not allowed." msgstr "" "JPEG x-dpi는 1에서 65535 사이의 값이어야 합니다. “%s” 값은 쓸 수 없습니다." -#: gdk-pixbuf/io-jpeg.c:1441 +#: gdk-pixbuf/io-jpeg.c:1440 #, c-format msgid "" "JPEG y-dpi must be a value between 1 and 65535; value “%s” is not allowed." msgstr "" "JPEG y-dpi는 1에서 65535 사이의 값이어야 합니다. “%s” 값은 쓸 수 없습니다." -#: gdk-pixbuf/io-jpeg.c:1455 +#: gdk-pixbuf/io-jpeg.c:1454 #, c-format msgid "Color profile has invalid length “%u”." msgstr "색 프로파일의 길이가(“%u”) 올바르지 않습니다." @@ -621,7 +564,7 @@ msgstr "색 프로파일의 길이가(“%u”) 올바르지 않습니다." msgid "Bits per channel of PNG image is invalid." msgstr "PNG 이미지의 채널 당 비트수가 잘못되었습니다." -#: gdk-pixbuf/io-png.c:144 gdk-pixbuf/io-png.c:700 +#: gdk-pixbuf/io-png.c:144 gdk-pixbuf/io-png.c:703 msgid "Transformed PNG has zero width or height." msgstr "변환된 PNG의 너비나 높이가 0입니다." @@ -646,11 +589,11 @@ msgstr "PNG 이미지 파일에서 치명적인 오류: %s" msgid "Insufficient memory to load PNG file" msgstr "PNG 파일을 읽어들이는데 메모리가 부족합니다" -#: gdk-pixbuf/io-png.c:494 gdk-pixbuf/io-png.c:515 +#: gdk-pixbuf/io-png.c:498 gdk-pixbuf/io-png.c:519 msgid "Couldn’t allocate memory for loading PNG" msgstr "PNG 파일을 읽어 들일 때 필요한 메모리를 할당하지 못했습니다" -#: gdk-pixbuf/io-png.c:713 +#: gdk-pixbuf/io-png.c:716 #, c-format msgid "" "Insufficient memory to store a %lu by %lu image; try exiting some " @@ -659,61 +602,55 @@ msgstr "" "폭 %lu 높이 %lu의 이미지를 저장할 메모리가 부족합니다. 메모리를 확보하려면 실" "행중인 프로그램을 끝내보십시오" -#: gdk-pixbuf/io-png.c:789 +#: gdk-pixbuf/io-png.c:791 msgid "Fatal error reading PNG image file" msgstr "PNG 이미지 파일을 읽어들이는데 치명적인 오류" -#: gdk-pixbuf/io-png.c:838 +#: gdk-pixbuf/io-png.c:840 #, c-format msgid "Fatal error reading PNG image file: %s" msgstr "PNG 이미지 파일을 읽어들이는데 치명적인 오류: %s" -#: gdk-pixbuf/io-png.c:930 -msgid "" -"Keys for PNG text chunks must have at least 1 and at most 79 characters." -msgstr "PNG 텍스트 부분의 키에서는 최소 1 최대 79 문자까지 쓸 수 있습니다." - -#: gdk-pixbuf/io-png.c:939 -msgid "Keys for PNG text chunks must be ASCII characters." -msgstr "PNG 텍스트 부분의 키는 아스키 문자로 되어 있어야 합니다." - -#: gdk-pixbuf/io-png.c:953 gdk-pixbuf/io-tiff.c:846 +#: gdk-pixbuf/io-png.c:937 #, c-format -msgid "Color profile has invalid length %d." -msgstr "색 프로파일의 길이가 (%d) 올바르지 않습니다." +msgid "" +"Invalid key “%s”. Keys for PNG text chunks must have at least 1 and at most " +"79 characters." +msgstr "" +"“%s” 키가 잘못되었습니다. PNG 텍스트 부분의 키에서는 최소 1 최대 79 문자까지 " +"쓸 수 있습니다." -#: gdk-pixbuf/io-png.c:966 +#: gdk-pixbuf/io-png.c:950 #, c-format -msgid "" -"PNG compression level must be a value between 0 and 9; value “%s” could not " -"be parsed." +msgid "Invalid key “%s”. Keys for PNG text chunks must be ASCII characters." msgstr "" -"PNG 압축 단계는 0에서 9 사이의 값이어야 합니다. “%s” 값을 분석할 수 없습니다." +"“%s” 키가 잘못되었습니다. PNG 텍스트 부분의 키는 아스키 문자로 되어 있어야 합" +"니다." -#: gdk-pixbuf/io-png.c:979 +#: gdk-pixbuf/io-png.c:980 #, c-format msgid "" -"PNG compression level must be a value between 0 and 9; value “%d” is not " -"allowed." -msgstr "" -"PNG 압축 단계는 0에서 9 사이의 값이어야 합니다. “%d” 값을 쓸 수 없습니다." +"Value for PNG text chunk '%s' cannot be converted to ISO-8859-1 encoding." +msgstr "PNG 텍스트 부분 '%s'의 값을 ISO-8859-1 인코딩으로 변환할 수 없습니다." -#: gdk-pixbuf/io-png.c:998 +#: gdk-pixbuf/io-png.c:992 #, c-format -msgid "PNG x-dpi must be greater than zero; value “%s” is not allowed." -msgstr "PNG x-dpi는 0보다 큰 값이어야 합니다. “%s” 값은 쓸 수 없습니다." +msgid "Color profile has invalid length %d" +msgstr "색 프로파일의 길이가 (%d) 올바르지 않습니다." -#: gdk-pixbuf/io-png.c:1018 +#: gdk-pixbuf/io-png.c:1004 #, c-format -msgid "PNG y-dpi must be greater than zero; value “%s” is not allowed." -msgstr "PNG y-dpi는 0보다 큰 값이어야 합니다. “%s” 값은 쓸 수 없습니다." +msgid "" +"PNG compression level must be a value between 0 and 9; value “%s” is invalid" +msgstr "" +"PNG 압축 단계는 0에서 9 사이의 값이어야 합니다. “%s” 값을 쓸 수 없습니다." -#: gdk-pixbuf/io-png.c:1067 +#: gdk-pixbuf/io-png.c:1018 #, c-format -msgid "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding." -msgstr "PNG 텍스트 부분 %s의 값을 ISO-8859-1 인코딩으로 변환할 수 없습니다." +msgid "PNG %s must be greater than zero; value “%s” is not allowed" +msgstr "PNG %s은(는) 0보다 큰 값이어야 합니다. “%s” 값은 쓸 수 없습니다." -#: gdk-pixbuf/io-png.c:1252 +#: gdk-pixbuf/io-png.c:1246 msgctxt "image format" msgid "PNG" msgstr "PNG" @@ -763,7 +700,7 @@ msgstr "로우 PNM 이미지 형식이 잘못되었습니다" msgid "PNM image loader does not support this PNM subformat" msgstr "PNM 이미지 읽어 들이기가 이 PNM 서브포맷을 지원하지 않습니다" -#: gdk-pixbuf/io-pnm.c:754 gdk-pixbuf/io-pnm.c:981 +#: gdk-pixbuf/io-pnm.c:754 gdk-pixbuf/io-pnm.c:991 msgid "Raw PNM formats require exactly one whitespace before sample data" msgstr "로우 PNM 형식에서는 견본 데이터 앞에 정확히 한 개의 공백이 와야 합니다" @@ -771,19 +708,19 @@ msgstr "로우 PNM 형식에서는 견본 데이터 앞에 정확히 한 개의 msgid "Cannot allocate memory for loading PNM image" msgstr "PNM 이미지를 읽어들이는데 필요한 메모리를 할당할 수 없습니다" -#: gdk-pixbuf/io-pnm.c:831 +#: gdk-pixbuf/io-pnm.c:835 msgid "Insufficient memory to load PNM context struct" msgstr "PNM 컨텍스트 구조를 읽어들이는데 메모리가 부족합니다" -#: gdk-pixbuf/io-pnm.c:882 +#: gdk-pixbuf/io-pnm.c:892 msgid "Unexpected end of PNM image data" msgstr "PNM 이미지 데이터가 갑자기 끝났습니다" -#: gdk-pixbuf/io-pnm.c:1010 +#: gdk-pixbuf/io-pnm.c:1020 msgid "Insufficient memory to load PNM file" msgstr "PNM 파일 읽는데 메모리 부족" -#: gdk-pixbuf/io-pnm.c:1094 +#: gdk-pixbuf/io-pnm.c:1103 msgctxt "image format" msgid "PNM/PBM/PGM/PPM" msgstr "PNM/PBM/PGM/PPM" @@ -796,7 +733,7 @@ msgstr "입력 파일 디스크립터가 NULL입니다." msgid "Failed to read QTIF header" msgstr "QTIF 헤더를 읽는데 실패" -#: gdk-pixbuf/io-qtif.c:150 gdk-pixbuf/io-qtif.c:187 gdk-pixbuf/io-qtif.c:454 +#: gdk-pixbuf/io-qtif.c:150 gdk-pixbuf/io-qtif.c:187 gdk-pixbuf/io-qtif.c:449 #, c-format msgid "QTIF atom size too large (%d byte)" msgid_plural "QTIF atom size too large (%d bytes)" @@ -819,48 +756,48 @@ msgid "Failed to skip the next %d byte with seek()." msgid_plural "Failed to skip the next %d bytes with seek()." msgstr[0] "seek()을 이용해 다음 %d 바이트 위치로 이동하는데 실패." -#: gdk-pixbuf/io-qtif.c:265 +#: gdk-pixbuf/io-qtif.c:269 msgid "Failed to allocate QTIF context structure." msgstr "QTIF 컨텍스트 구조를 할당하는데 실패." -#: gdk-pixbuf/io-qtif.c:325 +#: gdk-pixbuf/io-qtif.c:329 msgid "Failed to create GdkPixbufLoader object." msgstr "GdkPixbufLoader 오브젝트를 만드는데 실패." -#: gdk-pixbuf/io-qtif.c:429 +#: gdk-pixbuf/io-qtif.c:424 msgid "Failed to find an image data atom." msgstr "이미지 데이터 아톰을 찾는데 실패." -#: gdk-pixbuf/io-qtif.c:613 +#: gdk-pixbuf/io-qtif.c:599 msgctxt "image format" msgid "QuickTime" msgstr "QuickTime" -#: gdk-pixbuf/io-tga.c:349 +#: gdk-pixbuf/io-tga.c:346 msgid "Cannot allocate colormap" msgstr "컬러맵을 할당할 수 없습니다" -#: gdk-pixbuf/io-tga.c:374 +#: gdk-pixbuf/io-tga.c:371 msgid "Cannot allocate new pixbuf" msgstr "새 픽스버퍼를 할당할 수 없습니다" -#: gdk-pixbuf/io-tga.c:522 +#: gdk-pixbuf/io-tga.c:519 msgid "Unexpected bitdepth for colormap entries" msgstr "지원하지 않는 컬러맵 항목의 색상 모드" -#: gdk-pixbuf/io-tga.c:538 +#: gdk-pixbuf/io-tga.c:535 msgid "Pseudocolor image does not contain a colormap" msgstr "가상 컬러 이미지에 컬러맵이 들어있지 않습니다." -#: gdk-pixbuf/io-tga.c:581 +#: gdk-pixbuf/io-tga.c:578 msgid "Cannot allocate TGA header memory" msgstr "TGA 헤더 메모리를 할당할 수 없습니다" -#: gdk-pixbuf/io-tga.c:612 +#: gdk-pixbuf/io-tga.c:609 msgid "TGA image has invalid dimensions" msgstr "TGA 이미지의 크기가 잘못되었습니다" -#: gdk-pixbuf/io-tga.c:618 gdk-pixbuf/io-tga.c:625 +#: gdk-pixbuf/io-tga.c:615 gdk-pixbuf/io-tga.c:622 msgid "TGA image type not supported" msgstr "TGA 이미지 형식은 지원하지 않습니다" @@ -868,11 +805,11 @@ msgstr "TGA 이미지 형식은 지원하지 않습니다" msgid "Cannot allocate memory for TGA context struct" msgstr "TGA 컨텍스트 구조에 필요한 메모리를 할당할 수 없습니다" -#: gdk-pixbuf/io-tga.c:711 +#: gdk-pixbuf/io-tga.c:712 msgid "TGA image was truncated or incomplete." msgstr "TGA 이미지가 잘려져 있거나 불완전합니다." -#: gdk-pixbuf/io-tga.c:763 +#: gdk-pixbuf/io-tga.c:764 msgctxt "image format" msgid "Targa" msgstr "Targa" @@ -893,7 +830,7 @@ msgstr "TIFF 이미지의 너비나 높이가 0입니다" msgid "Dimensions of TIFF image too large" msgstr "TIFF 이미지의 크기가 너무 큽니다" -#: gdk-pixbuf/io-tiff.c:176 gdk-pixbuf/io-tiff.c:188 gdk-pixbuf/io-tiff.c:580 +#: gdk-pixbuf/io-tiff.c:176 gdk-pixbuf/io-tiff.c:188 gdk-pixbuf/io-tiff.c:584 msgid "Insufficient memory to open TIFF file" msgstr "TIFF 파일 여는데 메모리 부족" @@ -905,37 +842,42 @@ msgstr "TIFF 파일에서 RGB 데이터 읽기 실패" msgid "Failed to open TIFF image" msgstr "TIFF 이미지 열기 실패" -#: gdk-pixbuf/io-tiff.c:511 gdk-pixbuf/io-tiff.c:523 +#: gdk-pixbuf/io-tiff.c:515 gdk-pixbuf/io-tiff.c:527 msgid "Failed to load TIFF image" msgstr "TIFF 이미지를 읽어들이는데 실패" -#: gdk-pixbuf/io-tiff.c:755 +#: gdk-pixbuf/io-tiff.c:759 msgid "Failed to save TIFF image" msgstr "TIFF 이미지를 저장하는데 실패" -#: gdk-pixbuf/io-tiff.c:816 +#: gdk-pixbuf/io-tiff.c:820 msgid "TIFF compression doesn’t refer to a valid codec." msgstr "TIFF 압축이 가리키는 코덱이 올바르지 않습니다." -#: gdk-pixbuf/io-tiff.c:861 +#: gdk-pixbuf/io-tiff.c:850 +#, c-format +msgid "Color profile has invalid length %d." +msgstr "색 프로파일의 길이가 (%d) 올바르지 않습니다." + +#: gdk-pixbuf/io-tiff.c:865 msgid "TIFF bits-per-sample doesn’t contain a supported value." msgstr "TIFF 샘플당 비트 수 값이 지원하는 값이 아닙니다." -#: gdk-pixbuf/io-tiff.c:942 +#: gdk-pixbuf/io-tiff.c:946 msgid "Failed to write TIFF data" msgstr "TIFF 데이터를 쓰는데 실패" -#: gdk-pixbuf/io-tiff.c:960 +#: gdk-pixbuf/io-tiff.c:964 #, c-format msgid "TIFF x-dpi must be greater than zero; value “%s” is not allowed." msgstr "TIFF x-dpi는 0보다 큰 값이어야 합니다. “%s” 값은 쓸 수 없습니다." -#: gdk-pixbuf/io-tiff.c:972 +#: gdk-pixbuf/io-tiff.c:976 #, c-format msgid "TIFF y-dpi must be greater than zero; value “%s” is not allowed." msgstr "TIFF y-dpi는 0보다 큰 값이어야 합니다. “%s” 값은 쓸 수 없습니다." -#: gdk-pixbuf/io-tiff.c:1013 +#: gdk-pixbuf/io-tiff.c:1017 msgid "Couldn’t write to TIFF file" msgstr "TIFF 파일에 쓸 수 없습니다" @@ -943,15 +885,15 @@ msgstr "TIFF 파일에 쓸 수 없습니다" msgid "Invalid XBM file" msgstr "잘못된 XBM 파일" -#: gdk-pixbuf/io-xbm.c:330 +#: gdk-pixbuf/io-xbm.c:331 msgid "Insufficient memory to load XBM image file" msgstr "XBM 이미지 파일을 읽어 들이기에 메모리가 부족합니다" -#: gdk-pixbuf/io-xbm.c:478 +#: gdk-pixbuf/io-xbm.c:482 msgid "Failed to write to temporary file when loading XBM image" msgstr "XBM 이미지를 읽어들이는데 임시 파일을 쓸 수 없습니다" -#: gdk-pixbuf/io-xbm.c:517 +#: gdk-pixbuf/io-xbm.c:521 msgctxt "image format" msgid "XBM" msgstr "XBM" @@ -992,11 +934,64 @@ msgstr "XPM 컬러맵을 읽을 수 없습니다" msgid "Dimensions do not match data" msgstr "이미지 크기가 픽셀 데이터와 일치하지 않습니다" -#: gdk-pixbuf/io-xpm.c:804 +#: gdk-pixbuf/io-xpm.c:806 msgid "Failed to write to temporary file when loading XPM image" msgstr "XPM 이미지를 읽어들이는데 임시 파일을 쓸 수 없습니다" -#: gdk-pixbuf/io-xpm.c:843 +#: gdk-pixbuf/io-xpm.c:845 msgctxt "image format" msgid "XPM" msgstr "XPM" + +#~ msgid "Internal error in the GIF loader (%s)" +#~ msgstr "GIF 읽기에서 내부 오류 (%s)" + +#~ msgid "Bad code encountered" +#~ msgstr "잘못된 코드 발견" + +#~ msgid "Stack overflow" +#~ msgstr "스택 넘침" + +#~ msgid "GIF image loader cannot understand this image." +#~ msgstr "GIF 이미지 읽기에서 이 이미지를 이해할 수 없습니다." + +#~ msgid "Circular table entry in GIF file" +#~ msgstr "GIF 파일에 순환 테이블 항목" + +#~ msgid "Not enough memory to composite a frame in GIF file" +#~ msgstr "GIF 파일의 프레임을 만드는데 메모리가 충분하지 않습니다" + +#~ msgid "Couldn’t allocate memory for stream" +#~ msgstr "스트림에 필요한 메모리를 할당할 수 없습니다" + +#~ msgid "Couldn’t decode image" +#~ msgstr "이미지를 디코딩할 수 없습니다" + +#~ msgid "Transformed JPEG2000 has zero width or height" +#~ msgstr "변환된 JPEG 2000의 너비나 높이가 0입니다." + +#~ msgid "Image type currently not supported" +#~ msgstr "이미지 형식을 현재 지원하지 않습니다" + +#~ msgid "Couldn’t allocate memory for color profile" +#~ msgstr "컬러 프로파일에 필요한 메모리를 할당할 수 없습니다" + +#~ msgid "Insufficient memory to open JPEG 2000 file" +#~ msgstr "JPEG 2000 파일 여는데 메모리 부족" + +#~ msgid "Couldn’t allocate memory to buffer image data" +#~ msgstr "이미지 데이터를 버퍼링 하는데 사용할 메모리를 할당할 수 없습니다" + +#~ msgctxt "image format" +#~ msgid "JPEG 2000" +#~ msgstr "JPEG 2000" + +#~ msgid "" +#~ "PNG compression level must be a value between 0 and 9; value “%s” could " +#~ "not be parsed." +#~ msgstr "" +#~ "PNG 압축 단계는 0에서 9 사이의 값이어야 합니다. “%s” 값을 분석할 수 없습니" +#~ "다." + +#~ msgid "PNG y-dpi must be greater than zero; value “%s” is not allowed." +#~ msgstr "PNG y-dpi는 0보다 큰 값이어야 합니다. “%s” 값은 쓸 수 없습니다." @@ -5,35 +5,35 @@ # Raivis Dejus <orvils@gmail.com>, 2006, 2007, 2009. # Anita Reitere <nitalynx@gmail.com>, 2010. # Rudolfs <rudolfs.mazurs@gmail.com>, 2011, 2012. -# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2012, 2013, 2016, 2017, 2018, 2019. +# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2012, 2013, 2016, 2017, 2018, 2019, 2021. msgid "" msgstr "" "Project-Id-Version: gtk+.HEAD\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gdk-pixbuf/issues\n" -"POT-Creation-Date: 2019-03-01 11:34+0000\n" -"PO-Revision-Date: 2019-03-03 12:22+0200\n" +"POT-Creation-Date: 2020-11-10 02:27+0000\n" +"PO-Revision-Date: 2021-03-07 20:50+0200\n" "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n" "Language-Team: Latvian <lata-l10n@googlegroups.com>\n" "Language: lv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.12.3\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 :" " 2);\n" -#: gdk-pixbuf/gdk-pixbuf-animation.c:157 gdk-pixbuf/gdk-pixbuf-io.c:1101 -#: gdk-pixbuf/gdk-pixbuf-io.c:1363 +#: gdk-pixbuf/gdk-pixbuf-animation.c:175 gdk-pixbuf/gdk-pixbuf-io.c:1125 +#: gdk-pixbuf/gdk-pixbuf-io.c:1387 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Neizdevās atvērt datni “%s” — %s" -#: gdk-pixbuf/gdk-pixbuf-animation.c:170 gdk-pixbuf/gdk-pixbuf-io.c:985 +#: gdk-pixbuf/gdk-pixbuf-animation.c:188 gdk-pixbuf/gdk-pixbuf-io.c:992 #, c-format msgid "Image file “%s” contains no data" msgstr "Attēla datne “%s” nesatur datus" -#: gdk-pixbuf/gdk-pixbuf-animation.c:208 +#: gdk-pixbuf/gdk-pixbuf-animation.c:226 #, c-format msgid "" "Failed to load animation “%s”: reason not known, probably a corrupt " @@ -42,8 +42,8 @@ msgstr "" "Neizdevās ielādēt animāciju “%s” — iemesls nezināms, iespējams, bojāta " "animācijas datne" -#: gdk-pixbuf/gdk-pixbuf-animation.c:276 gdk-pixbuf/gdk-pixbuf-io.c:1137 -#: gdk-pixbuf/gdk-pixbuf-io.c:1415 +#: gdk-pixbuf/gdk-pixbuf-animation.c:294 gdk-pixbuf/gdk-pixbuf-io.c:1161 +#: gdk-pixbuf/gdk-pixbuf-io.c:1439 #, c-format msgid "" "Failed to load image “%s”: reason not known, probably a corrupt image file" @@ -51,85 +51,85 @@ msgstr "" "Neizdevās ielādēt attēlu “%s” — iemesls nezināms, iespējams, bojāta attēla " "datne" -#: gdk-pixbuf/gdk-pixbuf.c:166 +#: gdk-pixbuf/gdk-pixbuf.c:237 msgid "Number of Channels" msgstr "Kanālu skaits" -#: gdk-pixbuf/gdk-pixbuf.c:167 +#: gdk-pixbuf/gdk-pixbuf.c:238 msgid "The number of samples per pixel" msgstr "Paraugu skaits uz pikseli" -#: gdk-pixbuf/gdk-pixbuf.c:176 +#: gdk-pixbuf/gdk-pixbuf.c:247 msgid "Colorspace" msgstr "Krāsu telpa" -#: gdk-pixbuf/gdk-pixbuf.c:177 +#: gdk-pixbuf/gdk-pixbuf.c:248 msgid "The colorspace in which the samples are interpreted" msgstr "Krāsu telpa, kurā tiek interpretēti pikseļi" -#: gdk-pixbuf/gdk-pixbuf.c:185 +#: gdk-pixbuf/gdk-pixbuf.c:256 msgid "Has Alpha" msgstr "Ir alfa" -#: gdk-pixbuf/gdk-pixbuf.c:186 +#: gdk-pixbuf/gdk-pixbuf.c:257 msgid "Whether the pixbuf has an alpha channel" msgstr "Vai pikseļu buferī ir alfa kanāls" -#: gdk-pixbuf/gdk-pixbuf.c:199 +#: gdk-pixbuf/gdk-pixbuf.c:270 msgid "Bits per Sample" msgstr "Biti paraugā" -#: gdk-pixbuf/gdk-pixbuf.c:200 +#: gdk-pixbuf/gdk-pixbuf.c:271 msgid "The number of bits per sample" msgstr "Bitu skaits paraugā" -#: gdk-pixbuf/gdk-pixbuf.c:209 +#: gdk-pixbuf/gdk-pixbuf.c:280 msgid "Width" msgstr "Platums" -#: gdk-pixbuf/gdk-pixbuf.c:210 +#: gdk-pixbuf/gdk-pixbuf.c:281 msgid "The number of columns of the pixbuf" msgstr "Kolonnu skaits pikseļu buferī" -#: gdk-pixbuf/gdk-pixbuf.c:219 +#: gdk-pixbuf/gdk-pixbuf.c:290 msgid "Height" msgstr "Augstums" -#: gdk-pixbuf/gdk-pixbuf.c:220 +#: gdk-pixbuf/gdk-pixbuf.c:291 msgid "The number of rows of the pixbuf" msgstr "Rindu skaits pikseļu buferī" -#: gdk-pixbuf/gdk-pixbuf.c:236 +#: gdk-pixbuf/gdk-pixbuf.c:307 msgid "Rowstride" msgstr "Rindas solis" -#: gdk-pixbuf/gdk-pixbuf.c:237 +#: gdk-pixbuf/gdk-pixbuf.c:308 msgid "" "The number of bytes between the start of a row and the start of the next row" msgstr "Baitu skaits starp rindas sākumu un nākamās rindas sākumu" -#: gdk-pixbuf/gdk-pixbuf.c:246 +#: gdk-pixbuf/gdk-pixbuf.c:317 msgid "Pixels" msgstr "Pikseļi" -#: gdk-pixbuf/gdk-pixbuf.c:247 +#: gdk-pixbuf/gdk-pixbuf.c:318 msgid "A pointer to the pixel data of the pixbuf" msgstr "Norāde uz pikseļu bufera pikseļu datiem" -#: gdk-pixbuf/gdk-pixbuf.c:261 +#: gdk-pixbuf/gdk-pixbuf.c:332 msgid "Pixel Bytes" msgstr "Pikseļu baiti" -#: gdk-pixbuf/gdk-pixbuf.c:262 +#: gdk-pixbuf/gdk-pixbuf.c:333 msgid "Readonly pixel data" msgstr "Tikai lasāmi pikseļu dati" -#: gdk-pixbuf/gdk-pixbuf-io.c:805 +#: gdk-pixbuf/gdk-pixbuf-io.c:812 #, c-format msgid "Unable to load image-loading module: %s: %s" msgstr "Neizdevās ielādēt attēla ielādēšanas moduli: %s — %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:820 +#: gdk-pixbuf/gdk-pixbuf-io.c:827 #, c-format msgid "" "Image-loading module %s does not export the proper interface; perhaps it’s " @@ -138,54 +138,54 @@ msgstr "" "Attēla ielādes modulis %s neeksportē pareizo saskarni; varbūt tā ir no citas " "gdk-pixbuf versijas?" -#: gdk-pixbuf/gdk-pixbuf-io.c:829 gdk-pixbuf/gdk-pixbuf-io.c:872 +#: gdk-pixbuf/gdk-pixbuf-io.c:836 gdk-pixbuf/gdk-pixbuf-io.c:879 #, c-format msgid "Image type “%s” is not supported" msgstr "Attēlu tips “%s” nav atbalstīts" -#: gdk-pixbuf/gdk-pixbuf-io.c:957 +#: gdk-pixbuf/gdk-pixbuf-io.c:964 #, c-format msgid "Couldn’t recognize the image file format for file “%s”" msgstr "Neizdevās atpazīt attēla datnes formātu datnei “%s”" -#: gdk-pixbuf/gdk-pixbuf-io.c:965 +#: gdk-pixbuf/gdk-pixbuf-io.c:972 msgid "Unrecognized image file format" msgstr "Neatpazīts attēla datnes formāts" -#: gdk-pixbuf/gdk-pixbuf-io.c:1148 +#: gdk-pixbuf/gdk-pixbuf-io.c:1172 #, c-format msgid "Failed to load image “%s”: %s" msgstr "Neizdevās ielādēt attēlu “%s” — %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2218 gdk-pixbuf/io-gdip-utils.c:838 +#: gdk-pixbuf/gdk-pixbuf-io.c:2242 gdk-pixbuf/io-gdip-utils.c:840 #, c-format msgid "Error writing to image file: %s" msgstr "Kļūda, rakstot attēla datnē — %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2260 gdk-pixbuf/gdk-pixbuf-io.c:2381 +#: gdk-pixbuf/gdk-pixbuf-io.c:2284 gdk-pixbuf/gdk-pixbuf-io.c:2405 #, c-format msgid "This build of gdk-pixbuf does not support saving the image format: %s" msgstr "" "Šis gdk-pixbuf būvējums nesatur atbalstu, lai saglabātu attēla formātu — %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2291 +#: gdk-pixbuf/gdk-pixbuf-io.c:2315 msgid "Insufficient memory to save image to callback" msgstr "Nepietiek atmiņas, lai saglabātu attēlu atzvanam" -#: gdk-pixbuf/gdk-pixbuf-io.c:2304 +#: gdk-pixbuf/gdk-pixbuf-io.c:2328 msgid "Failed to open temporary file" msgstr "Neizdevās atvērt pagaidu datni" -#: gdk-pixbuf/gdk-pixbuf-io.c:2327 +#: gdk-pixbuf/gdk-pixbuf-io.c:2351 msgid "Failed to read from temporary file" msgstr "Neizdevās nolasīt no pagaidu datnes" -#: gdk-pixbuf/gdk-pixbuf-io.c:2537 +#: gdk-pixbuf/gdk-pixbuf-io.c:2561 #, c-format msgid "Failed to open “%s” for writing: %s" msgstr "Neizdevās atvērt “%s” rakstīšanai — %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2563 +#: gdk-pixbuf/gdk-pixbuf-io.c:2587 #, c-format msgid "" "Failed to close “%s” while writing image, all data may not have been saved: " @@ -193,11 +193,11 @@ msgid "" msgstr "" "Neizdevās aizvērt “%s”, rakstot attēlu, ne visi dati var būt saglabāti — %s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2784 gdk-pixbuf/gdk-pixbuf-io.c:2836 +#: gdk-pixbuf/gdk-pixbuf-io.c:2808 gdk-pixbuf/gdk-pixbuf-io.c:2860 msgid "Insufficient memory to save image into a buffer" msgstr "Nepietiek atmiņas, lai attēlu saglabātu buferī" -#: gdk-pixbuf/gdk-pixbuf-io.c:2882 +#: gdk-pixbuf/gdk-pixbuf-io.c:2906 msgid "Error writing to image stream" msgstr "Kļūda, rakstot attēla straumē" @@ -215,11 +215,11 @@ msgstr "" msgid "Incremental loading of image type “%s” is not supported" msgstr "Pakāpeniskā ielāde attēlu tipam “%s” nav atbalstīta" -#: gdk-pixbuf/gdk-pixbuf-simple-anim.c:161 +#: gdk-pixbuf/gdk-pixbuf-simple-anim.c:162 msgid "Loop" msgstr "Cikls" -#: gdk-pixbuf/gdk-pixbuf-simple-anim.c:162 +#: gdk-pixbuf/gdk-pixbuf-simple-anim.c:163 msgid "Whether the animation should loop when it reaches the end" msgstr "Vai animācijai jāciklojas, kad tā sasniedz beigas" @@ -244,36 +244,36 @@ msgstr[0] "neizdevās izveidot %u baita lielu attēla buferi" msgstr[1] "neizdevās izveidot %u baitu lielu attēla buferi" msgstr[2] "neizdevās izveidot %u baitu lielu attēla buferi " -#: gdk-pixbuf/io-ani.c:241 +#: gdk-pixbuf/io-ani.c:239 msgid "Unexpected icon chunk in animation" msgstr "Negaidīts ikonas fragments animācijā" -#: gdk-pixbuf/io-ani.c:339 gdk-pixbuf/io-ani.c:397 gdk-pixbuf/io-ani.c:423 -#: gdk-pixbuf/io-ani.c:446 gdk-pixbuf/io-ani.c:473 gdk-pixbuf/io-ani.c:560 +#: gdk-pixbuf/io-ani.c:337 gdk-pixbuf/io-ani.c:395 gdk-pixbuf/io-ani.c:421 +#: gdk-pixbuf/io-ani.c:444 gdk-pixbuf/io-ani.c:471 gdk-pixbuf/io-ani.c:558 msgid "Invalid header in animation" msgstr "Nederīga galvene animācijā" -#: gdk-pixbuf/io-ani.c:349 gdk-pixbuf/io-ani.c:371 gdk-pixbuf/io-ani.c:455 -#: gdk-pixbuf/io-ani.c:482 gdk-pixbuf/io-ani.c:533 gdk-pixbuf/io-ani.c:605 +#: gdk-pixbuf/io-ani.c:347 gdk-pixbuf/io-ani.c:369 gdk-pixbuf/io-ani.c:453 +#: gdk-pixbuf/io-ani.c:480 gdk-pixbuf/io-ani.c:531 gdk-pixbuf/io-ani.c:607 msgid "Not enough memory to load animation" msgstr "Nav pietiekami daudz atmiņas, lai ielādētu animāciju" -#: gdk-pixbuf/io-ani.c:389 gdk-pixbuf/io-ani.c:415 gdk-pixbuf/io-ani.c:434 +#: gdk-pixbuf/io-ani.c:387 gdk-pixbuf/io-ani.c:413 gdk-pixbuf/io-ani.c:432 msgid "Malformed chunk in animation" msgstr "Slikti formēts fragments animācijā" -#: gdk-pixbuf/io-ani.c:627 +#: gdk-pixbuf/io-ani.c:629 msgid "ANI image was truncated or incomplete." msgstr "ANI attēls ir ticis aprauts vai ir nepilnīgs." -#: gdk-pixbuf/io-ani.c:668 +#: gdk-pixbuf/io-ani.c:670 msgctxt "image format" msgid "Windows animated cursor" msgstr "Windows animēts kursors" #: gdk-pixbuf/io-bmp.c:231 gdk-pixbuf/io-bmp.c:269 gdk-pixbuf/io-bmp.c:376 #: gdk-pixbuf/io-bmp.c:403 gdk-pixbuf/io-bmp.c:428 gdk-pixbuf/io-bmp.c:463 -#: gdk-pixbuf/io-bmp.c:485 gdk-pixbuf/io-bmp.c:564 +#: gdk-pixbuf/io-bmp.c:485 gdk-pixbuf/io-bmp.c:563 msgid "BMP image has bogus header data" msgstr "BMP attēlam ir apšaubāmi galvenes dati" @@ -301,28 +301,29 @@ msgstr "Nevar saspiest lejupejošos BMP attēlus" msgid "BMP image width too large" msgstr "BMP attēls ir pārāk liels" -#: gdk-pixbuf/io-bmp.c:788 gdk-pixbuf/io-png.c:560 gdk-pixbuf/io-pnm.c:722 +#: gdk-pixbuf/io-bmp.c:792 gdk-pixbuf/io-png.c:564 gdk-pixbuf/io-pnm.c:722 +#: gdk-pixbuf/io-pnm.c:879 msgid "Premature end-of-file encountered" msgstr "Priekšlaicīgas datnes beigas (end-of-file)" -#: gdk-pixbuf/io-bmp.c:1314 +#: gdk-pixbuf/io-bmp.c:1313 #, c-format msgid "Error while decoding colormap" msgstr "Kļūda, atkodējot krāsu karti" -#: gdk-pixbuf/io-bmp.c:1377 gdk-pixbuf/io-bmp.c:1389 +#: gdk-pixbuf/io-bmp.c:1376 gdk-pixbuf/io-bmp.c:1388 msgid "Image is too wide for BMP format." msgstr "Attēls ir pārāk plats BMP formātam." -#: gdk-pixbuf/io-bmp.c:1422 +#: gdk-pixbuf/io-bmp.c:1421 msgid "Couldn’t allocate memory for saving BMP file" msgstr "Neizdevās piešķirt atmiņu, lai saglabātu BMP datni" -#: gdk-pixbuf/io-bmp.c:1463 +#: gdk-pixbuf/io-bmp.c:1462 msgid "Couldn’t write to BMP file" msgstr "Neizdevās rakstīt BMP datnē" -#: gdk-pixbuf/io-bmp.c:1516 gdk-pixbuf/io-gdip-bmp.c:83 +#: gdk-pixbuf/io-bmp.c:1515 gdk-pixbuf/io-gdip-bmp.c:83 msgctxt "image format" msgid "BMP" msgstr "BMP" @@ -332,17 +333,17 @@ msgctxt "image format" msgid "EMF" msgstr "EMF" -#: gdk-pixbuf/io-gdip-gif.c:81 gdk-pixbuf/io-gif.c:1703 +#: gdk-pixbuf/io-gdip-gif.c:81 gdk-pixbuf/io-gif.c:1043 msgctxt "image format" msgid "GIF" msgstr "GIF" -#: gdk-pixbuf/io-gdip-ico.c:60 gdk-pixbuf/io-ico.c:1410 +#: gdk-pixbuf/io-gdip-ico.c:60 gdk-pixbuf/io-ico.c:1412 msgctxt "image format" msgid "Windows icon" msgstr "Windows ikona" -#: gdk-pixbuf/io-gdip-jpeg.c:54 gdk-pixbuf/io-jpeg.c:1383 +#: gdk-pixbuf/io-gdip-jpeg.c:54 gdk-pixbuf/io-jpeg.c:1382 #, c-format msgid "" "JPEG quality must be a value between 0 and 100; value “%s” could not be " @@ -351,7 +352,7 @@ msgstr "" "JPEG kvalitātei jābūt apzīmētai ar vērtību no 0 līdz 100. Vērtību “%s” " "neizdevās interpretēt." -#: gdk-pixbuf/io-gdip-jpeg.c:69 gdk-pixbuf/io-jpeg.c:1399 +#: gdk-pixbuf/io-gdip-jpeg.c:69 gdk-pixbuf/io-jpeg.c:1398 #, c-format msgid "" "JPEG quality must be a value between 0 and 100; value “%d” is not allowed." @@ -359,12 +360,12 @@ msgstr "" "JPEG kvalitātei jābūt apzīmētai ar vērtību no 0 līdz 100. Vērtība “%d” nav " "atļauta." -#: gdk-pixbuf/io-gdip-jpeg.c:147 gdk-pixbuf/io-jpeg.c:1683 +#: gdk-pixbuf/io-gdip-jpeg.c:147 gdk-pixbuf/io-jpeg.c:1682 msgctxt "image format" msgid "JPEG" msgstr "JPEG" -#: gdk-pixbuf/io-gdip-tiff.c:83 gdk-pixbuf/io-tiff.c:1082 +#: gdk-pixbuf/io-gdip-tiff.c:83 gdk-pixbuf/io-tiff.c:1086 msgctxt "image format" msgid "TIFF" msgstr "TIFF" @@ -390,19 +391,19 @@ msgstr "Neizdevās meklēt straumē — %s" msgid "Could not read from stream: %s" msgstr "Neizdevās nolasīt no straumes — %s" -#: gdk-pixbuf/io-gdip-utils.c:618 +#: gdk-pixbuf/io-gdip-utils.c:620 msgid "Couldn’t load bitmap" msgstr "Neizdevās ielādēt bitkarti" -#: gdk-pixbuf/io-gdip-utils.c:774 +#: gdk-pixbuf/io-gdip-utils.c:776 msgid "Couldn’t load metafile" msgstr "Neizdevās ielādēt metafailu" -#: gdk-pixbuf/io-gdip-utils.c:879 +#: gdk-pixbuf/io-gdip-utils.c:881 msgid "Unsupported image format for GDI+" msgstr "Neatbalstīts GDI+ attēla formāts" -#: gdk-pixbuf/io-gdip-utils.c:886 +#: gdk-pixbuf/io-gdip-utils.c:888 msgid "Couldn’t save" msgstr "Neizdevās saglabāt" @@ -411,63 +412,34 @@ msgctxt "image format" msgid "WMF" msgstr "WMF" -#: gdk-pixbuf/io-gif.c:218 +#: gdk-pixbuf/io-gif.c:158 #, c-format msgid "Failure reading GIF: %s" msgstr "Kļūda, nolasot GIF — %s" -#: gdk-pixbuf/io-gif.c:492 gdk-pixbuf/io-gif.c:1478 gdk-pixbuf/io-gif.c:1652 -msgid "GIF file was missing some data (perhaps it was truncated somehow?)" -msgstr "GIF datnei iztrūkst dati (varbūt tas ticis aprauts?)" - -#: gdk-pixbuf/io-gif.c:501 -#, c-format -msgid "Internal error in the GIF loader (%s)" -msgstr "Iekšēja kļūda GIF ielādētājā (%s)" - -#: gdk-pixbuf/io-gif.c:511 gdk-pixbuf/io-gif.c:628 -msgid "Bad code encountered" -msgstr "Sastapts slikts kods" - -#: gdk-pixbuf/io-gif.c:560 -msgid "Stack overflow" -msgstr "Steka pārpilde" - -#: gdk-pixbuf/io-gif.c:599 -msgid "GIF image loader cannot understand this image." -msgstr "GIF attēlu ielādētājs nespēj saprast šo attēlu." - -#: gdk-pixbuf/io-gif.c:638 -msgid "Circular table entry in GIF file" -msgstr "Cirkulārs tabulas ieraksts GIF datnē" - -#: gdk-pixbuf/io-gif.c:842 gdk-pixbuf/io-gif.c:1464 gdk-pixbuf/io-gif.c:1517 -#: gdk-pixbuf/io-gif.c:1640 +#: gdk-pixbuf/io-gif.c:381 gdk-pixbuf/io-gif.c:854 gdk-pixbuf/io-gif.c:907 +#: gdk-pixbuf/io-gif.c:980 msgid "Not enough memory to load GIF file" msgstr "Nepietiek atmiņas, lai ielādētu GIF datni" -#: gdk-pixbuf/io-gif.c:936 -msgid "Not enough memory to composite a frame in GIF file" -msgstr "Nepietiek atmiņas, lai GIF datnē izveidotu kadru" - -#: gdk-pixbuf/io-gif.c:1107 +#: gdk-pixbuf/io-gif.c:507 msgid "GIF image is corrupt (incorrect LZW compression)" msgstr "GIF datne ir bojāta (nepareiza LZW kompresija)" -#: gdk-pixbuf/io-gif.c:1162 +#: gdk-pixbuf/io-gif.c:536 msgid "File does not appear to be a GIF file" msgstr "Šķiet, ka datne nav GIF datne" -#: gdk-pixbuf/io-gif.c:1174 +#: gdk-pixbuf/io-gif.c:551 #, c-format msgid "Version %s of the GIF file format is not supported" msgstr "GIF datnes formāta versija %s nav atbalstīta" -#: gdk-pixbuf/io-gif.c:1221 +#: gdk-pixbuf/io-gif.c:586 msgid "Resulting GIF image has zero size" msgstr "Iegūtajam GIF attēlam ir nulles izmērs" -#: gdk-pixbuf/io-gif.c:1300 +#: gdk-pixbuf/io-gif.c:664 msgid "" "GIF image has no global colormap, and a frame inside it has no local " "colormap." @@ -475,11 +447,15 @@ msgstr "" "GIF attēlam nav globālas krāsu kartes, un kadram tā iekšpusē nav lokālas " "krāsu kartes." -#: gdk-pixbuf/io-gif.c:1540 +#: gdk-pixbuf/io-gif.c:867 gdk-pixbuf/io-gif.c:992 +msgid "GIF file was missing some data (perhaps it was truncated somehow?)" +msgstr "GIF datnei iztrūkst dati (varbūt tas ticis aprauts?)" + +#: gdk-pixbuf/io-gif.c:926 msgid "GIF image was truncated or incomplete." msgstr "GIF attēls ir ticis aprauts vai ir nepilnīgs." -#: gdk-pixbuf/io-gif.c:1547 +#: gdk-pixbuf/io-gif.c:933 msgid "Not all frames of the GIF image were loaded." msgstr "Ne visi GIF attēla kadri tika ielādēti." @@ -488,11 +464,11 @@ msgstr "Ne visi GIF attēla kadri tika ielādēti." msgid "Error reading ICNS image: %s" msgstr "Kļūda, nolasot ICNS attēlu — %s" -#: gdk-pixbuf/io-icns.c:380 gdk-pixbuf/io-icns.c:457 +#: gdk-pixbuf/io-icns.c:380 gdk-pixbuf/io-icns.c:461 msgid "Could not decode ICNS file" msgstr "Neizdevās atkodēt ICNS datni" -#: gdk-pixbuf/io-icns.c:516 +#: gdk-pixbuf/io-icns.c:517 msgctxt "image format" msgid "MacOS X icon" msgstr "MacOS X ikona" @@ -520,60 +496,27 @@ msgstr "Kompresētas ikonas nav atbalstītas" msgid "Unsupported icon type" msgstr "Neatbalstīts ikonu tips" -#: gdk-pixbuf/io-ico.c:581 +#: gdk-pixbuf/io-ico.c:583 msgid "Not enough memory to load ICO file" msgstr "Nepietiek atmiņas, lai ielādētu ICO datni" -#: gdk-pixbuf/io-ico.c:627 +#: gdk-pixbuf/io-ico.c:629 msgid "ICO image was truncated or incomplete." msgstr "ICO attēls ir ticis aprauts vai ir nepilnīgs." -#: gdk-pixbuf/io-ico.c:1068 +#: gdk-pixbuf/io-ico.c:1070 msgid "Image too large to be saved as ICO" msgstr "Attēls ir pārāk liels, lai to saglabātu kā ICO" -#: gdk-pixbuf/io-ico.c:1079 +#: gdk-pixbuf/io-ico.c:1081 msgid "Cursor hotspot outside image" msgstr "Kursora karstvieta ārpus attēla" -#: gdk-pixbuf/io-ico.c:1102 +#: gdk-pixbuf/io-ico.c:1104 #, c-format msgid "Unsupported depth for ICO file: %d" msgstr "Neatbalstīts ICO datnes dziļums — %d" -#: gdk-pixbuf/io-jasper.c:74 -msgid "Couldn’t allocate memory for stream" -msgstr "Neizdevās piešķirt atmiņu straumei" - -#: gdk-pixbuf/io-jasper.c:125 -msgid "Couldn’t decode image" -msgstr "Neizdevās atkodēt attēlu" - -#: gdk-pixbuf/io-jasper.c:143 -msgid "Transformed JPEG2000 has zero width or height" -msgstr "Pārveidotajam JPEG2000 trūkst platuma vai augstuma" - -#: gdk-pixbuf/io-jasper.c:159 -msgid "Image type currently not supported" -msgstr "Attēla tips šobrīd nav atbalstīts" - -#: gdk-pixbuf/io-jasper.c:171 gdk-pixbuf/io-jasper.c:179 -msgid "Couldn’t allocate memory for color profile" -msgstr "Neizdevās piešķirt atmiņu krāsu profilam" - -#: gdk-pixbuf/io-jasper.c:205 gdk-pixbuf/io-jasper.c:230 -msgid "Insufficient memory to open JPEG 2000 file" -msgstr "Nepietiek atmiņas JPEG 2000 datnes atvēršanai" - -#: gdk-pixbuf/io-jasper.c:292 -msgid "Couldn’t allocate memory to buffer image data" -msgstr "Neizdevās piešķirt atmiņu attēla datu buferim" - -#: gdk-pixbuf/io-jasper.c:336 -msgctxt "image format" -msgid "JPEG 2000" -msgstr "JPEG 2000" - #: gdk-pixbuf/io-jpeg.c:129 #, c-format msgid "Error interpreting JPEG image file (%s)" @@ -587,17 +530,17 @@ msgstr "" "Pietrūkst atmiņas, lai ielādētu attēlu. Atmiņu varētu atbrīvot, izslēdzot " "dažas programmas." -#: gdk-pixbuf/io-jpeg.c:710 gdk-pixbuf/io-jpeg.c:943 +#: gdk-pixbuf/io-jpeg.c:710 gdk-pixbuf/io-jpeg.c:947 #, c-format msgid "Unsupported JPEG color space (%s)" msgstr "Neatbalstīta JPEG krāsu telpa (%s)" -#: gdk-pixbuf/io-jpeg.c:821 gdk-pixbuf/io-jpeg.c:1142 gdk-pixbuf/io-jpeg.c:1490 -#: gdk-pixbuf/io-jpeg.c:1500 +#: gdk-pixbuf/io-jpeg.c:825 gdk-pixbuf/io-jpeg.c:1142 gdk-pixbuf/io-jpeg.c:1489 +#: gdk-pixbuf/io-jpeg.c:1499 msgid "Couldn’t allocate memory for loading JPEG file" msgstr "Neizdevās piešķirt atmiņu, lai ielādētu JPEG datni" -#: gdk-pixbuf/io-jpeg.c:1099 +#: gdk-pixbuf/io-jpeg.c:1100 msgid "Transformed JPEG has zero width or height." msgstr "Pārveidotais JPEG ir ar nulles platumu vai augstumu." @@ -606,19 +549,19 @@ msgstr "Pārveidotais JPEG ir ar nulles platumu vai augstumu." msgid "Unsupported number of color components (%d)" msgstr "Neatbalstītas krāsu komponenšu skaits (%d)" -#: gdk-pixbuf/io-jpeg.c:1420 +#: gdk-pixbuf/io-jpeg.c:1419 #, c-format msgid "" "JPEG x-dpi must be a value between 1 and 65535; value “%s” is not allowed." msgstr "JPEG x-dpi jābūt vērtībai no 1 līdz 65535. Vērtība “%s” nav atļauta." -#: gdk-pixbuf/io-jpeg.c:1441 +#: gdk-pixbuf/io-jpeg.c:1440 #, c-format msgid "" "JPEG y-dpi must be a value between 1 and 65535; value “%s” is not allowed." msgstr "JPEG y-dpi jābūt vērtībai no 1 līdz 65535. Vērtība “%s” nav atļauta." -#: gdk-pixbuf/io-jpeg.c:1455 +#: gdk-pixbuf/io-jpeg.c:1454 #, c-format msgid "Color profile has invalid length “%u”." msgstr "Krāsu profilam ir nederīgs garums “%u”." @@ -627,7 +570,7 @@ msgstr "Krāsu profilam ir nederīgs garums “%u”." msgid "Bits per channel of PNG image is invalid." msgstr "Bitu skaits uz kanālu PNG attēlam ir nepareizs." -#: gdk-pixbuf/io-png.c:144 gdk-pixbuf/io-png.c:700 +#: gdk-pixbuf/io-png.c:144 gdk-pixbuf/io-png.c:703 msgid "Transformed PNG has zero width or height." msgstr "Pārveidotais PNG ir ar nulles platumu vai augstumu." @@ -652,11 +595,11 @@ msgstr "Fatāla kļūda PNG attēla datnē — %s" msgid "Insufficient memory to load PNG file" msgstr "Nepietiek atmiņas PNG datnes ielādei" -#: gdk-pixbuf/io-png.c:494 gdk-pixbuf/io-png.c:515 +#: gdk-pixbuf/io-png.c:498 gdk-pixbuf/io-png.c:519 msgid "Couldn’t allocate memory for loading PNG" msgstr "Neizdevās piešķirt atmiņu, lai ielādētu PNG" -#: gdk-pixbuf/io-png.c:713 +#: gdk-pixbuf/io-png.c:716 #, c-format msgid "" "Insufficient memory to store a %lu by %lu image; try exiting some " @@ -665,62 +608,64 @@ msgstr "" "Nepietiek atmiņas, lai uzturētu %lu x %lu attēlu; pamēģiniet iziet no dažām " "lietotnēm, lai samazinātu atmiņas lietojumu" -#: gdk-pixbuf/io-png.c:789 +#: gdk-pixbuf/io-png.c:791 msgid "Fatal error reading PNG image file" msgstr "Kļūda, nolasot PNG attēla datni" -#: gdk-pixbuf/io-png.c:838 +#: gdk-pixbuf/io-png.c:840 #, c-format msgid "Fatal error reading PNG image file: %s" msgstr "Kļūda, nolasot PNG attēla datni — %s" -#: gdk-pixbuf/io-png.c:930 -msgid "" -"Keys for PNG text chunks must have at least 1 and at most 79 characters." -msgstr "PNG teksta fragmentiem jābūt no 1 līdz 79 rakstzīmēm." - -#: gdk-pixbuf/io-png.c:939 -msgid "Keys for PNG text chunks must be ASCII characters." -msgstr "PNG teksta fragmentiem jābūt ASCII rakstzīmēm." - -#: gdk-pixbuf/io-png.c:953 gdk-pixbuf/io-tiff.c:846 +#: gdk-pixbuf/io-png.c:937 #, c-format -msgid "Color profile has invalid length %d." -msgstr "Krāsu profilam ir nederīgs garums %d." +#| msgid "" +#| "Keys for PNG text chunks must have at least 1 and at most 79 characters." +msgid "" +"Invalid key “%s”. Keys for PNG text chunks must have at least 1 and at most " +"79 characters." +msgstr "" +"Nederīga atslēga “%s”. PNG teksta fragmentu atslēgām jābūt no 1 līdz " +"79 rakstzīmēm." -#: gdk-pixbuf/io-png.c:966 +#: gdk-pixbuf/io-png.c:950 #, c-format -msgid "" -"PNG compression level must be a value between 0 and 9; value “%s” could not " -"be parsed." +#| msgid "Keys for PNG text chunks must be ASCII characters." +msgid "Invalid key “%s”. Keys for PNG text chunks must be ASCII characters." msgstr "" -"PNG saspiešanas līmeņa vērtībai jābūt starp 0 un 9; vērtību “%s” neizdevās " -"parsēt." +"Nederīga atslēga “%s”. PNG teksta fragmentu atslēgām jābūt ASCII rakstzīmēm." -#: gdk-pixbuf/io-png.c:979 +#: gdk-pixbuf/io-png.c:980 #, c-format +#| msgid "" +#| "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding." msgid "" -"PNG compression level must be a value between 0 and 9; value “%d” is not " -"allowed." -msgstr "" -"PNG saspiešanas līmeņa vērtībai jābūt starp 0 un 9; vērtība “%d” nav atļauta." +"Value for PNG text chunk '%s' cannot be converted to ISO-8859-1 encoding." +msgstr "PNG teksta vērtību “%s” nevar pārvērst ISO-8859-1 kodējumā." -#: gdk-pixbuf/io-png.c:998 +#: gdk-pixbuf/io-png.c:992 #, c-format -msgid "PNG x-dpi must be greater than zero; value “%s” is not allowed." -msgstr "PNG x-dpi jābūt lielākai par nulli. Vērtība “%s” nav atļauta." +#| msgid "Color profile has invalid length %d." +msgid "Color profile has invalid length %d" +msgstr "Krāsu profilam ir nederīgs garums %d" -#: gdk-pixbuf/io-png.c:1018 +#: gdk-pixbuf/io-png.c:1004 #, c-format -msgid "PNG y-dpi must be greater than zero; value “%s” is not allowed." -msgstr "PNG y-dpi jābūt lielākai par nulli. Vērtība “%s” nav atļauta." +#| msgid "" +#| "PNG compression level must be a value between 0 and 9; value “%d” is not " +#| "allowed." +msgid "" +"PNG compression level must be a value between 0 and 9; value “%s” is invalid" +msgstr "" +"PNG saspiešanas līmeņa vērtībai jābūt starp 0 un 9; vērtība “%s” nav derīga." -#: gdk-pixbuf/io-png.c:1067 +#: gdk-pixbuf/io-png.c:1018 #, c-format -msgid "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding." -msgstr "PNG teksta vērtību %s nevar pārvērst ISO-8859-1 kodējumā." +#| msgid "PNG x-dpi must be greater than zero; value “%s” is not allowed." +msgid "PNG %s must be greater than zero; value “%s” is not allowed" +msgstr "PNG %s jābūt lielākai par nulli; vērtība “%s” nav atļauta" -#: gdk-pixbuf/io-png.c:1252 +#: gdk-pixbuf/io-png.c:1246 msgctxt "image format" msgid "PNG" msgstr "PNG" @@ -769,7 +714,7 @@ msgstr "Raw PNM attēla tips ir nepareizs" msgid "PNM image loader does not support this PNM subformat" msgstr "PNM attēla ielādētājs neatbalsta šo PNM apakšformātu" -#: gdk-pixbuf/io-pnm.c:754 gdk-pixbuf/io-pnm.c:981 +#: gdk-pixbuf/io-pnm.c:754 gdk-pixbuf/io-pnm.c:991 msgid "Raw PNM formats require exactly one whitespace before sample data" msgstr "Raw PNM formāti pieprasa tieši vienu atstarpi pirms nolases datiem" @@ -777,19 +722,19 @@ msgstr "Raw PNM formāti pieprasa tieši vienu atstarpi pirms nolases datiem" msgid "Cannot allocate memory for loading PNM image" msgstr "Neizdevās piešķirt atmiņu PNM attēla ielādei" -#: gdk-pixbuf/io-pnm.c:831 +#: gdk-pixbuf/io-pnm.c:835 msgid "Insufficient memory to load PNM context struct" msgstr "Nepietiek atmiņas, lai ielādētu PNM konteksta struktūru" -#: gdk-pixbuf/io-pnm.c:882 +#: gdk-pixbuf/io-pnm.c:892 msgid "Unexpected end of PNM image data" msgstr "Negaidītas PNM attēla datu beigas" -#: gdk-pixbuf/io-pnm.c:1010 +#: gdk-pixbuf/io-pnm.c:1020 msgid "Insufficient memory to load PNM file" msgstr "Nepietiek atmiņas PNM datnes ielādei" -#: gdk-pixbuf/io-pnm.c:1094 +#: gdk-pixbuf/io-pnm.c:1103 msgctxt "image format" msgid "PNM/PBM/PGM/PPM" msgstr "PNM/PBM/PGM/PPM" @@ -802,7 +747,7 @@ msgstr "Ievades datnes deskriptors ir NULL." msgid "Failed to read QTIF header" msgstr "Neizdevās nolasīt QTIF galveni" -#: gdk-pixbuf/io-qtif.c:150 gdk-pixbuf/io-qtif.c:187 gdk-pixbuf/io-qtif.c:454 +#: gdk-pixbuf/io-qtif.c:150 gdk-pixbuf/io-qtif.c:187 gdk-pixbuf/io-qtif.c:449 #, c-format msgid "QTIF atom size too large (%d byte)" msgid_plural "QTIF atom size too large (%d bytes)" @@ -831,48 +776,48 @@ msgstr[0] "Neizdevās izlaist nākamo %d baitu ar seek()." msgstr[1] "Neizdevās izlaist nākamos %d baitus ar seek()." msgstr[2] "Neizdevās izlaist nākamos %d baitus ar seek()." -#: gdk-pixbuf/io-qtif.c:265 +#: gdk-pixbuf/io-qtif.c:269 msgid "Failed to allocate QTIF context structure." msgstr "Neizdevās piešķirt atmiņu QTIF konteksta struktūrai" -#: gdk-pixbuf/io-qtif.c:325 +#: gdk-pixbuf/io-qtif.c:329 msgid "Failed to create GdkPixbufLoader object." msgstr "Neizdevās radīt GdkPixbufLoader objektu." -#: gdk-pixbuf/io-qtif.c:429 +#: gdk-pixbuf/io-qtif.c:424 msgid "Failed to find an image data atom." msgstr "Neizdevās atrast attēla datu atomu." -#: gdk-pixbuf/io-qtif.c:613 +#: gdk-pixbuf/io-qtif.c:599 msgctxt "image format" msgid "QuickTime" msgstr "QuickTime" -#: gdk-pixbuf/io-tga.c:349 +#: gdk-pixbuf/io-tga.c:346 msgid "Cannot allocate colormap" msgstr "Neizdevās piešķirt krāsu karti" -#: gdk-pixbuf/io-tga.c:374 +#: gdk-pixbuf/io-tga.c:371 msgid "Cannot allocate new pixbuf" msgstr "Neizdevās piešķirt atmiņu jaunam pixbuf" -#: gdk-pixbuf/io-tga.c:522 +#: gdk-pixbuf/io-tga.c:519 msgid "Unexpected bitdepth for colormap entries" msgstr "Negaidīts krāsukaršu ierakstu bitu dziļums" -#: gdk-pixbuf/io-tga.c:538 +#: gdk-pixbuf/io-tga.c:535 msgid "Pseudocolor image does not contain a colormap" msgstr "Pseidokrāsu attēls nesatur krāsu karti" -#: gdk-pixbuf/io-tga.c:581 +#: gdk-pixbuf/io-tga.c:578 msgid "Cannot allocate TGA header memory" msgstr "Neizdevās piešķirt atmiņu TGA galvenei" -#: gdk-pixbuf/io-tga.c:612 +#: gdk-pixbuf/io-tga.c:609 msgid "TGA image has invalid dimensions" msgstr "TGA attēlam ir nepareizas dimensijas" -#: gdk-pixbuf/io-tga.c:618 gdk-pixbuf/io-tga.c:625 +#: gdk-pixbuf/io-tga.c:615 gdk-pixbuf/io-tga.c:622 msgid "TGA image type not supported" msgstr "TGA attēla tips nav atbalstīts" @@ -880,11 +825,11 @@ msgstr "TGA attēla tips nav atbalstīts" msgid "Cannot allocate memory for TGA context struct" msgstr "Neizdevās piešķirt atmiņu TGA konteksta struktūrai" -#: gdk-pixbuf/io-tga.c:711 +#: gdk-pixbuf/io-tga.c:712 msgid "TGA image was truncated or incomplete." msgstr "TGA attēls ir ticis aprauts vai ir nepilnīgs." -#: gdk-pixbuf/io-tga.c:763 +#: gdk-pixbuf/io-tga.c:764 msgctxt "image format" msgid "Targa" msgstr "Targa" @@ -905,7 +850,7 @@ msgstr "Platums vai augstums TIFF attēlam ir nulle" msgid "Dimensions of TIFF image too large" msgstr "TIFF attēla dimensijas ir par lielu" -#: gdk-pixbuf/io-tiff.c:176 gdk-pixbuf/io-tiff.c:188 gdk-pixbuf/io-tiff.c:580 +#: gdk-pixbuf/io-tiff.c:176 gdk-pixbuf/io-tiff.c:188 gdk-pixbuf/io-tiff.c:584 msgid "Insufficient memory to open TIFF file" msgstr "Nepietiek atmiņas TIFF datnes ielādei" @@ -917,37 +862,42 @@ msgstr "Neizdevās nolasīt RGB datus no TIFF datnes" msgid "Failed to open TIFF image" msgstr "Neizdevās atvērt TIFF attēlu" -#: gdk-pixbuf/io-tiff.c:511 gdk-pixbuf/io-tiff.c:523 +#: gdk-pixbuf/io-tiff.c:515 gdk-pixbuf/io-tiff.c:527 msgid "Failed to load TIFF image" msgstr "Neizdevās ielādēt TIFF attēlu" -#: gdk-pixbuf/io-tiff.c:755 +#: gdk-pixbuf/io-tiff.c:759 msgid "Failed to save TIFF image" msgstr "Neizdevās saglabāt TIFF attēlu" -#: gdk-pixbuf/io-tiff.c:816 +#: gdk-pixbuf/io-tiff.c:820 msgid "TIFF compression doesn’t refer to a valid codec." msgstr "TIFF kompresija neatsaucas uz derīgu kodeku." -#: gdk-pixbuf/io-tiff.c:861 +#: gdk-pixbuf/io-tiff.c:850 +#, c-format +msgid "Color profile has invalid length %d." +msgstr "Krāsu profilam ir nederīgs garums %d." + +#: gdk-pixbuf/io-tiff.c:865 msgid "TIFF bits-per-sample doesn’t contain a supported value." msgstr "TIFF biti-paraugā nesatur atbalstītu vērtību." -#: gdk-pixbuf/io-tiff.c:942 +#: gdk-pixbuf/io-tiff.c:946 msgid "Failed to write TIFF data" msgstr "Neizdevās ierakstīt TIFF datus" -#: gdk-pixbuf/io-tiff.c:960 +#: gdk-pixbuf/io-tiff.c:964 #, c-format msgid "TIFF x-dpi must be greater than zero; value “%s” is not allowed." msgstr "TIFF x-dpi jābūt lielākai par nulli. Vērtība “%s” nav atļauta." -#: gdk-pixbuf/io-tiff.c:972 +#: gdk-pixbuf/io-tiff.c:976 #, c-format msgid "TIFF y-dpi must be greater than zero; value “%s” is not allowed." msgstr "TIFF y-dpi jābūt lielākai par nulli. Vērtība “%s” nav atļauta." -#: gdk-pixbuf/io-tiff.c:1013 +#: gdk-pixbuf/io-tiff.c:1017 msgid "Couldn’t write to TIFF file" msgstr "Neizdevās rakstīt TIFF datnē" @@ -955,15 +905,15 @@ msgstr "Neizdevās rakstīt TIFF datnē" msgid "Invalid XBM file" msgstr "Nepareiza XBM datne" -#: gdk-pixbuf/io-xbm.c:330 +#: gdk-pixbuf/io-xbm.c:331 msgid "Insufficient memory to load XBM image file" msgstr "Nepietiek atmiņas XBM attēla datnes ielādei" -#: gdk-pixbuf/io-xbm.c:478 +#: gdk-pixbuf/io-xbm.c:482 msgid "Failed to write to temporary file when loading XBM image" msgstr "Neizdevās ierakstīt pagaidu datni, ielādējot XBM attēlu" -#: gdk-pixbuf/io-xbm.c:517 +#: gdk-pixbuf/io-xbm.c:521 msgctxt "image format" msgid "XBM" msgstr "XBM" @@ -1001,19 +951,71 @@ msgid "Cannot read XPM colormap" msgstr "Nevar nolasīt XPM krāsu karti" #: gdk-pixbuf/io-xpm.c:610 -#| msgid "Dimensions of TIFF image too large" msgid "Dimensions do not match data" msgstr "Dimensijas neatbilst datiem" -#: gdk-pixbuf/io-xpm.c:804 +#: gdk-pixbuf/io-xpm.c:806 msgid "Failed to write to temporary file when loading XPM image" msgstr "Neizdevās ierakstīt pagaidu datni, ielādējot XPM attēlu" -#: gdk-pixbuf/io-xpm.c:843 +#: gdk-pixbuf/io-xpm.c:845 msgctxt "image format" msgid "XPM" msgstr "XPM" +#~ msgid "Internal error in the GIF loader (%s)" +#~ msgstr "Iekšēja kļūda GIF ielādētājā (%s)" + +#~ msgid "Bad code encountered" +#~ msgstr "Sastapts slikts kods" + +#~ msgid "Stack overflow" +#~ msgstr "Steka pārpilde" + +#~ msgid "GIF image loader cannot understand this image." +#~ msgstr "GIF attēlu ielādētājs nespēj saprast šo attēlu." + +#~ msgid "Circular table entry in GIF file" +#~ msgstr "Cirkulārs tabulas ieraksts GIF datnē" + +#~ msgid "Not enough memory to composite a frame in GIF file" +#~ msgstr "Nepietiek atmiņas, lai GIF datnē izveidotu kadru" + +#~ msgid "Couldn’t allocate memory for stream" +#~ msgstr "Neizdevās piešķirt atmiņu straumei" + +#~ msgid "Couldn’t decode image" +#~ msgstr "Neizdevās atkodēt attēlu" + +#~ msgid "Transformed JPEG2000 has zero width or height" +#~ msgstr "Pārveidotajam JPEG2000 trūkst platuma vai augstuma" + +#~ msgid "Image type currently not supported" +#~ msgstr "Attēla tips šobrīd nav atbalstīts" + +#~ msgid "Couldn’t allocate memory for color profile" +#~ msgstr "Neizdevās piešķirt atmiņu krāsu profilam" + +#~ msgid "Insufficient memory to open JPEG 2000 file" +#~ msgstr "Nepietiek atmiņas JPEG 2000 datnes atvēršanai" + +#~ msgid "Couldn’t allocate memory to buffer image data" +#~ msgstr "Neizdevās piešķirt atmiņu attēla datu buferim" + +#~ msgctxt "image format" +#~ msgid "JPEG 2000" +#~ msgstr "JPEG 2000" + +#~ msgid "" +#~ "PNG compression level must be a value between 0 and 9; value “%s” could " +#~ "not be parsed." +#~ msgstr "" +#~ "PNG saspiešanas līmeņa vērtībai jābūt starp 0 un 9; vērtību “%s” " +#~ "neizdevās parsēt." + +#~ msgid "PNG y-dpi must be greater than zero; value “%s” is not allowed." +#~ msgstr "PNG y-dpi jābūt lielākai par nulli. Vērtība “%s” nav atļauta." + #~ msgid "Transformed pixbuf has zero width or height." #~ msgstr "Pārveidotais pixbuf ir ar nulles platumu vai augstumu." diff --git a/po/zh_CN.po b/po/zh_CN.po index 9cbcccb9e..b20331681 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: gdk-pixbuf master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gdk-pixbuf/issues\n" -"POT-Creation-Date: 2019-03-26 12:31+0000\n" -"PO-Revision-Date: 2019-04-10 16:16+0800\n" +"POT-Creation-Date: 2020-12-12 18:15+0000\n" +"PO-Revision-Date: 2021-03-13 12:25-0500\n" "Last-Translator: Dingzhong Chen <wsxy162@gmail.com>\n" "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n" "Language: zh_CN\n" @@ -27,176 +27,176 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.2.1\n" +"X-Generator: Poedit 2.4.2\n" -#: gdk-pixbuf/gdk-pixbuf-animation.c:157 gdk-pixbuf/gdk-pixbuf-io.c:1052 -#: gdk-pixbuf/gdk-pixbuf-io.c:1314 +#: gdk-pixbuf/gdk-pixbuf-animation.c:175 gdk-pixbuf/gdk-pixbuf-io.c:1125 +#: gdk-pixbuf/gdk-pixbuf-io.c:1387 #, c-format msgid "Failed to open file “%s”: %s" msgstr "打开文件“%s”失败：%s" -#: gdk-pixbuf/gdk-pixbuf-animation.c:170 gdk-pixbuf/gdk-pixbuf-io.c:936 +#: gdk-pixbuf/gdk-pixbuf-animation.c:188 gdk-pixbuf/gdk-pixbuf-io.c:992 #, c-format msgid "Image file “%s” contains no data" msgstr "图像文件“%s”不包含数据" -#: gdk-pixbuf/gdk-pixbuf-animation.c:208 +#: gdk-pixbuf/gdk-pixbuf-animation.c:226 #, c-format msgid "" "Failed to load animation “%s”: reason not known, probably a corrupt " "animation file" msgstr "载入动画“%s”失败：原因未知，可能是动画文件已损坏" -#: gdk-pixbuf/gdk-pixbuf-animation.c:276 gdk-pixbuf/gdk-pixbuf-io.c:1088 -#: gdk-pixbuf/gdk-pixbuf-io.c:1366 +#: gdk-pixbuf/gdk-pixbuf-animation.c:294 gdk-pixbuf/gdk-pixbuf-io.c:1161 +#: gdk-pixbuf/gdk-pixbuf-io.c:1439 #, c-format msgid "" "Failed to load image “%s”: reason not known, probably a corrupt image file" msgstr "载入图像“%s”失败：原因未知，可能是图像文件已损坏" -#: gdk-pixbuf/gdk-pixbuf.c:166 +#: gdk-pixbuf/gdk-pixbuf.c:237 msgid "Number of Channels" msgstr "通道数" -#: gdk-pixbuf/gdk-pixbuf.c:167 +#: gdk-pixbuf/gdk-pixbuf.c:238 msgid "The number of samples per pixel" msgstr "每个像素的样本数" -#: gdk-pixbuf/gdk-pixbuf.c:176 +#: gdk-pixbuf/gdk-pixbuf.c:247 msgid "Colorspace" msgstr "颜色空间" -#: gdk-pixbuf/gdk-pixbuf.c:177 +#: gdk-pixbuf/gdk-pixbuf.c:248 msgid "The colorspace in which the samples are interpreted" msgstr "解释样本的颜色空间" -#: gdk-pixbuf/gdk-pixbuf.c:185 +#: gdk-pixbuf/gdk-pixbuf.c:256 msgid "Has Alpha" msgstr "有 Alpha" -#: gdk-pixbuf/gdk-pixbuf.c:186 +#: gdk-pixbuf/gdk-pixbuf.c:257 msgid "Whether the pixbuf has an alpha channel" msgstr "Pixbuf 是否有 alpha 通道" -#: gdk-pixbuf/gdk-pixbuf.c:199 +#: gdk-pixbuf/gdk-pixbuf.c:270 msgid "Bits per Sample" msgstr "比特每样本" -#: gdk-pixbuf/gdk-pixbuf.c:200 +#: gdk-pixbuf/gdk-pixbuf.c:271 msgid "The number of bits per sample" msgstr "每个样本的比特数" -#: gdk-pixbuf/gdk-pixbuf.c:209 +#: gdk-pixbuf/gdk-pixbuf.c:280 msgid "Width" msgstr "宽度" -#: gdk-pixbuf/gdk-pixbuf.c:210 +#: gdk-pixbuf/gdk-pixbuf.c:281 msgid "The number of columns of the pixbuf" msgstr "Pixbuf 列数" -#: gdk-pixbuf/gdk-pixbuf.c:219 +#: gdk-pixbuf/gdk-pixbuf.c:290 msgid "Height" msgstr "高度" -#: gdk-pixbuf/gdk-pixbuf.c:220 +#: gdk-pixbuf/gdk-pixbuf.c:291 msgid "The number of rows of the pixbuf" msgstr "Pixbuf 行数" -#: gdk-pixbuf/gdk-pixbuf.c:236 +#: gdk-pixbuf/gdk-pixbuf.c:307 msgid "Rowstride" msgstr "Rowstride" -#: gdk-pixbuf/gdk-pixbuf.c:237 +#: gdk-pixbuf/gdk-pixbuf.c:308 msgid "" "The number of bytes between the start of a row and the start of the next row" msgstr "一行的起始和下一行的起始之间的字节数" -#: gdk-pixbuf/gdk-pixbuf.c:246 +#: gdk-pixbuf/gdk-pixbuf.c:317 msgid "Pixels" msgstr "像素" -#: gdk-pixbuf/gdk-pixbuf.c:247 +#: gdk-pixbuf/gdk-pixbuf.c:318 msgid "A pointer to the pixel data of the pixbuf" msgstr "到 pixbuf 像素数据的指针" -#: gdk-pixbuf/gdk-pixbuf.c:261 +#: gdk-pixbuf/gdk-pixbuf.c:332 msgid "Pixel Bytes" msgstr "像素字节" -#: gdk-pixbuf/gdk-pixbuf.c:262 +#: gdk-pixbuf/gdk-pixbuf.c:333 msgid "Readonly pixel data" msgstr "只读像素数据" -#: gdk-pixbuf/gdk-pixbuf-io.c:756 +#: gdk-pixbuf/gdk-pixbuf-io.c:812 #, c-format msgid "Unable to load image-loading module: %s: %s" msgstr "加载用来载入图像的模块失败：%s：%s" -#: gdk-pixbuf/gdk-pixbuf-io.c:771 +#: gdk-pixbuf/gdk-pixbuf-io.c:827 #, c-format msgid "" "Image-loading module %s does not export the proper interface; perhaps it’s " "from a different gdk-pixbuf version?" msgstr "图像载入模块 %s 没有导出正确的接口；它是否属于另一个 gdk-pixbuf 版本？" -#: gdk-pixbuf/gdk-pixbuf-io.c:780 gdk-pixbuf/gdk-pixbuf-io.c:823 +#: gdk-pixbuf/gdk-pixbuf-io.c:836 gdk-pixbuf/gdk-pixbuf-io.c:879 #, c-format msgid "Image type “%s” is not supported" msgstr "不支持图像类型“%s”" -#: gdk-pixbuf/gdk-pixbuf-io.c:908 +#: gdk-pixbuf/gdk-pixbuf-io.c:964 #, c-format msgid "Couldn’t recognize the image file format for file “%s”" msgstr "识别文件“%s”的图像文件格式失败" -#: gdk-pixbuf/gdk-pixbuf-io.c:916 +#: gdk-pixbuf/gdk-pixbuf-io.c:972 msgid "Unrecognized image file format" msgstr "无法识别的图像文件格式" -#: gdk-pixbuf/gdk-pixbuf-io.c:1099 +#: gdk-pixbuf/gdk-pixbuf-io.c:1172 #, c-format msgid "Failed to load image “%s”: %s" msgstr "载入图像“%s”失败：%s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2169 gdk-pixbuf/io-gdip-utils.c:838 +#: gdk-pixbuf/gdk-pixbuf-io.c:2242 gdk-pixbuf/io-gdip-utils.c:840 #, c-format msgid "Error writing to image file: %s" msgstr "写入图像文件时出错：%s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2211 gdk-pixbuf/gdk-pixbuf-io.c:2332 +#: gdk-pixbuf/gdk-pixbuf-io.c:2284 gdk-pixbuf/gdk-pixbuf-io.c:2405 #, c-format msgid "This build of gdk-pixbuf does not support saving the image format: %s" msgstr "此 gdk-pixbuf 不支持要保存的图像格式：%s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2242 +#: gdk-pixbuf/gdk-pixbuf-io.c:2315 msgid "Insufficient memory to save image to callback" msgstr "内存不足以保存回调的图像" -#: gdk-pixbuf/gdk-pixbuf-io.c:2255 +#: gdk-pixbuf/gdk-pixbuf-io.c:2328 msgid "Failed to open temporary file" msgstr "打开临时文件失败" -#: gdk-pixbuf/gdk-pixbuf-io.c:2278 +#: gdk-pixbuf/gdk-pixbuf-io.c:2351 msgid "Failed to read from temporary file" msgstr "从临时文件读取失败" -#: gdk-pixbuf/gdk-pixbuf-io.c:2488 +#: gdk-pixbuf/gdk-pixbuf-io.c:2561 #, c-format msgid "Failed to open “%s” for writing: %s" msgstr "打开“%s”进行写入失败：%s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2514 +#: gdk-pixbuf/gdk-pixbuf-io.c:2587 #, c-format msgid "" "Failed to close “%s” while writing image, all data may not have been saved: " "%s" msgstr "写入图像时无法关闭“%s”，可能没有保存数据：%s" -#: gdk-pixbuf/gdk-pixbuf-io.c:2735 gdk-pixbuf/gdk-pixbuf-io.c:2787 +#: gdk-pixbuf/gdk-pixbuf-io.c:2808 gdk-pixbuf/gdk-pixbuf-io.c:2860 msgid "Insufficient memory to save image into a buffer" msgstr "内存不足以将图像保存至缓冲区" -#: gdk-pixbuf/gdk-pixbuf-io.c:2833 +#: gdk-pixbuf/gdk-pixbuf-io.c:2906 msgid "Error writing to image stream" msgstr "写入图像流时出错" @@ -212,11 +212,11 @@ msgstr "内部错误：图像载入模块“%s”完成某操作失败，但没 msgid "Incremental loading of image type “%s” is not supported" msgstr "图像类型“%s”不支持渐进式载入" -#: gdk-pixbuf/gdk-pixbuf-simple-anim.c:161 +#: gdk-pixbuf/gdk-pixbuf-simple-anim.c:162 msgid "Loop" msgstr "循环" -#: gdk-pixbuf/gdk-pixbuf-simple-anim.c:162 +#: gdk-pixbuf/gdk-pixbuf-simple-anim.c:163 msgid "Whether the animation should loop when it reaches the end" msgstr "动画播放结束后是否循环" @@ -239,36 +239,36 @@ msgid "failed to allocate image buffer of %u byte" msgid_plural "failed to allocate image buffer of %u bytes" msgstr[0] "分配 %u 字节的图像缓冲区失败" -#: gdk-pixbuf/io-ani.c:241 +#: gdk-pixbuf/io-ani.c:239 msgid "Unexpected icon chunk in animation" msgstr "动画中有未预期的图标块" -#: gdk-pixbuf/io-ani.c:339 gdk-pixbuf/io-ani.c:397 gdk-pixbuf/io-ani.c:423 -#: gdk-pixbuf/io-ani.c:446 gdk-pixbuf/io-ani.c:473 gdk-pixbuf/io-ani.c:560 +#: gdk-pixbuf/io-ani.c:337 gdk-pixbuf/io-ani.c:395 gdk-pixbuf/io-ani.c:421 +#: gdk-pixbuf/io-ani.c:444 gdk-pixbuf/io-ani.c:471 gdk-pixbuf/io-ani.c:558 msgid "Invalid header in animation" msgstr "动画头无效" -#: gdk-pixbuf/io-ani.c:349 gdk-pixbuf/io-ani.c:371 gdk-pixbuf/io-ani.c:455 -#: gdk-pixbuf/io-ani.c:482 gdk-pixbuf/io-ani.c:533 gdk-pixbuf/io-ani.c:605 +#: gdk-pixbuf/io-ani.c:347 gdk-pixbuf/io-ani.c:369 gdk-pixbuf/io-ani.c:453 +#: gdk-pixbuf/io-ani.c:480 gdk-pixbuf/io-ani.c:531 gdk-pixbuf/io-ani.c:607 msgid "Not enough memory to load animation" msgstr "内存不足以载入动画" -#: gdk-pixbuf/io-ani.c:389 gdk-pixbuf/io-ani.c:415 gdk-pixbuf/io-ani.c:434 +#: gdk-pixbuf/io-ani.c:387 gdk-pixbuf/io-ani.c:413 gdk-pixbuf/io-ani.c:432 msgid "Malformed chunk in animation" msgstr "动画中的块格式错误" -#: gdk-pixbuf/io-ani.c:627 +#: gdk-pixbuf/io-ani.c:629 msgid "ANI image was truncated or incomplete." msgstr "ANI 文件被截断或不完整。" -#: gdk-pixbuf/io-ani.c:668 +#: gdk-pixbuf/io-ani.c:670 msgctxt "image format" msgid "Windows animated cursor" msgstr "Windows 动态鼠标指针" #: gdk-pixbuf/io-bmp.c:231 gdk-pixbuf/io-bmp.c:269 gdk-pixbuf/io-bmp.c:376 #: gdk-pixbuf/io-bmp.c:403 gdk-pixbuf/io-bmp.c:428 gdk-pixbuf/io-bmp.c:463 -#: gdk-pixbuf/io-bmp.c:485 gdk-pixbuf/io-bmp.c:564 +#: gdk-pixbuf/io-bmp.c:485 gdk-pixbuf/io-bmp.c:563 msgid "BMP image has bogus header data" msgstr "BMP 图像有伪造的头数据" @@ -296,28 +296,29 @@ msgstr "无法压缩自上而下的 BMP 图像" msgid "BMP image width too large" msgstr "BMP 图像宽度过大" -#: gdk-pixbuf/io-bmp.c:788 gdk-pixbuf/io-png.c:560 gdk-pixbuf/io-pnm.c:722 +#: gdk-pixbuf/io-bmp.c:792 gdk-pixbuf/io-png.c:564 gdk-pixbuf/io-pnm.c:722 +#: gdk-pixbuf/io-pnm.c:879 msgid "Premature end-of-file encountered" msgstr "文件过早结束" -#: gdk-pixbuf/io-bmp.c:1314 +#: gdk-pixbuf/io-bmp.c:1313 #, c-format msgid "Error while decoding colormap" msgstr "解码色彩表时出错" -#: gdk-pixbuf/io-bmp.c:1377 gdk-pixbuf/io-bmp.c:1389 +#: gdk-pixbuf/io-bmp.c:1376 gdk-pixbuf/io-bmp.c:1388 msgid "Image is too wide for BMP format." msgstr "图像宽度超出 BMP 格式限制。" -#: gdk-pixbuf/io-bmp.c:1422 +#: gdk-pixbuf/io-bmp.c:1421 msgid "Couldn’t allocate memory for saving BMP file" msgstr "无法分配内存来保存 BMP 文件" -#: gdk-pixbuf/io-bmp.c:1463 +#: gdk-pixbuf/io-bmp.c:1462 msgid "Couldn’t write to BMP file" msgstr "无法写入 BMP 文件" -#: gdk-pixbuf/io-bmp.c:1516 gdk-pixbuf/io-gdip-bmp.c:83 +#: gdk-pixbuf/io-bmp.c:1515 gdk-pixbuf/io-gdip-bmp.c:83 msgctxt "image format" msgid "BMP" msgstr "BMP" @@ -327,35 +328,35 @@ msgctxt "image format" msgid "EMF" msgstr "EMF" -#: gdk-pixbuf/io-gdip-gif.c:81 gdk-pixbuf/io-gif.c:1703 +#: gdk-pixbuf/io-gdip-gif.c:81 gdk-pixbuf/io-gif.c:1044 msgctxt "image format" msgid "GIF" msgstr "GIF" -#: gdk-pixbuf/io-gdip-ico.c:60 gdk-pixbuf/io-ico.c:1410 +#: gdk-pixbuf/io-gdip-ico.c:60 gdk-pixbuf/io-ico.c:1412 msgctxt "image format" msgid "Windows icon" msgstr "Windows 图标" -#: gdk-pixbuf/io-gdip-jpeg.c:54 gdk-pixbuf/io-jpeg.c:1383 +#: gdk-pixbuf/io-gdip-jpeg.c:54 gdk-pixbuf/io-jpeg.c:1382 #, c-format msgid "" "JPEG quality must be a value between 0 and 100; value “%s” could not be " "parsed." -msgstr "JPEG 质量一定要在 0 至 100 之间；无法解析数值“%s”。" +msgstr "JPEG 质量必须在 0 至 100 之间；无法解析数值“%s”。" -#: gdk-pixbuf/io-gdip-jpeg.c:69 gdk-pixbuf/io-jpeg.c:1399 +#: gdk-pixbuf/io-gdip-jpeg.c:69 gdk-pixbuf/io-jpeg.c:1398 #, c-format msgid "" "JPEG quality must be a value between 0 and 100; value “%d” is not allowed." -msgstr "JPEG 质量一定要在 0 至 100 之间；不允许使用数值“%d”。" +msgstr "JPEG 质量必须在 0 至 100 之间；不允许使用数值“%d”。" -#: gdk-pixbuf/io-gdip-jpeg.c:147 gdk-pixbuf/io-jpeg.c:1683 +#: gdk-pixbuf/io-gdip-jpeg.c:147 gdk-pixbuf/io-jpeg.c:1682 msgctxt "image format" msgid "JPEG" msgstr "JPEG" -#: gdk-pixbuf/io-gdip-tiff.c:83 gdk-pixbuf/io-tiff.c:1082 +#: gdk-pixbuf/io-gdip-tiff.c:83 gdk-pixbuf/io-tiff.c:1086 msgctxt "image format" msgid "TIFF" msgstr "TIFF" @@ -381,19 +382,19 @@ msgstr "无法搜索流：%s" msgid "Could not read from stream: %s" msgstr "无法从流中读取：%s" -#: gdk-pixbuf/io-gdip-utils.c:618 +#: gdk-pixbuf/io-gdip-utils.c:620 msgid "Couldn’t load bitmap" msgstr "无法载入位图" -#: gdk-pixbuf/io-gdip-utils.c:774 +#: gdk-pixbuf/io-gdip-utils.c:776 msgid "Couldn’t load metafile" msgstr "无法载入元文件" -#: gdk-pixbuf/io-gdip-utils.c:879 +#: gdk-pixbuf/io-gdip-utils.c:881 msgid "Unsupported image format for GDI+" msgstr "不支持的 GDI+ 图像格式" -#: gdk-pixbuf/io-gdip-utils.c:886 +#: gdk-pixbuf/io-gdip-utils.c:888 msgid "Couldn’t save" msgstr "无法保存" @@ -402,73 +403,48 @@ msgctxt "image format" msgid "WMF" msgstr "WMF" -#: gdk-pixbuf/io-gif.c:218 +#: gdk-pixbuf/io-gif.c:158 #, c-format msgid "Failure reading GIF: %s" msgstr "读入 GIF 失败：%s" -#: gdk-pixbuf/io-gif.c:492 gdk-pixbuf/io-gif.c:1478 gdk-pixbuf/io-gif.c:1652 -msgid "GIF file was missing some data (perhaps it was truncated somehow?)" -msgstr "GIF 文件缺少了某些数据（可能文件被截短了？）" - -#: gdk-pixbuf/io-gif.c:501 -#, c-format -msgid "Internal error in the GIF loader (%s)" -msgstr "GIF 文件载入模块产生内部程序错误（%s）" - -#: gdk-pixbuf/io-gif.c:511 gdk-pixbuf/io-gif.c:628 -msgid "Bad code encountered" -msgstr "遇到了错误的代码" - -#: gdk-pixbuf/io-gif.c:560 -msgid "Stack overflow" -msgstr "栈溢出" - -#: gdk-pixbuf/io-gif.c:599 -msgid "GIF image loader cannot understand this image." -msgstr "GIF 文件载入模块无法分析此图像。" - -#: gdk-pixbuf/io-gif.c:638 -msgid "Circular table entry in GIF file" -msgstr "GIF 文件中的表项循环" - -#: gdk-pixbuf/io-gif.c:842 gdk-pixbuf/io-gif.c:1464 gdk-pixbuf/io-gif.c:1517 -#: gdk-pixbuf/io-gif.c:1640 +#: gdk-pixbuf/io-gif.c:381 gdk-pixbuf/io-gif.c:855 gdk-pixbuf/io-gif.c:908 +#: gdk-pixbuf/io-gif.c:981 msgid "Not enough memory to load GIF file" msgstr "内存不足以载入 GIF 文件" -#: gdk-pixbuf/io-gif.c:936 -msgid "Not enough memory to composite a frame in GIF file" -msgstr "内存不足以构建 GIF 文件中的一帧" - -#: gdk-pixbuf/io-gif.c:1107 +#: gdk-pixbuf/io-gif.c:507 msgid "GIF image is corrupt (incorrect LZW compression)" msgstr "GIF 图像已损坏（不正确的 LZW 压缩数据）" -#: gdk-pixbuf/io-gif.c:1162 +#: gdk-pixbuf/io-gif.c:536 msgid "File does not appear to be a GIF file" msgstr "文件好像不是 GIF 文件" -#: gdk-pixbuf/io-gif.c:1174 +#: gdk-pixbuf/io-gif.c:551 #, c-format msgid "Version %s of the GIF file format is not supported" msgstr "不支持 %s 版本的 GIF 文件格式" -#: gdk-pixbuf/io-gif.c:1221 +#: gdk-pixbuf/io-gif.c:586 msgid "Resulting GIF image has zero size" msgstr "结果 GIF 图像大小为 0" -#: gdk-pixbuf/io-gif.c:1300 +#: gdk-pixbuf/io-gif.c:664 msgid "" "GIF image has no global colormap, and a frame inside it has no local " "colormap." msgstr "GIF 图像没有全局色彩表，它其中的一帧也没有局部色彩表。" -#: gdk-pixbuf/io-gif.c:1540 +#: gdk-pixbuf/io-gif.c:868 gdk-pixbuf/io-gif.c:993 +msgid "GIF file was missing some data (perhaps it was truncated somehow?)" +msgstr "GIF 文件缺少了某些数据（可能文件被截短了？）" + +#: gdk-pixbuf/io-gif.c:927 msgid "GIF image was truncated or incomplete." msgstr "GIF 文件被截断或是不完整。" -#: gdk-pixbuf/io-gif.c:1547 +#: gdk-pixbuf/io-gif.c:934 msgid "Not all frames of the GIF image were loaded." msgstr "GIF 图像中有些帧没有加载完成。" @@ -477,11 +453,11 @@ msgstr "GIF 图像中有些帧没有加载完成。" msgid "Error reading ICNS image: %s" msgstr "读入 ICNS 图像文件时发生错误：%s" -#: gdk-pixbuf/io-icns.c:380 gdk-pixbuf/io-icns.c:457 +#: gdk-pixbuf/io-icns.c:380 gdk-pixbuf/io-icns.c:461 msgid "Could not decode ICNS file" msgstr "无法解码 ICNS 文件" -#: gdk-pixbuf/io-icns.c:516 +#: gdk-pixbuf/io-icns.c:517 msgctxt "image format" msgid "MacOS X icon" msgstr "MacOS X 图标" @@ -509,60 +485,27 @@ msgstr "不支持压缩图标" msgid "Unsupported icon type" msgstr "不支持的图标类型" -#: gdk-pixbuf/io-ico.c:581 +#: gdk-pixbuf/io-ico.c:583 msgid "Not enough memory to load ICO file" msgstr "内存不足以载入 ICO 文件" -#: gdk-pixbuf/io-ico.c:627 +#: gdk-pixbuf/io-ico.c:629 msgid "ICO image was truncated or incomplete." msgstr "ICO 文件被截断或不完整。" -#: gdk-pixbuf/io-ico.c:1068 +#: gdk-pixbuf/io-ico.c:1070 msgid "Image too large to be saved as ICO" msgstr "图像太大，无法另存为 ICO" -#: gdk-pixbuf/io-ico.c:1079 +#: gdk-pixbuf/io-ico.c:1081 msgid "Cursor hotspot outside image" msgstr "光标热点位于图像外" -#: gdk-pixbuf/io-ico.c:1102 +#: gdk-pixbuf/io-ico.c:1104 #, c-format msgid "Unsupported depth for ICO file: %d" msgstr "不支持的 ICO 文件深度：%d" -#: gdk-pixbuf/io-jasper.c:74 -msgid "Couldn’t allocate memory for stream" -msgstr "无法为流分配内存" - -#: gdk-pixbuf/io-jasper.c:125 -msgid "Couldn’t decode image" -msgstr "无法解码图像" - -#: gdk-pixbuf/io-jasper.c:143 -msgid "Transformed JPEG2000 has zero width or height" -msgstr "已转换的 JPEG2000 的宽度或高度为零" - -#: gdk-pixbuf/io-jasper.c:159 -msgid "Image type currently not supported" -msgstr "目前不支持该图像类型" - -#: gdk-pixbuf/io-jasper.c:171 gdk-pixbuf/io-jasper.c:179 -msgid "Couldn’t allocate memory for color profile" -msgstr "无法为色彩配置分配内存" - -#: gdk-pixbuf/io-jasper.c:205 gdk-pixbuf/io-jasper.c:230 -msgid "Insufficient memory to open JPEG 2000 file" -msgstr "内存不足以打开 JPEG 2000 文件" - -#: gdk-pixbuf/io-jasper.c:292 -msgid "Couldn’t allocate memory to buffer image data" -msgstr "无法为缓冲图像数据分配内存" - -#: gdk-pixbuf/io-jasper.c:336 -msgctxt "image format" -msgid "JPEG 2000" -msgstr "JPEG 2000" - #: gdk-pixbuf/io-jpeg.c:129 #, c-format msgid "Error interpreting JPEG image file (%s)" @@ -574,17 +517,17 @@ msgid "" "memory" msgstr "内存不足以载入图像，试试关闭其它应用程序来释放内存" -#: gdk-pixbuf/io-jpeg.c:710 gdk-pixbuf/io-jpeg.c:943 +#: gdk-pixbuf/io-jpeg.c:710 gdk-pixbuf/io-jpeg.c:947 #, c-format msgid "Unsupported JPEG color space (%s)" msgstr "不支持的 JPEG 色彩空间（%s）" -#: gdk-pixbuf/io-jpeg.c:821 gdk-pixbuf/io-jpeg.c:1142 gdk-pixbuf/io-jpeg.c:1490 -#: gdk-pixbuf/io-jpeg.c:1500 +#: gdk-pixbuf/io-jpeg.c:825 gdk-pixbuf/io-jpeg.c:1142 gdk-pixbuf/io-jpeg.c:1489 +#: gdk-pixbuf/io-jpeg.c:1499 msgid "Couldn’t allocate memory for loading JPEG file" msgstr "无法分配内存来载入 JPEG 文件" -#: gdk-pixbuf/io-jpeg.c:1099 +#: gdk-pixbuf/io-jpeg.c:1100 msgid "Transformed JPEG has zero width or height." msgstr "变形 JPEG 宽度或高度为零。" @@ -593,19 +536,19 @@ msgstr "变形 JPEG 宽度或高度为零。" msgid "Unsupported number of color components (%d)" msgstr "不支持的色彩组件数量（%d）" -#: gdk-pixbuf/io-jpeg.c:1420 +#: gdk-pixbuf/io-jpeg.c:1419 #, c-format msgid "" "JPEG x-dpi must be a value between 1 and 65535; value “%s” is not allowed." -msgstr "JPEG x-dpi 一定要在 1 至 65535 之间；不允许使用数值“%s”。" +msgstr "JPEG x-dpi 必须在 1 至 65535 之间；不允许使用数值“%s”。" -#: gdk-pixbuf/io-jpeg.c:1441 +#: gdk-pixbuf/io-jpeg.c:1440 #, c-format msgid "" "JPEG y-dpi must be a value between 1 and 65535; value “%s” is not allowed." -msgstr "JPEG y-dpi 一定要在 1 至 65535 之间；不允许使用数值“%s”。" +msgstr "JPEG y-dpi 必须在 1 至 65535 之间；不允许使用数值“%s”。" -#: gdk-pixbuf/io-jpeg.c:1455 +#: gdk-pixbuf/io-jpeg.c:1454 #, c-format msgid "Color profile has invalid length “%u”." msgstr "色彩配置有无效的长度“%u”。" @@ -614,7 +557,7 @@ msgstr "色彩配置有无效的长度“%u”。" msgid "Bits per channel of PNG image is invalid." msgstr "PNG 图像的每通道位数无效。" -#: gdk-pixbuf/io-png.c:144 gdk-pixbuf/io-png.c:700 +#: gdk-pixbuf/io-png.c:144 gdk-pixbuf/io-png.c:703 msgid "Transformed PNG has zero width or height." msgstr "变形 PNG 宽度或高度为零。" @@ -639,11 +582,11 @@ msgstr "PNG 图像文件里有严重错误：%s" msgid "Insufficient memory to load PNG file" msgstr "内存不足以载入 PNG 文件" -#: gdk-pixbuf/io-png.c:494 gdk-pixbuf/io-png.c:515 +#: gdk-pixbuf/io-png.c:498 gdk-pixbuf/io-png.c:519 msgid "Couldn’t allocate memory for loading PNG" msgstr "无法分配内存来载入 PNG 文件" -#: gdk-pixbuf/io-png.c:713 +#: gdk-pixbuf/io-png.c:716 #, c-format msgid "" "Insufficient memory to store a %lu by %lu image; try exiting some " @@ -651,59 +594,51 @@ msgid "" msgstr "" "内存不足以载入大小为 %lu x %lu 的图像；试试关闭其它应用程序以减少内存使用量" -#: gdk-pixbuf/io-png.c:789 +#: gdk-pixbuf/io-png.c:791 msgid "Fatal error reading PNG image file" msgstr "读入 PNG 图像文件时发生严重错误" -#: gdk-pixbuf/io-png.c:838 +#: gdk-pixbuf/io-png.c:840 #, c-format msgid "Fatal error reading PNG image file: %s" msgstr "读入 PNG 图像文件时发生严重错误：%s" -#: gdk-pixbuf/io-png.c:930 +#: gdk-pixbuf/io-png.c:937 +#, c-format msgid "" -"Keys for PNG text chunks must have at least 1 and at most 79 characters." -msgstr "PNG 文本块的关键字必须至少有 1 个字符，最多有 79 个字符。" - -#: gdk-pixbuf/io-png.c:939 -msgid "Keys for PNG text chunks must be ASCII characters." -msgstr "PNG 文本块的关键字必须是 ASCII 字符。" +"Invalid key “%s”. Keys for PNG text chunks must have at least 1 and at most " +"79 characters." +msgstr "" +"无效关键字“%s”。PNG 文本块的关键字必须至少有 1 个字符，最多有 79 个字符。" -#: gdk-pixbuf/io-png.c:953 gdk-pixbuf/io-tiff.c:846 +#: gdk-pixbuf/io-png.c:950 #, c-format -msgid "Color profile has invalid length %d." -msgstr "色彩配置有无效的长度 %d。" +msgid "Invalid key “%s”. Keys for PNG text chunks must be ASCII characters." +msgstr "无效关键字“%s”。PNG 文本块的关键字必须是 ASCII 字符。" -#: gdk-pixbuf/io-png.c:966 +#: gdk-pixbuf/io-png.c:980 #, c-format msgid "" -"PNG compression level must be a value between 0 and 9; value “%s” could not " -"be parsed." -msgstr "PNG 压缩级别一定要在 0 至 9 之间；无法解析数值“%s”。" +"Value for PNG text chunk '%s' cannot be converted to ISO-8859-1 encoding." +msgstr "PNG 文本块“%s”的值无法转换为 ISO-8859-1 编码。" -#: gdk-pixbuf/io-png.c:979 +#: gdk-pixbuf/io-png.c:992 #, c-format -msgid "" -"PNG compression level must be a value between 0 and 9; value “%d” is not " -"allowed." -msgstr "PNG 压缩级别一定要在 0 至 9 之间；不允许使用数值“%d”。" +msgid "Color profile has invalid length %d" +msgstr "色彩配置存在无效的长度 %d" -#: gdk-pixbuf/io-png.c:998 +#: gdk-pixbuf/io-png.c:1004 #, c-format -msgid "PNG x-dpi must be greater than zero; value “%s” is not allowed." -msgstr "PNG x-dpi 一定要大于 0 ；不允许使用数值“%s”。" +msgid "" +"PNG compression level must be a value between 0 and 9; value “%s” is invalid" +msgstr "PNG 压缩级别必须在 0 至 9 之间；值“%s”无效" #: gdk-pixbuf/io-png.c:1018 #, c-format -msgid "PNG y-dpi must be greater than zero; value “%s” is not allowed." -msgstr "PNG y-dpi 一定要大于 0 ；不允许使用数值“%s”。" - -#: gdk-pixbuf/io-png.c:1067 -#, c-format -msgid "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding." -msgstr "PNG 文本块 %s 的值无法转换为 ISO-8859-1 编码。" +msgid "PNG %s must be greater than zero; value “%s” is not allowed" +msgstr "PNG %s 必须大于 0；不允许使用数值“%s”" -#: gdk-pixbuf/io-png.c:1252 +#: gdk-pixbuf/io-png.c:1246 msgctxt "image format" msgid "PNG" msgstr "PNG" @@ -752,7 +687,7 @@ msgstr "原始 PNM 图像类型无效" msgid "PNM image loader does not support this PNM subformat" msgstr "PNM 载入程序不支持这种 PNM 副格式" -#: gdk-pixbuf/io-pnm.c:754 gdk-pixbuf/io-pnm.c:981 +#: gdk-pixbuf/io-pnm.c:754 gdk-pixbuf/io-pnm.c:991 msgid "Raw PNM formats require exactly one whitespace before sample data" msgstr "原始 PNM 格式在样本数据前精确需要一个空格" @@ -760,19 +695,19 @@ msgstr "原始 PNM 格式在样本数据前精确需要一个空格" msgid "Cannot allocate memory for loading PNM image" msgstr "无法分配内存来载入 PNM 图像" -#: gdk-pixbuf/io-pnm.c:831 +#: gdk-pixbuf/io-pnm.c:835 msgid "Insufficient memory to load PNM context struct" msgstr "内存不足以载入 PNM 的上下文结构" -#: gdk-pixbuf/io-pnm.c:882 +#: gdk-pixbuf/io-pnm.c:892 msgid "Unexpected end of PNM image data" msgstr "PNM 图像数据过早结束" -#: gdk-pixbuf/io-pnm.c:1010 +#: gdk-pixbuf/io-pnm.c:1020 msgid "Insufficient memory to load PNM file" msgstr "内存不足以载入 PNM 文件" -#: gdk-pixbuf/io-pnm.c:1094 +#: gdk-pixbuf/io-pnm.c:1103 msgctxt "image format" msgid "PNM/PBM/PGM/PPM" msgstr "PNM/PBM/PGM/PPM" @@ -785,7 +720,7 @@ msgstr "输入文件描述符为 NULL。" msgid "Failed to read QTIF header" msgstr "读取 QTIF 头失败" -#: gdk-pixbuf/io-qtif.c:150 gdk-pixbuf/io-qtif.c:187 gdk-pixbuf/io-qtif.c:454 +#: gdk-pixbuf/io-qtif.c:150 gdk-pixbuf/io-qtif.c:187 gdk-pixbuf/io-qtif.c:449 #, c-format msgid "QTIF atom size too large (%d byte)" msgid_plural "QTIF atom size too large (%d bytes)" @@ -808,48 +743,48 @@ msgid "Failed to skip the next %d byte with seek()." msgid_plural "Failed to skip the next %d bytes with seek()." msgstr[0] "使用 seek() 跳过接下来的 %d 字节失败。" -#: gdk-pixbuf/io-qtif.c:265 +#: gdk-pixbuf/io-qtif.c:269 msgid "Failed to allocate QTIF context structure." msgstr "无法为 OTIF 分配上下文结构。" -#: gdk-pixbuf/io-qtif.c:325 +#: gdk-pixbuf/io-qtif.c:329 msgid "Failed to create GdkPixbufLoader object." msgstr "创建 GdkPixbufLoader 对象失败。" -#: gdk-pixbuf/io-qtif.c:429 +#: gdk-pixbuf/io-qtif.c:424 msgid "Failed to find an image data atom." msgstr "查找图像数据失败。" -#: gdk-pixbuf/io-qtif.c:613 +#: gdk-pixbuf/io-qtif.c:599 msgctxt "image format" msgid "QuickTime" msgstr "QuickTime" -#: gdk-pixbuf/io-tga.c:349 +#: gdk-pixbuf/io-tga.c:346 msgid "Cannot allocate colormap" msgstr "无法分配色彩表" -#: gdk-pixbuf/io-tga.c:374 +#: gdk-pixbuf/io-tga.c:371 msgid "Cannot allocate new pixbuf" msgstr "无法分配新像素缓冲" -#: gdk-pixbuf/io-tga.c:522 +#: gdk-pixbuf/io-tga.c:519 msgid "Unexpected bitdepth for colormap entries" msgstr "未预期的色彩表项位深" -#: gdk-pixbuf/io-tga.c:538 +#: gdk-pixbuf/io-tga.c:535 msgid "Pseudocolor image does not contain a colormap" msgstr "伪彩色图像没有包含色彩表" -#: gdk-pixbuf/io-tga.c:581 +#: gdk-pixbuf/io-tga.c:578 msgid "Cannot allocate TGA header memory" msgstr "无法分配 TGA 头内存" -#: gdk-pixbuf/io-tga.c:612 +#: gdk-pixbuf/io-tga.c:609 msgid "TGA image has invalid dimensions" msgstr "TGA 图像尺寸无效" -#: gdk-pixbuf/io-tga.c:618 gdk-pixbuf/io-tga.c:625 +#: gdk-pixbuf/io-tga.c:615 gdk-pixbuf/io-tga.c:622 msgid "TGA image type not supported" msgstr "不支持 TGA 图像类型" @@ -857,11 +792,11 @@ msgstr "不支持 TGA 图像类型" msgid "Cannot allocate memory for TGA context struct" msgstr "无法为 TGA 上下文结构分配内存" -#: gdk-pixbuf/io-tga.c:711 +#: gdk-pixbuf/io-tga.c:712 msgid "TGA image was truncated or incomplete." msgstr "TGA 文件被截断或不完整。" -#: gdk-pixbuf/io-tga.c:763 +#: gdk-pixbuf/io-tga.c:764 msgctxt "image format" msgid "Targa" msgstr "Targa" @@ -882,7 +817,7 @@ msgstr "TIFF 图像的宽度或高度为零" msgid "Dimensions of TIFF image too large" msgstr "TIFF 图像的尺寸太大" -#: gdk-pixbuf/io-tiff.c:176 gdk-pixbuf/io-tiff.c:188 gdk-pixbuf/io-tiff.c:580 +#: gdk-pixbuf/io-tiff.c:176 gdk-pixbuf/io-tiff.c:188 gdk-pixbuf/io-tiff.c:584 msgid "Insufficient memory to open TIFF file" msgstr "内存不足以打开 TIFF 文件" @@ -894,37 +829,42 @@ msgstr "载入 TIFF 文件里的 RGB 数据失败" msgid "Failed to open TIFF image" msgstr "打开 TIFF 图像失败" -#: gdk-pixbuf/io-tiff.c:511 gdk-pixbuf/io-tiff.c:523 +#: gdk-pixbuf/io-tiff.c:515 gdk-pixbuf/io-tiff.c:527 msgid "Failed to load TIFF image" msgstr "载入 TIFF 图像失败" -#: gdk-pixbuf/io-tiff.c:755 +#: gdk-pixbuf/io-tiff.c:759 msgid "Failed to save TIFF image" msgstr "保存 TIFF 图像失败" -#: gdk-pixbuf/io-tiff.c:816 +#: gdk-pixbuf/io-tiff.c:820 msgid "TIFF compression doesn’t refer to a valid codec." msgstr "TIFF 压缩未指名有效的编码。" -#: gdk-pixbuf/io-tiff.c:861 +#: gdk-pixbuf/io-tiff.c:850 +#, c-format +msgid "Color profile has invalid length %d." +msgstr "色彩配置有无效的长度 %d。" + +#: gdk-pixbuf/io-tiff.c:865 msgid "TIFF bits-per-sample doesn’t contain a supported value." msgstr "TIFF 比特每样本不包含支持的值。" -#: gdk-pixbuf/io-tiff.c:942 +#: gdk-pixbuf/io-tiff.c:946 msgid "Failed to write TIFF data" msgstr "写入 TIFF 数据失败" -#: gdk-pixbuf/io-tiff.c:960 +#: gdk-pixbuf/io-tiff.c:964 #, c-format msgid "TIFF x-dpi must be greater than zero; value “%s” is not allowed." -msgstr "TIFF x-dpi 一定要大于 0 ；不允许使用数值“%s”。" +msgstr "TIFF x-dpi 必须大于 0；不允许使用数值“%s”。" -#: gdk-pixbuf/io-tiff.c:972 +#: gdk-pixbuf/io-tiff.c:976 #, c-format msgid "TIFF y-dpi must be greater than zero; value “%s” is not allowed." -msgstr "TIFF y-dpi 一定要大于 0 ；不允许使用数值“%s”。" +msgstr "TIFF y-dpi 必须大于 0；不允许使用数值“%s”。" -#: gdk-pixbuf/io-tiff.c:1013 +#: gdk-pixbuf/io-tiff.c:1017 msgid "Couldn’t write to TIFF file" msgstr "无法写入 TIFF 文件" @@ -932,15 +872,15 @@ msgstr "无法写入 TIFF 文件" msgid "Invalid XBM file" msgstr "XBM 文件无效" -#: gdk-pixbuf/io-xbm.c:330 +#: gdk-pixbuf/io-xbm.c:331 msgid "Insufficient memory to load XBM image file" msgstr "内存不足以载入 XBM 图像文件" -#: gdk-pixbuf/io-xbm.c:478 +#: gdk-pixbuf/io-xbm.c:482 msgid "Failed to write to temporary file when loading XBM image" msgstr "载入 XBM 图像时无法写入临时文件" -#: gdk-pixbuf/io-xbm.c:517 +#: gdk-pixbuf/io-xbm.c:521 msgctxt "image format" msgid "XBM" msgstr "XBM" @@ -949,7 +889,7 @@ msgstr "XBM" msgid "No XPM header found" msgstr "找不到 XPM 头" -#: gdk-pixbuf/io-xpm.c:481 gdk-pixbuf/io-xpm.c:507 gdk-pixbuf/io-xpm.c:610 +#: gdk-pixbuf/io-xpm.c:481 gdk-pixbuf/io-xpm.c:507 msgid "Invalid XPM header" msgstr "无效的 XBM 头" @@ -977,17 +917,69 @@ msgstr "无法分配内存来载入 XPM 图像" msgid "Cannot read XPM colormap" msgstr "无法读入 XPM 色彩表" -#: gdk-pixbuf/io-xpm.c:804 +#: gdk-pixbuf/io-xpm.c:610 +msgid "Dimensions do not match data" +msgstr "图像尺寸与数据不匹配" + +#: gdk-pixbuf/io-xpm.c:806 msgid "Failed to write to temporary file when loading XPM image" msgstr "载入 XPM 图像时写入临时文件失败" -#: gdk-pixbuf/io-xpm.c:843 +#: gdk-pixbuf/io-xpm.c:845 msgctxt "image format" msgid "XPM" msgstr "XPM" -#~ msgid "Dimensions do not match data" -#~ msgstr "图像尺寸与数据不匹配" +#~ msgid "Internal error in the GIF loader (%s)" +#~ msgstr "GIF 文件载入模块产生内部程序错误（%s）" + +#~ msgid "Bad code encountered" +#~ msgstr "遇到了错误的代码" + +#~ msgid "Stack overflow" +#~ msgstr "栈溢出" + +#~ msgid "GIF image loader cannot understand this image." +#~ msgstr "GIF 文件载入模块无法分析此图像。" + +#~ msgid "Circular table entry in GIF file" +#~ msgstr "GIF 文件中的表项循环" + +#~ msgid "Not enough memory to composite a frame in GIF file" +#~ msgstr "内存不足以构建 GIF 文件中的一帧" + +#~ msgid "Couldn’t allocate memory for stream" +#~ msgstr "无法为流分配内存" + +#~ msgid "Couldn’t decode image" +#~ msgstr "无法解码图像" + +#~ msgid "Transformed JPEG2000 has zero width or height" +#~ msgstr "已转换的 JPEG2000 的宽度或高度为零" + +#~ msgid "Image type currently not supported" +#~ msgstr "目前不支持该图像类型" + +#~ msgid "Couldn’t allocate memory for color profile" +#~ msgstr "无法为色彩配置分配内存" + +#~ msgid "Insufficient memory to open JPEG 2000 file" +#~ msgstr "内存不足以打开 JPEG 2000 文件" + +#~ msgid "Couldn’t allocate memory to buffer image data" +#~ msgstr "无法为缓冲图像数据分配内存" + +#~ msgctxt "image format" +#~ msgid "JPEG 2000" +#~ msgstr "JPEG 2000" + +#~ msgid "" +#~ "PNG compression level must be a value between 0 and 9; value “%s” could " +#~ "not be parsed." +#~ msgstr "PNG 压缩级别一定要在 0 至 9 之间；无法解析数值“%s”。" + +#~ msgid "PNG y-dpi must be greater than zero; value “%s” is not allowed." +#~ msgstr "PNG y-dpi 一定要大于 0 ；不允许使用数值“%s”。" #~ msgid "Transformed pixbuf has zero width or height." #~ msgstr "变形后 pixbuf 的宽度或高度为零。" diff --git a/subprojects/gi-docgen.wrap b/subprojects/gi-docgen.wrap new file mode 100644 index 000000000..e9c78c1e7 --- /dev/null +++ b/subprojects/gi-docgen.wrap @@ -0,0 +1,6 @@ +[wrap-git] +directory=gi-docgen +url=https://gitlab.gnome.org/ebassi/gi-docgen.git +push-url=ssh://git@gitlab.gnome.org:ebassi/gi-docgen.git +revision=main +depth=1 |