Merge lp:~noskcaj/ubuntu/utopic/gdk-pixbuf/2.30.8 into lp:ubuntu/utopic/gdk-pixbuf

Proposed by Jackson Doak
Status: Rejected
Rejected by: Sebastien Bacher
Proposed branch: lp:~noskcaj/ubuntu/utopic/gdk-pixbuf/2.30.8
Merge into: lp:ubuntu/utopic/gdk-pixbuf
Diff against target: 13877 lines (+2319/-2359)
161 files modified
Makefile.in (+1/-1)
NEWS (+9/-0)
aclocal.m4 (+427/-427)
config.h.win32 (+2/-2)
configure (+14/-14)
configure.ac (+2/-2)
debian/changelog (+6/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
docs/reference/gdk-pixbuf/gdk-pixbuf-csource.1 (+1/-1)
docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.1 (+1/-1)
docs/reference/gdk-pixbuf/html/GdkPixbufLoader.html (+10/-9)
docs/reference/gdk-pixbuf/html/annotation-glossary.html (+3/-3)
docs/reference/gdk-pixbuf/html/api-index-2-12.html (+3/-3)
docs/reference/gdk-pixbuf/html/api-index-2-14.html (+3/-3)
docs/reference/gdk-pixbuf/html/api-index-2-2.html (+3/-3)
docs/reference/gdk-pixbuf/html/api-index-2-26.html (+3/-3)
docs/reference/gdk-pixbuf/html/api-index-2-28.html (+3/-3)
docs/reference/gdk-pixbuf/html/api-index-2-30.html (+3/-3)
docs/reference/gdk-pixbuf/html/api-index-2-4.html (+3/-3)
docs/reference/gdk-pixbuf/html/api-index-2-6.html (+3/-3)
docs/reference/gdk-pixbuf/html/api-index-2-8.html (+3/-3)
docs/reference/gdk-pixbuf/html/api-index-deprecated.html (+3/-3)
docs/reference/gdk-pixbuf/html/api-index-full.html (+3/-3)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-Animations.html (+6/-6)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-File-Loading.html (+49/-48)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-File-saving.html (+24/-30)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-Image-Data-in-Memory.html (+17/-23)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-Inline-data.html (+23/-28)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-Module-Interface.html (+41/-47)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html (+12/-18)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-Scaling.html (+27/-33)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-The-GdkPixbuf-Structure.html (+8/-8)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-Utilities.html (+12/-18)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-Versioning.html (+7/-13)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-X-Drawables-to-Pixbufs.html (+7/-13)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-Xlib-Rendering.html (+9/-15)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-XlibRGB.html (+32/-38)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-csource.html (+3/-3)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html (+7/-13)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-gdk-pixbuf-from-drawables.html (+3/-3)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-gdk-pixbuf-rendering.html (+3/-3)
docs/reference/gdk-pixbuf/html/gdk-pixbuf-query-loaders.html (+3/-3)
docs/reference/gdk-pixbuf/html/index.html (+3/-3)
docs/reference/gdk-pixbuf/html/index.sgml (+0/-13)
docs/reference/gdk-pixbuf/html/license.html (+3/-3)
docs/reference/gdk-pixbuf/html/rn01.html (+3/-3)
docs/reference/gdk-pixbuf/html/rn02.html (+3/-3)
docs/reference/gdk-pixbuf/html/style.css (+153/-138)
docs/reference/gdk-pixbuf/version.xml (+1/-1)
gdk-pixbuf/gdk-pixbuf-features.h (+2/-2)
gdk-pixbuf/gdk-pixbuf-io.c (+20/-13)
gdk-pixbuf/gdk-pixbuf-loader.c (+3/-2)
gdk-pixbuf/gdk-pixbuf-scale.c (+4/-4)
gdk-pixbuf/gdk-pixdata.c (+3/-2)
gdk-pixbuf/gdk_pixbuf.rc (+4/-4)
po/af.po (+12/-12)
po/ang.po (+12/-12)
po/ar.po (+12/-12)
po/as.po (+12/-12)
po/ast.po (+12/-12)
po/az.po (+12/-12)
po/be.po (+12/-12)
po/be@latin.po (+12/-12)
po/bg.po (+12/-12)
po/bn.po (+12/-12)
po/bn_IN.po (+12/-12)
po/br.po (+12/-12)
po/bs.po (+12/-12)
po/ca.po (+12/-12)
po/ca@valencia.po (+12/-12)
po/crh.po (+12/-12)
po/cs.po (+12/-12)
po/csb.po (+12/-12)
po/cy.po (+12/-12)
po/da.po (+12/-12)
po/de.po (+12/-12)
po/dz.po (+12/-12)
po/el.po (+12/-12)
po/en@shaw.po (+12/-12)
po/en_CA.po (+12/-12)
po/en_GB.po (+12/-12)
po/eo.po (+12/-12)
po/es.po (+12/-12)
po/et.po (+12/-12)
po/eu.po (+22/-21)
po/fa.po (+12/-12)
po/fi.po (+12/-12)
po/fr.po (+12/-12)
po/ga.po (+12/-12)
po/gdk-pixbuf.pot (+13/-13)
po/gl.po (+12/-12)
po/gu.po (+12/-12)
po/he.po (+12/-12)
po/hi.po (+12/-12)
po/hr.po (+12/-12)
po/hu.po (+12/-12)
po/hy.po (+12/-12)
po/ia.po (+12/-12)
po/id.po (+52/-52)
po/io.po (+12/-12)
po/is.po (+12/-12)
po/it.po (+12/-12)
po/ja.po (+12/-12)
po/ka.po (+12/-12)
po/km.po (+12/-12)
po/kn.po (+12/-12)
po/ko.po (+12/-12)
po/ku.po (+12/-12)
po/li.po (+12/-12)
po/lt.po (+12/-12)
po/lv.po (+12/-12)
po/mai.po (+12/-12)
po/mi.po (+12/-12)
po/mk.po (+12/-12)
po/ml.po (+12/-12)
po/mn.po (+12/-12)
po/mr.po (+12/-12)
po/ms.po (+12/-12)
po/my.po (+12/-12)
po/nb.po (+12/-12)
po/nds.po (+12/-12)
po/ne.po (+12/-12)
po/nl.po (+12/-12)
po/nn.po (+12/-12)
po/nso.po (+12/-12)
po/oc.po (+12/-12)
po/or.po (+12/-12)
po/pa.po (+12/-12)
po/pl.po (+12/-12)
po/ps.po (+12/-12)
po/pt.po (+12/-12)
po/pt_BR.po (+12/-12)
po/ro.po (+12/-12)
po/ru.po (+12/-12)
po/si.po (+12/-12)
po/sk.po (+12/-12)
po/sl.po (+12/-12)
po/sq.po (+12/-12)
po/sr.po (+12/-12)
po/sr@ije.po (+12/-12)
po/sr@latin.po (+12/-12)
po/sv.po (+12/-12)
po/ta.po (+12/-12)
po/te.po (+12/-12)
po/tg.po (+12/-12)
po/th.po (+12/-12)
po/tk.po (+12/-12)
po/tr.po (+12/-12)
po/tt.po (+12/-12)
po/ug.po (+12/-12)
po/uk.po (+12/-12)
po/uz.po (+12/-12)
po/uz@cyrillic.po (+12/-12)
po/vi.po (+12/-12)
po/wa.po (+12/-12)
po/xh.po (+12/-12)
po/yi.po (+12/-12)
po/zh_CN.po (+12/-12)
po/zh_HK.po (+12/-12)
po/zh_TW.po (+12/-12)
To merge this branch: bzr merge lp:~noskcaj/ubuntu/utopic/gdk-pixbuf/2.30.8
Reviewer Review Type Date Requested Status
Robert Ancell (community) Approve
Review via email: mp+232018@code.launchpad.net

Description of the change

New upstream bugfix release

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Looks good. It would be preferrable to push the change through Debian so we don't diverge but if that doesn't happen before our freeze then this is also acceptable.

review: Approve
Revision history for this message
Sebastien Bacher (seb128) wrote :

the new version is in Ubuntu since

Unmerged revisions

51. By Jackson Doak

New upstream bugfix release.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.in'
2--- Makefile.in 2014-04-23 15:46:48 +0000
3+++ Makefile.in 2014-08-24 22:11:39 +0000
4@@ -85,7 +85,7 @@
5 $(srcdir)/gdk-pixbuf-2.0-uninstalled.pc.in \
6 $(srcdir)/config.h.win32.in ABOUT-NLS AUTHORS COPYING INSTALL \
7 NEWS README compile config.guess config.rpath config.sub \
8- depcomp install-sh missing ltmain.sh
9+ install-sh missing ltmain.sh
10 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
11 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
12 $(top_srcdir)/m4/glibtests.m4 $(top_srcdir)/m4/gtk-doc.m4 \
13
14=== modified file 'NEWS'
15--- NEWS 2014-04-23 15:46:48 +0000
16+++ NEWS 2014-08-24 22:11:39 +0000
17@@ -1,3 +1,12 @@
18+2.30.8
19+======
20+
21+* Add missing nullability annotations
22+
23+* Documentation improvements
24+
25+* Translation updates
26+
27 2.30.7
28 ======
29
30
31=== modified file 'aclocal.m4'
32--- aclocal.m4 2014-04-23 15:46:48 +0000
33+++ aclocal.m4 2014-08-24 22:11:39 +0000
34@@ -20,433 +20,6 @@
35 If you have problems, you may need to regenerate the build system entirely.
36 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
37
38-# Configure paths for GLIB
39-# Owen Taylor 1997-2001
40-
41-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
42-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
43-dnl gthread, or gio is specified in MODULES, pass to pkg-config
44-dnl
45-AC_DEFUN([AM_PATH_GLIB_2_0],
46-[dnl
47-dnl Get the cflags and libraries from pkg-config
48-dnl
49-AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
50- , enable_glibtest=yes)
51-
52- pkg_config_args=glib-2.0
53- for module in . $4
54- do
55- case "$module" in
56- gmodule)
57- pkg_config_args="$pkg_config_args gmodule-2.0"
58- ;;
59- gmodule-no-export)
60- pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
61- ;;
62- gobject)
63- pkg_config_args="$pkg_config_args gobject-2.0"
64- ;;
65- gthread)
66- pkg_config_args="$pkg_config_args gthread-2.0"
67- ;;
68- gio*)
69- pkg_config_args="$pkg_config_args $module-2.0"
70- ;;
71- esac
72- done
73-
74- PKG_PROG_PKG_CONFIG([0.16])
75-
76- no_glib=""
77-
78- if test "x$PKG_CONFIG" = x ; then
79- no_glib=yes
80- PKG_CONFIG=no
81- fi
82-
83- min_glib_version=ifelse([$1], ,2.0.0,$1)
84- AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
85-
86- if test x$PKG_CONFIG != xno ; then
87- ## don't try to run the test against uninstalled libtool libs
88- if $PKG_CONFIG --uninstalled $pkg_config_args; then
89- echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
90- enable_glibtest=no
91- fi
92-
93- if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
94- :
95- else
96- no_glib=yes
97- fi
98- fi
99-
100- if test x"$no_glib" = x ; then
101- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
102- GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
103- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
104- GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
105-
106- GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
107- GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
108- glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
109- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
110- glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
111- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
112- glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
113- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
114- if test "x$enable_glibtest" = "xyes" ; then
115- ac_save_CFLAGS="$CFLAGS"
116- ac_save_LIBS="$LIBS"
117- CFLAGS="$CFLAGS $GLIB_CFLAGS"
118- LIBS="$GLIB_LIBS $LIBS"
119-dnl
120-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
121-dnl checks the results of pkg-config to some extent)
122-dnl
123- rm -f conf.glibtest
124- AC_TRY_RUN([
125-#include <glib.h>
126-#include <stdio.h>
127-#include <stdlib.h>
128-
129-int
130-main ()
131-{
132- unsigned int major, minor, micro;
133-
134- fclose (fopen ("conf.glibtest", "w"));
135-
136- if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
137- printf("%s, bad version string\n", "$min_glib_version");
138- exit(1);
139- }
140-
141- if ((glib_major_version != $glib_config_major_version) ||
142- (glib_minor_version != $glib_config_minor_version) ||
143- (glib_micro_version != $glib_config_micro_version))
144- {
145- printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
146- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
147- glib_major_version, glib_minor_version, glib_micro_version);
148- printf ("*** was found! If pkg-config was correct, then it is best\n");
149- printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
150- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
151- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
152- printf("*** required on your system.\n");
153- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
154- printf("*** to point to the correct configuration files\n");
155- }
156- else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
157- (glib_minor_version != GLIB_MINOR_VERSION) ||
158- (glib_micro_version != GLIB_MICRO_VERSION))
159- {
160- printf("*** GLIB header files (version %d.%d.%d) do not match\n",
161- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
162- printf("*** library (version %d.%d.%d)\n",
163- glib_major_version, glib_minor_version, glib_micro_version);
164- }
165- else
166- {
167- if ((glib_major_version > major) ||
168- ((glib_major_version == major) && (glib_minor_version > minor)) ||
169- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
170- {
171- return 0;
172- }
173- else
174- {
175- printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
176- glib_major_version, glib_minor_version, glib_micro_version);
177- printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n",
178- major, minor, micro);
179- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
180- printf("***\n");
181- printf("*** If you have already installed a sufficiently new version, this error\n");
182- printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
183- printf("*** being found. The easiest way to fix this is to remove the old version\n");
184- printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
185- printf("*** correct copy of pkg-config. (In this case, you will have to\n");
186- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
187- printf("*** so that the correct libraries are found at run-time))\n");
188- }
189- }
190- return 1;
191-}
192-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
193- CFLAGS="$ac_save_CFLAGS"
194- LIBS="$ac_save_LIBS"
195- fi
196- fi
197- if test "x$no_glib" = x ; then
198- AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
199- ifelse([$2], , :, [$2])
200- else
201- AC_MSG_RESULT(no)
202- if test "$PKG_CONFIG" = "no" ; then
203- echo "*** A new enough version of pkg-config was not found."
204- echo "*** See http://www.freedesktop.org/software/pkgconfig/"
205- else
206- if test -f conf.glibtest ; then
207- :
208- else
209- echo "*** Could not run GLIB test program, checking why..."
210- ac_save_CFLAGS="$CFLAGS"
211- ac_save_LIBS="$LIBS"
212- CFLAGS="$CFLAGS $GLIB_CFLAGS"
213- LIBS="$LIBS $GLIB_LIBS"
214- AC_TRY_LINK([
215-#include <glib.h>
216-#include <stdio.h>
217-], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
218- [ echo "*** The test program compiled, but did not run. This usually means"
219- echo "*** that the run-time linker is not finding GLIB or finding the wrong"
220- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
221- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
222- echo "*** to the installed location Also, make sure you have run ldconfig if that"
223- echo "*** is required on your system"
224- echo "***"
225- echo "*** If you have an old version installed, it is best to remove it, although"
226- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
227- [ echo "*** The test program failed to compile or link. See the file config.log for the"
228- echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
229- CFLAGS="$ac_save_CFLAGS"
230- LIBS="$ac_save_LIBS"
231- fi
232- fi
233- GLIB_CFLAGS=""
234- GLIB_LIBS=""
235- GLIB_GENMARSHAL=""
236- GOBJECT_QUERY=""
237- GLIB_MKENUMS=""
238- GLIB_COMPILE_RESOURCES=""
239- ifelse([$3], , :, [$3])
240- fi
241- AC_SUBST(GLIB_CFLAGS)
242- AC_SUBST(GLIB_LIBS)
243- AC_SUBST(GLIB_GENMARSHAL)
244- AC_SUBST(GOBJECT_QUERY)
245- AC_SUBST(GLIB_MKENUMS)
246- AC_SUBST(GLIB_COMPILE_RESOURCES)
247- rm -f conf.glibtest
248-])
249-
250-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
251-# serial 1 (pkg-config-0.24)
252-#
253-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
254-#
255-# This program is free software; you can redistribute it and/or modify
256-# it under the terms of the GNU General Public License as published by
257-# the Free Software Foundation; either version 2 of the License, or
258-# (at your option) any later version.
259-#
260-# This program is distributed in the hope that it will be useful, but
261-# WITHOUT ANY WARRANTY; without even the implied warranty of
262-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
263-# General Public License for more details.
264-#
265-# You should have received a copy of the GNU General Public License
266-# along with this program; if not, write to the Free Software
267-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
268-#
269-# As a special exception to the GNU General Public License, if you
270-# distribute this file as part of a program that contains a
271-# configuration script generated by Autoconf, you may include it under
272-# the same distribution terms that you use for the rest of that program.
273-
274-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
275-# ----------------------------------
276-AC_DEFUN([PKG_PROG_PKG_CONFIG],
277-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
278-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
279-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
280-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
281-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
282-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
283-
284-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
285- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
286-fi
287-if test -n "$PKG_CONFIG"; then
288- _pkg_min_version=m4_default([$1], [0.9.0])
289- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
290- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
291- AC_MSG_RESULT([yes])
292- else
293- AC_MSG_RESULT([no])
294- PKG_CONFIG=""
295- fi
296-fi[]dnl
297-])# PKG_PROG_PKG_CONFIG
298-
299-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
300-#
301-# Check to see whether a particular set of modules exists. Similar
302-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
303-#
304-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
305-# only at the first occurence in configure.ac, so if the first place
306-# it's called might be skipped (such as if it is within an "if", you
307-# have to call PKG_CHECK_EXISTS manually
308-# --------------------------------------------------------------
309-AC_DEFUN([PKG_CHECK_EXISTS],
310-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
311-if test -n "$PKG_CONFIG" && \
312- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
313- m4_default([$2], [:])
314-m4_ifvaln([$3], [else
315- $3])dnl
316-fi])
317-
318-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
319-# ---------------------------------------------
320-m4_define([_PKG_CONFIG],
321-[if test -n "$$1"; then
322- pkg_cv_[]$1="$$1"
323- elif test -n "$PKG_CONFIG"; then
324- PKG_CHECK_EXISTS([$3],
325- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
326- test "x$?" != "x0" && pkg_failed=yes ],
327- [pkg_failed=yes])
328- else
329- pkg_failed=untried
330-fi[]dnl
331-])# _PKG_CONFIG
332-
333-# _PKG_SHORT_ERRORS_SUPPORTED
334-# -----------------------------
335-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
336-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
337-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
338- _pkg_short_errors_supported=yes
339-else
340- _pkg_short_errors_supported=no
341-fi[]dnl
342-])# _PKG_SHORT_ERRORS_SUPPORTED
343-
344-
345-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
346-# [ACTION-IF-NOT-FOUND])
347-#
348-#
349-# Note that if there is a possibility the first call to
350-# PKG_CHECK_MODULES might not happen, you should be sure to include an
351-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
352-#
353-#
354-# --------------------------------------------------------------
355-AC_DEFUN([PKG_CHECK_MODULES],
356-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
357-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
358-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
359-
360-pkg_failed=no
361-AC_MSG_CHECKING([for $1])
362-
363-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
364-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
365-
366-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
367-and $1[]_LIBS to avoid the need to call pkg-config.
368-See the pkg-config man page for more details.])
369-
370-if test $pkg_failed = yes; then
371- AC_MSG_RESULT([no])
372- _PKG_SHORT_ERRORS_SUPPORTED
373- if test $_pkg_short_errors_supported = yes; then
374- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
375- else
376- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
377- fi
378- # Put the nasty error message in config.log where it belongs
379- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
380-
381- m4_default([$4], [AC_MSG_ERROR(
382-[Package requirements ($2) were not met:
383-
384-$$1_PKG_ERRORS
385-
386-Consider adjusting the PKG_CONFIG_PATH environment variable if you
387-installed software in a non-standard prefix.
388-
389-_PKG_TEXT])[]dnl
390- ])
391-elif test $pkg_failed = untried; then
392- AC_MSG_RESULT([no])
393- m4_default([$4], [AC_MSG_FAILURE(
394-[The pkg-config script could not be found or is too old. Make sure it
395-is in your PATH or set the PKG_CONFIG environment variable to the full
396-path to pkg-config.
397-
398-_PKG_TEXT
399-
400-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
401- ])
402-else
403- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
404- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
405- AC_MSG_RESULT([yes])
406- $3
407-fi[]dnl
408-])# PKG_CHECK_MODULES
409-
410-
411-# PKG_INSTALLDIR(DIRECTORY)
412-# -------------------------
413-# Substitutes the variable pkgconfigdir as the location where a module
414-# should install pkg-config .pc files. By default the directory is
415-# $libdir/pkgconfig, but the default can be changed by passing
416-# DIRECTORY. The user can override through the --with-pkgconfigdir
417-# parameter.
418-AC_DEFUN([PKG_INSTALLDIR],
419-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
420-m4_pushdef([pkg_description],
421- [pkg-config installation directory @<:@]pkg_default[@:>@])
422-AC_ARG_WITH([pkgconfigdir],
423- [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
424- [with_pkgconfigdir=]pkg_default)
425-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
426-m4_popdef([pkg_default])
427-m4_popdef([pkg_description])
428-]) dnl PKG_INSTALLDIR
429-
430-
431-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
432-# -------------------------
433-# Substitutes the variable noarch_pkgconfigdir as the location where a
434-# module should install arch-independent pkg-config .pc files. By
435-# default the directory is $datadir/pkgconfig, but the default can be
436-# changed by passing DIRECTORY. The user can override through the
437-# --with-noarch-pkgconfigdir parameter.
438-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
439-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
440-m4_pushdef([pkg_description],
441- [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
442-AC_ARG_WITH([noarch-pkgconfigdir],
443- [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
444- [with_noarch_pkgconfigdir=]pkg_default)
445-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
446-m4_popdef([pkg_default])
447-m4_popdef([pkg_description])
448-]) dnl PKG_NOARCH_INSTALLDIR
449-
450-
451-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
452-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
453-# -------------------------------------------
454-# Retrieves the value of the pkg-config variable for the given module.
455-AC_DEFUN([PKG_CHECK_VAR],
456-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
457-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
458-
459-_PKG_CONFIG([$1], [variable="][$3]["], [$2])
460-AS_VAR_COPY([$1], [pkg_cv_][$1])
461-
462-AS_VAR_IF([$1], [""], [$5], [$4])dnl
463-])# PKG_CHECK_VAR
464-
465 # Copyright (C) 2002-2013 Free Software Foundation, Inc.
466 #
467 # This file is free software; the Free Software Foundation
468@@ -1662,6 +1235,433 @@
469 AC_SUBST([am__untar])
470 ]) # _AM_PROG_TAR
471
472+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
473+# serial 1 (pkg-config-0.24)
474+#
475+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
476+#
477+# This program is free software; you can redistribute it and/or modify
478+# it under the terms of the GNU General Public License as published by
479+# the Free Software Foundation; either version 2 of the License, or
480+# (at your option) any later version.
481+#
482+# This program is distributed in the hope that it will be useful, but
483+# WITHOUT ANY WARRANTY; without even the implied warranty of
484+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
485+# General Public License for more details.
486+#
487+# You should have received a copy of the GNU General Public License
488+# along with this program; if not, write to the Free Software
489+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
490+#
491+# As a special exception to the GNU General Public License, if you
492+# distribute this file as part of a program that contains a
493+# configuration script generated by Autoconf, you may include it under
494+# the same distribution terms that you use for the rest of that program.
495+
496+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
497+# ----------------------------------
498+AC_DEFUN([PKG_PROG_PKG_CONFIG],
499+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
500+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
501+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
502+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
503+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
504+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
505+
506+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
507+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
508+fi
509+if test -n "$PKG_CONFIG"; then
510+ _pkg_min_version=m4_default([$1], [0.9.0])
511+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
512+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
513+ AC_MSG_RESULT([yes])
514+ else
515+ AC_MSG_RESULT([no])
516+ PKG_CONFIG=""
517+ fi
518+fi[]dnl
519+])# PKG_PROG_PKG_CONFIG
520+
521+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
522+#
523+# Check to see whether a particular set of modules exists. Similar
524+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
525+#
526+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
527+# only at the first occurence in configure.ac, so if the first place
528+# it's called might be skipped (such as if it is within an "if", you
529+# have to call PKG_CHECK_EXISTS manually
530+# --------------------------------------------------------------
531+AC_DEFUN([PKG_CHECK_EXISTS],
532+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
533+if test -n "$PKG_CONFIG" && \
534+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
535+ m4_default([$2], [:])
536+m4_ifvaln([$3], [else
537+ $3])dnl
538+fi])
539+
540+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
541+# ---------------------------------------------
542+m4_define([_PKG_CONFIG],
543+[if test -n "$$1"; then
544+ pkg_cv_[]$1="$$1"
545+ elif test -n "$PKG_CONFIG"; then
546+ PKG_CHECK_EXISTS([$3],
547+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
548+ test "x$?" != "x0" && pkg_failed=yes ],
549+ [pkg_failed=yes])
550+ else
551+ pkg_failed=untried
552+fi[]dnl
553+])# _PKG_CONFIG
554+
555+# _PKG_SHORT_ERRORS_SUPPORTED
556+# -----------------------------
557+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
558+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
559+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
560+ _pkg_short_errors_supported=yes
561+else
562+ _pkg_short_errors_supported=no
563+fi[]dnl
564+])# _PKG_SHORT_ERRORS_SUPPORTED
565+
566+
567+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
568+# [ACTION-IF-NOT-FOUND])
569+#
570+#
571+# Note that if there is a possibility the first call to
572+# PKG_CHECK_MODULES might not happen, you should be sure to include an
573+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
574+#
575+#
576+# --------------------------------------------------------------
577+AC_DEFUN([PKG_CHECK_MODULES],
578+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
579+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
580+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
581+
582+pkg_failed=no
583+AC_MSG_CHECKING([for $1])
584+
585+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
586+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
587+
588+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
589+and $1[]_LIBS to avoid the need to call pkg-config.
590+See the pkg-config man page for more details.])
591+
592+if test $pkg_failed = yes; then
593+ AC_MSG_RESULT([no])
594+ _PKG_SHORT_ERRORS_SUPPORTED
595+ if test $_pkg_short_errors_supported = yes; then
596+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
597+ else
598+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
599+ fi
600+ # Put the nasty error message in config.log where it belongs
601+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
602+
603+ m4_default([$4], [AC_MSG_ERROR(
604+[Package requirements ($2) were not met:
605+
606+$$1_PKG_ERRORS
607+
608+Consider adjusting the PKG_CONFIG_PATH environment variable if you
609+installed software in a non-standard prefix.
610+
611+_PKG_TEXT])[]dnl
612+ ])
613+elif test $pkg_failed = untried; then
614+ AC_MSG_RESULT([no])
615+ m4_default([$4], [AC_MSG_FAILURE(
616+[The pkg-config script could not be found or is too old. Make sure it
617+is in your PATH or set the PKG_CONFIG environment variable to the full
618+path to pkg-config.
619+
620+_PKG_TEXT
621+
622+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
623+ ])
624+else
625+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
626+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
627+ AC_MSG_RESULT([yes])
628+ $3
629+fi[]dnl
630+])# PKG_CHECK_MODULES
631+
632+
633+# PKG_INSTALLDIR(DIRECTORY)
634+# -------------------------
635+# Substitutes the variable pkgconfigdir as the location where a module
636+# should install pkg-config .pc files. By default the directory is
637+# $libdir/pkgconfig, but the default can be changed by passing
638+# DIRECTORY. The user can override through the --with-pkgconfigdir
639+# parameter.
640+AC_DEFUN([PKG_INSTALLDIR],
641+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
642+m4_pushdef([pkg_description],
643+ [pkg-config installation directory @<:@]pkg_default[@:>@])
644+AC_ARG_WITH([pkgconfigdir],
645+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
646+ [with_pkgconfigdir=]pkg_default)
647+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
648+m4_popdef([pkg_default])
649+m4_popdef([pkg_description])
650+]) dnl PKG_INSTALLDIR
651+
652+
653+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
654+# -------------------------
655+# Substitutes the variable noarch_pkgconfigdir as the location where a
656+# module should install arch-independent pkg-config .pc files. By
657+# default the directory is $datadir/pkgconfig, but the default can be
658+# changed by passing DIRECTORY. The user can override through the
659+# --with-noarch-pkgconfigdir parameter.
660+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
661+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
662+m4_pushdef([pkg_description],
663+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
664+AC_ARG_WITH([noarch-pkgconfigdir],
665+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
666+ [with_noarch_pkgconfigdir=]pkg_default)
667+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
668+m4_popdef([pkg_default])
669+m4_popdef([pkg_description])
670+]) dnl PKG_NOARCH_INSTALLDIR
671+
672+
673+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
674+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
675+# -------------------------------------------
676+# Retrieves the value of the pkg-config variable for the given module.
677+AC_DEFUN([PKG_CHECK_VAR],
678+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
679+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
680+
681+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
682+AS_VAR_COPY([$1], [pkg_cv_][$1])
683+
684+AS_VAR_IF([$1], [""], [$5], [$4])dnl
685+])# PKG_CHECK_VAR
686+
687+# Configure paths for GLIB
688+# Owen Taylor 1997-2001
689+
690+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
691+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
692+dnl gthread, or gio is specified in MODULES, pass to pkg-config
693+dnl
694+AC_DEFUN([AM_PATH_GLIB_2_0],
695+[dnl
696+dnl Get the cflags and libraries from pkg-config
697+dnl
698+AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
699+ , enable_glibtest=yes)
700+
701+ pkg_config_args=glib-2.0
702+ for module in . $4
703+ do
704+ case "$module" in
705+ gmodule)
706+ pkg_config_args="$pkg_config_args gmodule-2.0"
707+ ;;
708+ gmodule-no-export)
709+ pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
710+ ;;
711+ gobject)
712+ pkg_config_args="$pkg_config_args gobject-2.0"
713+ ;;
714+ gthread)
715+ pkg_config_args="$pkg_config_args gthread-2.0"
716+ ;;
717+ gio*)
718+ pkg_config_args="$pkg_config_args $module-2.0"
719+ ;;
720+ esac
721+ done
722+
723+ PKG_PROG_PKG_CONFIG([0.16])
724+
725+ no_glib=""
726+
727+ if test "x$PKG_CONFIG" = x ; then
728+ no_glib=yes
729+ PKG_CONFIG=no
730+ fi
731+
732+ min_glib_version=ifelse([$1], ,2.0.0,$1)
733+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
734+
735+ if test x$PKG_CONFIG != xno ; then
736+ ## don't try to run the test against uninstalled libtool libs
737+ if $PKG_CONFIG --uninstalled $pkg_config_args; then
738+ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
739+ enable_glibtest=no
740+ fi
741+
742+ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
743+ :
744+ else
745+ no_glib=yes
746+ fi
747+ fi
748+
749+ if test x"$no_glib" = x ; then
750+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
751+ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
752+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
753+ GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
754+
755+ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
756+ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
757+ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
758+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
759+ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
760+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
761+ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
762+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
763+ if test "x$enable_glibtest" = "xyes" ; then
764+ ac_save_CFLAGS="$CFLAGS"
765+ ac_save_LIBS="$LIBS"
766+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
767+ LIBS="$GLIB_LIBS $LIBS"
768+dnl
769+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
770+dnl checks the results of pkg-config to some extent)
771+dnl
772+ rm -f conf.glibtest
773+ AC_TRY_RUN([
774+#include <glib.h>
775+#include <stdio.h>
776+#include <stdlib.h>
777+
778+int
779+main ()
780+{
781+ unsigned int major, minor, micro;
782+
783+ fclose (fopen ("conf.glibtest", "w"));
784+
785+ if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
786+ printf("%s, bad version string\n", "$min_glib_version");
787+ exit(1);
788+ }
789+
790+ if ((glib_major_version != $glib_config_major_version) ||
791+ (glib_minor_version != $glib_config_minor_version) ||
792+ (glib_micro_version != $glib_config_micro_version))
793+ {
794+ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
795+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
796+ glib_major_version, glib_minor_version, glib_micro_version);
797+ printf ("*** was found! If pkg-config was correct, then it is best\n");
798+ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
799+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
800+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
801+ printf("*** required on your system.\n");
802+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
803+ printf("*** to point to the correct configuration files\n");
804+ }
805+ else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
806+ (glib_minor_version != GLIB_MINOR_VERSION) ||
807+ (glib_micro_version != GLIB_MICRO_VERSION))
808+ {
809+ printf("*** GLIB header files (version %d.%d.%d) do not match\n",
810+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
811+ printf("*** library (version %d.%d.%d)\n",
812+ glib_major_version, glib_minor_version, glib_micro_version);
813+ }
814+ else
815+ {
816+ if ((glib_major_version > major) ||
817+ ((glib_major_version == major) && (glib_minor_version > minor)) ||
818+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
819+ {
820+ return 0;
821+ }
822+ else
823+ {
824+ printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
825+ glib_major_version, glib_minor_version, glib_micro_version);
826+ printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n",
827+ major, minor, micro);
828+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
829+ printf("***\n");
830+ printf("*** If you have already installed a sufficiently new version, this error\n");
831+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
832+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
833+ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
834+ printf("*** correct copy of pkg-config. (In this case, you will have to\n");
835+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
836+ printf("*** so that the correct libraries are found at run-time))\n");
837+ }
838+ }
839+ return 1;
840+}
841+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
842+ CFLAGS="$ac_save_CFLAGS"
843+ LIBS="$ac_save_LIBS"
844+ fi
845+ fi
846+ if test "x$no_glib" = x ; then
847+ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
848+ ifelse([$2], , :, [$2])
849+ else
850+ AC_MSG_RESULT(no)
851+ if test "$PKG_CONFIG" = "no" ; then
852+ echo "*** A new enough version of pkg-config was not found."
853+ echo "*** See http://www.freedesktop.org/software/pkgconfig/"
854+ else
855+ if test -f conf.glibtest ; then
856+ :
857+ else
858+ echo "*** Could not run GLIB test program, checking why..."
859+ ac_save_CFLAGS="$CFLAGS"
860+ ac_save_LIBS="$LIBS"
861+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
862+ LIBS="$LIBS $GLIB_LIBS"
863+ AC_TRY_LINK([
864+#include <glib.h>
865+#include <stdio.h>
866+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
867+ [ echo "*** The test program compiled, but did not run. This usually means"
868+ echo "*** that the run-time linker is not finding GLIB or finding the wrong"
869+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
870+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
871+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
872+ echo "*** is required on your system"
873+ echo "***"
874+ echo "*** If you have an old version installed, it is best to remove it, although"
875+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
876+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
877+ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
878+ CFLAGS="$ac_save_CFLAGS"
879+ LIBS="$ac_save_LIBS"
880+ fi
881+ fi
882+ GLIB_CFLAGS=""
883+ GLIB_LIBS=""
884+ GLIB_GENMARSHAL=""
885+ GOBJECT_QUERY=""
886+ GLIB_MKENUMS=""
887+ GLIB_COMPILE_RESOURCES=""
888+ ifelse([$3], , :, [$3])
889+ fi
890+ AC_SUBST(GLIB_CFLAGS)
891+ AC_SUBST(GLIB_LIBS)
892+ AC_SUBST(GLIB_GENMARSHAL)
893+ AC_SUBST(GOBJECT_QUERY)
894+ AC_SUBST(GLIB_MKENUMS)
895+ AC_SUBST(GLIB_COMPILE_RESOURCES)
896+ rm -f conf.glibtest
897+])
898+
899 m4_include([m4/gettext.m4])
900 m4_include([m4/glibtests.m4])
901 m4_include([m4/gtk-doc.m4])
902
903=== modified file 'config.h.win32'
904--- config.h.win32 2014-04-23 15:46:48 +0000
905+++ config.h.win32 2014-08-24 22:11:39 +0000
906@@ -110,7 +110,7 @@
907 #define PACKAGE_NAME "gdk-pixbuf"
908
909 /* Define to the full name and version of this package. */
910-#define PACKAGE_STRING "gdk-pixbuf 2.30.7"
911+#define PACKAGE_STRING "gdk-pixbuf 2.30.8"
912
913 /* Define to the one symbol short name of this package. */
914 #define PACKAGE_TARNAME "gdk-pixbuf"
915@@ -119,7 +119,7 @@
916 #define PACKAGE_URL "http://www.gtk.org/"
917
918 /* Define to the version of this package. */
919-#define PACKAGE_VERSION "2.30.7"
920+#define PACKAGE_VERSION "2.30.8"
921
922 /* Define to 1 if you have the ANSI C header files. */
923 #define STDC_HEADERS 1
924
925=== modified file 'configure'
926--- configure 2014-04-23 15:46:48 +0000
927+++ configure 2014-08-24 22:11:39 +0000
928@@ -1,6 +1,6 @@
929 #! /bin/sh
930 # Guess values for system-dependent variables and create Makefiles.
931-# Generated by GNU Autoconf 2.69 for gdk-pixbuf 2.30.7.
932+# Generated by GNU Autoconf 2.69 for gdk-pixbuf 2.30.8.
933 #
934 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-pixbuf>.
935 #
936@@ -591,8 +591,8 @@
937 # Identity of this package.
938 PACKAGE_NAME='gdk-pixbuf'
939 PACKAGE_TARNAME='gdk-pixbuf'
940-PACKAGE_VERSION='2.30.7'
941-PACKAGE_STRING='gdk-pixbuf 2.30.7'
942+PACKAGE_VERSION='2.30.8'
943+PACKAGE_STRING='gdk-pixbuf 2.30.8'
944 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-pixbuf'
945 PACKAGE_URL=''
946
947@@ -1540,7 +1540,7 @@
948 # Omit some internal or obsolete options to make the list less imposing.
949 # This message is too long to be a string in the A/UX 3.1 sh.
950 cat <<_ACEOF
951-\`configure' configures gdk-pixbuf 2.30.7 to adapt to many kinds of systems.
952+\`configure' configures gdk-pixbuf 2.30.8 to adapt to many kinds of systems.
953
954 Usage: $0 [OPTION]... [VAR=VALUE]...
955
956@@ -1610,7 +1610,7 @@
957
958 if test -n "$ac_init_help"; then
959 case $ac_init_help in
960- short | recursive ) echo "Configuration of gdk-pixbuf 2.30.7:";;
961+ short | recursive ) echo "Configuration of gdk-pixbuf 2.30.8:";;
962 esac
963 cat <<\_ACEOF
964
965@@ -1776,7 +1776,7 @@
966 test -n "$ac_init_help" && exit $ac_status
967 if $ac_init_version; then
968 cat <<\_ACEOF
969-gdk-pixbuf configure 2.30.7
970+gdk-pixbuf configure 2.30.8
971 generated by GNU Autoconf 2.69
972
973 Copyright (C) 2012 Free Software Foundation, Inc.
974@@ -2145,7 +2145,7 @@
975 This file contains any messages produced by compilers while
976 running configure, to aid debugging if configure makes a mistake.
977
978-It was created by gdk-pixbuf $as_me 2.30.7, which was
979+It was created by gdk-pixbuf $as_me 2.30.8, which was
980 generated by GNU Autoconf 2.69. Invocation command line was
981
982 $ $0 $@
983@@ -3018,7 +3018,7 @@
984
985 # Define the identity of the package.
986 PACKAGE='gdk-pixbuf'
987- VERSION='2.30.7'
988+ VERSION='2.30.8'
989
990
991 # Some tools Automake needs.
992@@ -3296,8 +3296,8 @@
993
994 GDK_PIXBUF_MAJOR=2
995 GDK_PIXBUF_MINOR=30
996-GDK_PIXBUF_MICRO=7
997-GDK_PIXBUF_VERSION=2.30.7
998+GDK_PIXBUF_MICRO=8
999+GDK_PIXBUF_VERSION=2.30.8
1000 GDK_PIXBUF_API_VERSION=2.0
1001 GDK_PIXBUF_BINARY_VERSION=2.10.0
1002
1003@@ -3317,7 +3317,7 @@
1004
1005
1006
1007-LT_VERSION_INFO="3000:7:3000"
1008+LT_VERSION_INFO="3000:8:3000"
1009 LT_CURRENT_MINUS_AGE=0
1010
1011
1012@@ -13306,7 +13306,7 @@
1013 Report bugs to <bug-libtool@gnu.org>."
1014
1015 lt_cl_version="\
1016-gdk-pixbuf config.lt 2.30.7
1017+gdk-pixbuf config.lt 2.30.8
1018 configured by $0, generated by GNU Autoconf 2.69.
1019
1020 Copyright (C) 2011 Free Software Foundation, Inc.
1021@@ -20918,7 +20918,7 @@
1022 # report actual input values of CONFIG_FILES etc. instead of their
1023 # values after options handling.
1024 ac_log="
1025-This file was extended by gdk-pixbuf $as_me 2.30.7, which was
1026+This file was extended by gdk-pixbuf $as_me 2.30.8, which was
1027 generated by GNU Autoconf 2.69. Invocation command line was
1028
1029 CONFIG_FILES = $CONFIG_FILES
1030@@ -20984,7 +20984,7 @@
1031 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1032 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1033 ac_cs_version="\\
1034-gdk-pixbuf config.status 2.30.7
1035+gdk-pixbuf config.status 2.30.8
1036 configured by $0, generated by GNU Autoconf 2.69,
1037 with options \\"\$ac_cs_config\\"
1038
1039
1040=== modified file 'configure.ac'
1041--- configure.ac 2014-04-23 15:46:48 +0000
1042+++ configure.ac 2014-08-24 22:11:39 +0000
1043@@ -15,8 +15,8 @@
1044
1045 m4_define([gdk_pixbuf_major_version], [2])
1046 m4_define([gdk_pixbuf_minor_version], [30])
1047-m4_define([gdk_pixbuf_micro_version], [7])
1048-m4_define([gdk_pixbuf_interface_age], [7])
1049+m4_define([gdk_pixbuf_micro_version], [8])
1050+m4_define([gdk_pixbuf_interface_age], [8])
1051 m4_define([gdk_pixbuf_binary_age],
1052 [m4_eval(100 * gdk_pixbuf_minor_version + gdk_pixbuf_micro_version)])
1053 m4_define([gdk_pixbuf_version],
1054
1055=== modified file 'debian/changelog'
1056--- debian/changelog 2014-04-23 15:46:48 +0000
1057+++ debian/changelog 2014-08-24 22:11:39 +0000
1058@@ -1,3 +1,9 @@
1059+gdk-pixbuf (2.30.8-0ubuntu1) utopic; urgency=medium
1060+
1061+ * New upstream bugfix release.
1062+
1063+ -- Jackson Doak <noskcaj@ubuntu.com> Mon, 25 Aug 2014 08:01:34 +1000
1064+
1065 gdk-pixbuf (2.30.7-1) unstable; urgency=medium
1066
1067 * New upstream release.
1068
1069=== modified file 'debian/control'
1070--- debian/control 2014-04-23 15:46:48 +0000
1071+++ debian/control 2014-08-24 22:11:39 +0000
1072@@ -6,7 +6,8 @@
1073 Source: gdk-pixbuf
1074 Section: libs
1075 Priority: optional
1076-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
1077+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
1078+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
1079 Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Michael Biebl <biebl@debian.org>
1080 Build-Depends: cdbs (>= 0.4.93),
1081 debhelper (>= 9),
1082
1083=== modified file 'debian/control.in'
1084--- debian/control.in 2014-04-23 15:46:48 +0000
1085+++ debian/control.in 2014-08-24 22:11:39 +0000
1086@@ -1,7 +1,8 @@
1087 Source: gdk-pixbuf
1088 Section: libs
1089 Priority: optional
1090-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
1091+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
1092+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
1093 Uploaders: @GNOME_TEAM@
1094 Build-Depends: cdbs (>= 0.4.93),
1095 debhelper (>= 9),
1096
1097=== modified file 'docs/reference/gdk-pixbuf/gdk-pixbuf-csource.1'
1098--- docs/reference/gdk-pixbuf/gdk-pixbuf-csource.1 2014-04-23 15:46:48 +0000
1099+++ docs/reference/gdk-pixbuf/gdk-pixbuf-csource.1 2014-08-24 22:11:39 +0000
1100@@ -2,7 +2,7 @@
1101 .\" Title: gdk-pixbuf-csource
1102 .\" Author: Tim Janik
1103 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1104-.\" Date: 03/17/2014
1105+.\" Date: 05/26/2014
1106 .\" Manual: User Commands
1107 .\" Source: gdk-pixbuf
1108 .\" Language: English
1109
1110=== modified file 'docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.1'
1111--- docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.1 2014-04-23 15:46:48 +0000
1112+++ docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.1 2014-08-24 22:11:39 +0000
1113@@ -2,7 +2,7 @@
1114 .\" Title: gdk-pixbuf-query-loaders
1115 .\" Author: Owen Taylor
1116 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1117-.\" Date: 03/17/2014
1118+.\" Date: 05/26/2014
1119 .\" Manual: User Commands
1120 .\" Source: gdk-pixbuf
1121 .\" Language: English
1122
1123=== modified file 'docs/reference/gdk-pixbuf/html/GdkPixbufLoader.html'
1124--- docs/reference/gdk-pixbuf/html/GdkPixbufLoader.html 2014-04-23 15:46:48 +0000
1125+++ docs/reference/gdk-pixbuf/html/GdkPixbufLoader.html 2014-08-24 22:11:39 +0000
1126@@ -8,15 +8,15 @@
1127 <link rel="up" href="rn01.html" title="API Reference">
1128 <link rel="prev" href="gdk-pixbuf-Animations.html" title="Animations">
1129 <link rel="next" href="gdk-pixbuf-Module-Interface.html" title="Module Interface">
1130-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
1131+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
1132 <link rel="stylesheet" href="style.css" type="text/css">
1133 </head>
1134 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
1135-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
1136+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
1137 <td width="100%" align="left" class="shortcuts">
1138-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
1139- <a href="#GdkPixbufLoader.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
1140- <a href="#GdkPixbufLoader.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_signals"> <span class="dim">|</span> 
1141+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
1142+ <a href="#GdkPixbufLoader.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
1143+ <a href="#GdkPixbufLoader.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_signals">  <span class="dim">|</span> 
1144 <a href="#GdkPixbufLoader.signals" class="shortcut">Signals</a></span>
1145 </td>
1146 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
1147@@ -352,9 +352,10 @@
1148 </div>
1149 <div class="refsect3">
1150 <a name="id-1.2.15.9.5.6"></a><h4>Returns</h4>
1151-<p> A <a class="link" href="gdk-pixbuf-Module-Interface.html#GdkPixbufFormat" title="struct GdkPixbufFormat"><span class="type">GdkPixbufFormat</span></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. The return
1152-value is owned by GdkPixbuf and should not be freed. </p>
1153-<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
1154+<p> A <a class="link" href="gdk-pixbuf-Module-Interface.html#GdkPixbufFormat" title="struct GdkPixbufFormat"><span class="type">GdkPixbufFormat</span></a> or
1155+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. The return value is owned by GdkPixbuf and should not be
1156+freed. </p>
1157+<p><span class="annotation">[nullable][<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
1158 </div>
1159 <p class="since">Since 2.2</p>
1160 </div>
1161@@ -821,6 +822,6 @@
1162 </div>
1163 <div class="footer">
1164 <hr>
1165- Generated by GTK-Doc V1.20</div>
1166+ Generated by GTK-Doc V1.20.1</div>
1167 </body>
1168 </html>
1169\ No newline at end of file
1170
1171=== modified file 'docs/reference/gdk-pixbuf/html/annotation-glossary.html'
1172--- docs/reference/gdk-pixbuf/html/annotation-glossary.html 2014-04-23 15:46:48 +0000
1173+++ docs/reference/gdk-pixbuf/html/annotation-glossary.html 2014-08-24 22:11:39 +0000
1174@@ -7,11 +7,11 @@
1175 <link rel="home" href="index.html" title="GDK-PixBuf Reference Manual">
1176 <link rel="up" href="index.html" title="GDK-PixBuf Reference Manual">
1177 <link rel="prev" href="license.html" title="Appendix A. License">
1178-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
1179+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
1180 <link rel="stylesheet" href="style.css" type="text/css">
1181 </head>
1182 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
1183-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
1184+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
1185 <td width="100%" align="left" class="shortcuts"><span id="nav_glossary"><a class="shortcut" href="#glsA">A</a>
1186  <span class="dim">|</span> 
1187 <a class="shortcut" href="#glsC">C</a>
1188@@ -60,6 +60,6 @@
1189 </div>
1190 <div class="footer">
1191 <hr>
1192- Generated by GTK-Doc V1.20</div>
1193+ Generated by GTK-Doc V1.20.1</div>
1194 </body>
1195 </html>
1196\ No newline at end of file
1197
1198=== modified file 'docs/reference/gdk-pixbuf/html/api-index-2-12.html'
1199--- docs/reference/gdk-pixbuf/html/api-index-2-12.html 2014-04-23 15:46:48 +0000
1200+++ docs/reference/gdk-pixbuf/html/api-index-2-12.html 2014-08-24 22:11:39 +0000
1201@@ -8,11 +8,11 @@
1202 <link rel="up" href="index.html" title="GDK-PixBuf Reference Manual">
1203 <link rel="prev" href="api-index-2-8.html" title="Index of new symbols in 2.8">
1204 <link rel="next" href="api-index-2-14.html" title="Index of new symbols in 2.14">
1205-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
1206+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
1207 <link rel="stylesheet" href="style.css" type="text/css">
1208 </head>
1209 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
1210-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
1211+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
1212 <td width="100%" align="left" class="shortcuts"><span id="nav_index"><a class="shortcut" href="#idxA">A</a></span></td>
1213 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
1214 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
1215@@ -30,6 +30,6 @@
1216 </div>
1217 <div class="footer">
1218 <hr>
1219- Generated by GTK-Doc V1.20</div>
1220+ Generated by GTK-Doc V1.20.1</div>
1221 </body>
1222 </html>
1223\ No newline at end of file
1224
1225=== modified file 'docs/reference/gdk-pixbuf/html/api-index-2-14.html'
1226--- docs/reference/gdk-pixbuf/html/api-index-2-14.html 2014-04-23 15:46:48 +0000
1227+++ docs/reference/gdk-pixbuf/html/api-index-2-14.html 2014-08-24 22:11:39 +0000
1228@@ -8,11 +8,11 @@
1229 <link rel="up" href="index.html" title="GDK-PixBuf Reference Manual">
1230 <link rel="prev" href="api-index-2-12.html" title="Index of new symbols in 2.12">
1231 <link rel="next" href="api-index-2-26.html" title="Index of new symbols in 2.26">
1232-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
1233+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
1234 <link rel="stylesheet" href="style.css" type="text/css">
1235 </head>
1236 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
1237-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
1238+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
1239 <td width="100%" align="left" class="shortcuts"><span id="nav_index"><a class="shortcut" href="#idxN">N</a>
1240  <span class="dim">|</span> 
1241 <a class="shortcut" href="#idxS">S</a></span></td>
1242@@ -41,6 +41,6 @@
1243 </div>
1244 <div class="footer">
1245 <hr>
1246- Generated by GTK-Doc V1.20</div>
1247+ Generated by GTK-Doc V1.20.1</div>
1248 </body>
1249 </html>
1250\ No newline at end of file
1251
1252=== modified file 'docs/reference/gdk-pixbuf/html/api-index-2-2.html'
1253--- docs/reference/gdk-pixbuf/html/api-index-2-2.html 2014-04-23 15:46:48 +0000
1254+++ docs/reference/gdk-pixbuf/html/api-index-2-2.html 2014-08-24 22:11:39 +0000
1255@@ -8,11 +8,11 @@
1256 <link rel="up" href="index.html" title="GDK-PixBuf Reference Manual">
1257 <link rel="prev" href="api-index-deprecated.html" title="Index of deprecated symbols">
1258 <link rel="next" href="api-index-2-4.html" title="Index of new symbols in 2.4">
1259-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
1260+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
1261 <link rel="stylesheet" href="style.css" type="text/css">
1262 </head>
1263 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
1264-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
1265+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
1266 <td width="100%" align="left" class="shortcuts"><span id="nav_index"><a class="shortcut" href="#idxF">F</a>
1267  <span class="dim">|</span> 
1268 <a class="shortcut" href="#idxG">G</a>
1269@@ -103,6 +103,6 @@
1270 </div>
1271 <div class="footer">
1272 <hr>
1273- Generated by GTK-Doc V1.20</div>
1274+ Generated by GTK-Doc V1.20.1</div>
1275 </body>
1276 </html>
1277\ No newline at end of file
1278
1279=== modified file 'docs/reference/gdk-pixbuf/html/api-index-2-26.html'
1280--- docs/reference/gdk-pixbuf/html/api-index-2-26.html 2014-03-31 17:15:34 +0000
1281+++ docs/reference/gdk-pixbuf/html/api-index-2-26.html 2014-08-24 22:11:39 +0000
1282@@ -8,11 +8,11 @@
1283 <link rel="up" href="index.html" title="GDK-PixBuf Reference Manual">
1284 <link rel="prev" href="api-index-2-14.html" title="Index of new symbols in 2.14">
1285 <link rel="next" href="api-index-2-28.html" title="Index of new symbols in 2.28">
1286-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
1287+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
1288 <link rel="stylesheet" href="style.css" type="text/css">
1289 </head>
1290 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
1291-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
1292+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
1293 <td width="100%" align="left" class="shortcuts"><span id="nav_index"><a class="shortcut" href="#idxG">G</a>
1294  <span class="dim">|</span> 
1295 <a class="shortcut" href="#idxN">N</a></span></td>
1296@@ -45,6 +45,6 @@
1297 </div>
1298 <div class="footer">
1299 <hr>
1300- Generated by GTK-Doc V1.20</div>
1301+ Generated by GTK-Doc V1.20.1</div>
1302 </body>
1303 </html>
1304\ No newline at end of file
1305
1306=== modified file 'docs/reference/gdk-pixbuf/html/api-index-2-28.html'
1307--- docs/reference/gdk-pixbuf/html/api-index-2-28.html 2014-03-31 17:15:34 +0000
1308+++ docs/reference/gdk-pixbuf/html/api-index-2-28.html 2014-08-24 22:11:39 +0000
1309@@ -8,11 +8,11 @@
1310 <link rel="up" href="index.html" title="GDK-PixBuf Reference Manual">
1311 <link rel="prev" href="api-index-2-26.html" title="Index of new symbols in 2.26">
1312 <link rel="next" href="api-index-2-30.html" title="Index of new symbols in 2.30">
1313-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
1314+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
1315 <link rel="stylesheet" href="style.css" type="text/css">
1316 </head>
1317 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
1318-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
1319+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
1320 <td width="100%" align="left" class="shortcuts"><span id="nav_index"><a class="shortcut" href="#idxA">A</a></span></td>
1321 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
1322 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
1323@@ -42,6 +42,6 @@
1324 </div>
1325 <div class="footer">
1326 <hr>
1327- Generated by GTK-Doc V1.20</div>
1328+ Generated by GTK-Doc V1.20.1</div>
1329 </body>
1330 </html>
1331\ No newline at end of file
1332
1333=== modified file 'docs/reference/gdk-pixbuf/html/api-index-2-30.html'
1334--- docs/reference/gdk-pixbuf/html/api-index-2-30.html 2014-03-31 17:15:34 +0000
1335+++ docs/reference/gdk-pixbuf/html/api-index-2-30.html 2014-08-24 22:11:39 +0000
1336@@ -8,11 +8,11 @@
1337 <link rel="up" href="index.html" title="GDK-PixBuf Reference Manual">
1338 <link rel="prev" href="api-index-2-28.html" title="Index of new symbols in 2.28">
1339 <link rel="next" href="license.html" title="Appendix A. License">
1340-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
1341+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
1342 <link rel="stylesheet" href="style.css" type="text/css">
1343 </head>
1344 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
1345-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
1346+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
1347 <td width="100%" align="left" class="shortcuts"><span id="nav_index"><a class="shortcut" href="#idxL">L</a></span></td>
1348 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
1349 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
1350@@ -30,6 +30,6 @@
1351 </div>
1352 <div class="footer">
1353 <hr>
1354- Generated by GTK-Doc V1.20</div>
1355+ Generated by GTK-Doc V1.20.1</div>
1356 </body>
1357 </html>
1358\ No newline at end of file
1359
1360=== modified file 'docs/reference/gdk-pixbuf/html/api-index-2-4.html'
1361--- docs/reference/gdk-pixbuf/html/api-index-2-4.html 2014-04-23 15:46:48 +0000
1362+++ docs/reference/gdk-pixbuf/html/api-index-2-4.html 2014-08-24 22:11:39 +0000
1363@@ -8,11 +8,11 @@
1364 <link rel="up" href="index.html" title="GDK-PixBuf Reference Manual">
1365 <link rel="prev" href="api-index-2-2.html" title="Index of new symbols in 2.2">
1366 <link rel="next" href="api-index-2-6.html" title="Index of new symbols in 2.6">
1367-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
1368+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
1369 <link rel="stylesheet" href="style.css" type="text/css">
1370 </head>
1371 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
1372-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
1373+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
1374 <td width="100%" align="left" class="shortcuts"><span id="nav_index"><a class="shortcut" href="#idxG">G</a>
1375  <span class="dim">|</span> 
1376 <a class="shortcut" href="#idxL">L</a>
1377@@ -67,6 +67,6 @@
1378 </div>
1379 <div class="footer">
1380 <hr>
1381- Generated by GTK-Doc V1.20</div>
1382+ Generated by GTK-Doc V1.20.1</div>
1383 </body>
1384 </html>
1385\ No newline at end of file
1386
1387=== modified file 'docs/reference/gdk-pixbuf/html/api-index-2-6.html'
1388--- docs/reference/gdk-pixbuf/html/api-index-2-6.html 2014-04-23 15:46:48 +0000
1389+++ docs/reference/gdk-pixbuf/html/api-index-2-6.html 2014-08-24 22:11:39 +0000
1390@@ -8,11 +8,11 @@
1391 <link rel="up" href="index.html" title="GDK-PixBuf Reference Manual">
1392 <link rel="prev" href="api-index-2-4.html" title="Index of new symbols in 2.4">
1393 <link rel="next" href="api-index-2-8.html" title="Index of new symbols in 2.8">
1394-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
1395+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
1396 <link rel="stylesheet" href="style.css" type="text/css">
1397 </head>
1398 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
1399-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
1400+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
1401 <td width="100%" align="left" class="shortcuts"><span id="nav_index"><a class="shortcut" href="#idxF">F</a>
1402  <span class="dim">|</span> 
1403 <a class="shortcut" href="#idxN">N</a>
1404@@ -60,6 +60,6 @@
1405 </div>
1406 <div class="footer">
1407 <hr>
1408- Generated by GTK-Doc V1.20</div>
1409+ Generated by GTK-Doc V1.20.1</div>
1410 </body>
1411 </html>
1412\ No newline at end of file
1413
1414=== modified file 'docs/reference/gdk-pixbuf/html/api-index-2-8.html'
1415--- docs/reference/gdk-pixbuf/html/api-index-2-8.html 2014-04-23 15:46:48 +0000
1416+++ docs/reference/gdk-pixbuf/html/api-index-2-8.html 2014-08-24 22:11:39 +0000
1417@@ -8,11 +8,11 @@
1418 <link rel="up" href="index.html" title="GDK-PixBuf Reference Manual">
1419 <link rel="prev" href="api-index-2-6.html" title="Index of new symbols in 2.6">
1420 <link rel="next" href="api-index-2-12.html" title="Index of new symbols in 2.12">
1421-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
1422+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
1423 <link rel="stylesheet" href="style.css" type="text/css">
1424 </head>
1425 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
1426-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
1427+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
1428 <td width="100%" align="left" class="shortcuts"><span id="nav_index"><a class="shortcut" href="#idxS">S</a></span></td>
1429 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
1430 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
1431@@ -34,6 +34,6 @@
1432 </div>
1433 <div class="footer">
1434 <hr>
1435- Generated by GTK-Doc V1.20</div>
1436+ Generated by GTK-Doc V1.20.1</div>
1437 </body>
1438 </html>
1439\ No newline at end of file
1440
1441=== modified file 'docs/reference/gdk-pixbuf/html/api-index-deprecated.html'
1442--- docs/reference/gdk-pixbuf/html/api-index-deprecated.html 2014-04-23 15:46:48 +0000
1443+++ docs/reference/gdk-pixbuf/html/api-index-deprecated.html 2014-08-24 22:11:39 +0000
1444@@ -8,11 +8,11 @@
1445 <link rel="up" href="index.html" title="GDK-PixBuf Reference Manual">
1446 <link rel="prev" href="api-index-full.html" title="Index of all symbols">
1447 <link rel="next" href="api-index-2-2.html" title="Index of new symbols in 2.2">
1448-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
1449+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
1450 <link rel="stylesheet" href="style.css" type="text/css">
1451 </head>
1452 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
1453-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
1454+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
1455 <td width="100%" align="left" class="shortcuts"><span id="nav_index"><a class="shortcut" href="#idxA">A</a>
1456  <span class="dim">|</span> 
1457 <a class="shortcut" href="#idxR">R</a>
1458@@ -48,6 +48,6 @@
1459 </div>
1460 <div class="footer">
1461 <hr>
1462- Generated by GTK-Doc V1.20</div>
1463+ Generated by GTK-Doc V1.20.1</div>
1464 </body>
1465 </html>
1466\ No newline at end of file
1467
1468=== modified file 'docs/reference/gdk-pixbuf/html/api-index-full.html'
1469--- docs/reference/gdk-pixbuf/html/api-index-full.html 2014-04-23 15:46:48 +0000
1470+++ docs/reference/gdk-pixbuf/html/api-index-full.html 2014-08-24 22:11:39 +0000
1471@@ -8,11 +8,11 @@
1472 <link rel="up" href="index.html" title="GDK-PixBuf Reference Manual">
1473 <link rel="prev" href="gdk-pixbuf-query-loaders.html" title="gdk-pixbuf-query-loaders">
1474 <link rel="next" href="api-index-deprecated.html" title="Index of deprecated symbols">
1475-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
1476+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
1477 <link rel="stylesheet" href="style.css" type="text/css">
1478 </head>
1479 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
1480-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
1481+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
1482 <td width="100%" align="left" class="shortcuts"><span id="nav_index"><a class="shortcut" href="#idxA">A</a>
1483  <span class="dim">|</span> 
1484 <a class="shortcut" href="#idxC">C</a>
1485@@ -782,6 +782,6 @@
1486 </div>
1487 <div class="footer">
1488 <hr>
1489- Generated by GTK-Doc V1.20</div>
1490+ Generated by GTK-Doc V1.20.1</div>
1491 </body>
1492 </html>
1493\ No newline at end of file
1494
1495=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-Animations.html'
1496--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-Animations.html 2014-04-23 15:46:48 +0000
1497+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-Animations.html 2014-08-24 22:11:39 +0000
1498@@ -8,15 +8,15 @@
1499 <link rel="up" href="rn01.html" title="API Reference">
1500 <link rel="prev" href="gdk-pixbuf-Utilities.html" title="Utilities">
1501 <link rel="next" href="GdkPixbufLoader.html" title="GdkPixbufLoader">
1502-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
1503+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
1504 <link rel="stylesheet" href="style.css" type="text/css">
1505 </head>
1506 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
1507-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
1508+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
1509 <td width="100%" align="left" class="shortcuts">
1510-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
1511- <a href="#gdk-pixbuf-Animations.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
1512- <a href="#gdk-pixbuf-Animations.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties"> <span class="dim">|</span> 
1513+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
1514+ <a href="#gdk-pixbuf-Animations.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
1515+ <a href="#gdk-pixbuf-Animations.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
1516 <a href="#gdk-pixbuf-Animations.properties" class="shortcut">Properties</a></span>
1517 </td>
1518 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
1519@@ -1063,6 +1063,6 @@
1520 </div>
1521 <div class="footer">
1522 <hr>
1523- Generated by GTK-Doc V1.20</div>
1524+ Generated by GTK-Doc V1.20.1</div>
1525 </body>
1526 </html>
1527\ No newline at end of file
1528
1529=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-File-Loading.html'
1530--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-File-Loading.html 2014-04-23 15:46:48 +0000
1531+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-File-Loading.html 2014-08-24 22:11:39 +0000
1532@@ -8,15 +8,14 @@
1533 <link rel="up" href="rn01.html" title="API Reference">
1534 <link rel="prev" href="gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html" title="Reference Counting and Memory Mangement">
1535 <link rel="next" href="gdk-pixbuf-File-saving.html" title="File saving">
1536-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
1537+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
1538 <link rel="stylesheet" href="style.css" type="text/css">
1539 </head>
1540 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
1541-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
1542+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
1543 <td width="100%" align="left" class="shortcuts">
1544-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
1545- <a href="#gdk-pixbuf-File-Loading.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
1546- <a href="#gdk-pixbuf-File-Loading.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
1547+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
1548+ <a href="#gdk-pixbuf-File-Loading.description" class="shortcut">Description</a></span>
1549 </td>
1550 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
1551 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
1552@@ -132,11 +131,6 @@
1553 </table></div>
1554 </div>
1555 <div class="refsect1">
1556-<a name="gdk-pixbuf-File-Loading.object-hierarchy"></a><h2>Object Hierarchy</h2>
1557-<pre class="screen">
1558-</pre>
1559-</div>
1560-<div class="refsect1">
1561 <a name="gdk-pixbuf-File-Loading.includes"></a><h2>Includes</h2>
1562 <pre class="synopsis">#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;
1563 </pre>
1564@@ -165,7 +159,7 @@
1565 will be set.
1566 Possible errors are in the <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GDK-PIXBUF-ERROR:CAPS" title="GDK_PIXBUF_ERROR"><span class="type">GDK_PIXBUF_ERROR</span></a> and <a href="http://library.gnome.org/devel/glib/unstable/glib-File-Utilities.html#G-FILE-ERROR:CAPS"><span class="type">G_FILE_ERROR</span></a> domains.</p>
1567 <div class="refsect3">
1568-<a name="id-1.2.6.7.2.5"></a><h4>Parameters</h4>
1569+<a name="id-1.2.6.6.2.5"></a><h4>Parameters</h4>
1570 <div class="informaltable"><table width="100%" border="0">
1571 <colgroup>
1572 <col width="150px" class="parameters_name">
1573@@ -187,7 +181,7 @@
1574 </table></div>
1575 </div>
1576 <div class="refsect3">
1577-<a name="id-1.2.6.7.2.6"></a><h4>Returns</h4>
1578+<a name="id-1.2.6.6.2.6"></a><h4>Returns</h4>
1579 <p> A newly-created pixbuf with a reference count of 1, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if
1580 any of several error conditions occurred: the file could not be opened,
1581 there was no loader for the file's format, there was not enough memory to
1582@@ -216,7 +210,7 @@
1583 and image at the requested size, regardless of aspect ratio, use
1584 <a class="link" href="gdk-pixbuf-File-Loading.html#gdk-pixbuf-new-from-file-at-scale" title="gdk_pixbuf_new_from_file_at_scale ()"><code class="function">gdk_pixbuf_new_from_file_at_scale()</code></a>.</p>
1585 <div class="refsect3">
1586-<a name="id-1.2.6.7.3.6"></a><h4>Parameters</h4>
1587+<a name="id-1.2.6.6.3.6"></a><h4>Parameters</h4>
1588 <div class="informaltable"><table width="100%" border="0">
1589 <colgroup>
1590 <col width="150px" class="parameters_name">
1591@@ -248,7 +242,7 @@
1592 </table></div>
1593 </div>
1594 <div class="refsect3">
1595-<a name="id-1.2.6.7.3.7"></a><h4>Returns</h4>
1596+<a name="id-1.2.6.6.3.7"></a><h4>Returns</h4>
1597 <p> A newly-created pixbuf with a reference count of 1, or
1598 <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if any of several error conditions occurred: the file could not
1599 be opened, there was no loader for the file's format, there was not
1600@@ -286,7 +280,7 @@
1601 are
1602 allowed since 2.8.</p>
1603 <div class="refsect3">
1604-<a name="id-1.2.6.7.4.6"></a><h4>Parameters</h4>
1605+<a name="id-1.2.6.6.4.6"></a><h4>Parameters</h4>
1606 <div class="informaltable"><table width="100%" border="0">
1607 <colgroup>
1608 <col width="150px" class="parameters_name">
1609@@ -323,7 +317,7 @@
1610 </table></div>
1611 </div>
1612 <div class="refsect3">
1613-<a name="id-1.2.6.7.4.7"></a><h4>Returns</h4>
1614+<a name="id-1.2.6.6.4.7"></a><h4>Returns</h4>
1615 <p> A newly-created pixbuf with a reference count of 1, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
1616 if any of several error conditions occurred: the file could not be opened,
1617 there was no loader for the file's format, there was not enough memory to
1618@@ -341,7 +335,7 @@
1619 <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> *height</code></em>);</pre>
1620 <p>Parses an image file far enough to determine its format and size.</p>
1621 <div class="refsect3">
1622-<a name="id-1.2.6.7.5.5"></a><h4>Parameters</h4>
1623+<a name="id-1.2.6.6.5.5"></a><h4>Parameters</h4>
1624 <div class="informaltable"><table width="100%" border="0">
1625 <colgroup>
1626 <col width="150px" class="parameters_name">
1627@@ -356,24 +350,26 @@
1628 </tr>
1629 <tr>
1630 <td class="parameter_name"><p>width</p></td>
1631-<td class="parameter_description"><p> Return location for the width of the image, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
1632-<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
1633+<td class="parameter_description"><p> Return location for the width of the
1634+image, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
1635+<td class="parameter_annotations"><span class="annotation">[optional][<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
1636 </tr>
1637 <tr>
1638 <td class="parameter_name"><p>height</p></td>
1639-<td class="parameter_description"><p> Return location for the height of the image, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
1640-<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
1641+<td class="parameter_description"><p> Return location for the height of the
1642+image, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
1643+<td class="parameter_annotations"><span class="annotation">[optional][<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
1644 </tr>
1645 </tbody>
1646 </table></div>
1647 </div>
1648 <div class="refsect3">
1649-<a name="id-1.2.6.7.5.6"></a><h4>Returns</h4>
1650-<p> A <a class="link" href="gdk-pixbuf-Module-Interface.html#GdkPixbufFormat" title="struct GdkPixbufFormat"><span class="type">GdkPixbufFormat</span></a> describing the image
1651-format of the file or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the image format wasn't
1652-recognized. The return value is owned by GdkPixbuf and should
1653+<a name="id-1.2.6.6.5.6"></a><h4>Returns</h4>
1654+<p> A <a class="link" href="gdk-pixbuf-Module-Interface.html#GdkPixbufFormat" title="struct GdkPixbufFormat"><span class="type">GdkPixbufFormat</span></a> describing
1655+the image format of the file or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the image format wasn't
1656+recognized. The return value is owned by <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> and should
1657 not be freed. </p>
1658-<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
1659+<p><span class="annotation">[nullable][<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
1660 </div>
1661 <p class="since">Since 2.4</p>
1662 </div>
1663@@ -388,7 +384,7 @@
1664 <em class="parameter"><code>error</code></em>
1665 will be set.</p>
1666 <div class="refsect3">
1667-<a name="id-1.2.6.7.6.6"></a><h4>Parameters</h4>
1668+<a name="id-1.2.6.6.6.6"></a><h4>Parameters</h4>
1669 <div class="informaltable"><table width="100%" border="0">
1670 <colgroup>
1671 <col width="150px" class="parameters_name">
1672@@ -410,7 +406,7 @@
1673 </table></div>
1674 </div>
1675 <div class="refsect3">
1676-<a name="id-1.2.6.7.6.7"></a><h4>Returns</h4>
1677+<a name="id-1.2.6.6.6.7"></a><h4>Returns</h4>
1678 <p> A newly-created pixbuf, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if any of several error
1679 conditions occurred: the file could not be opened, the image format is
1680 not supported, there was not enough memory to allocate the image buffer,
1681@@ -444,7 +440,7 @@
1682 of -1 means to not scale the image at all in that dimension.</p>
1683 <p>The stream is not closed.</p>
1684 <div class="refsect3">
1685-<a name="id-1.2.6.7.7.8"></a><h4>Parameters</h4>
1686+<a name="id-1.2.6.6.7.8"></a><h4>Parameters</h4>
1687 <div class="informaltable"><table width="100%" border="0">
1688 <colgroup>
1689 <col width="150px" class="parameters_name">
1690@@ -481,7 +477,7 @@
1691 </table></div>
1692 </div>
1693 <div class="refsect3">
1694-<a name="id-1.2.6.7.7.9"></a><h4>Returns</h4>
1695+<a name="id-1.2.6.6.7.9"></a><h4>Returns</h4>
1696 <p> A newly-created pixbuf, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if any of several error
1697 conditions occurred: the file could not be opened, the image format is
1698 not supported, there was not enough memory to allocate the image buffer,
1699@@ -507,7 +503,7 @@
1700 the <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GDK-PIXBUF-ERROR:CAPS" title="GDK_PIXBUF_ERROR"><span class="type">GDK_PIXBUF_ERROR</span></a> and <a href="http://library.gnome.org/devel/gio/unstable/gio-GIOError.html#G-IO-ERROR:CAPS"><code class="literal">G_IO_ERROR</code></a> domains. </p>
1701 <p>The stream is not closed.</p>
1702 <div class="refsect3">
1703-<a name="id-1.2.6.7.8.7"></a><h4>Parameters</h4>
1704+<a name="id-1.2.6.6.8.7"></a><h4>Parameters</h4>
1705 <div class="informaltable"><table width="100%" border="0">
1706 <colgroup>
1707 <col width="150px" class="parameters_name">
1708@@ -534,7 +530,7 @@
1709 </table></div>
1710 </div>
1711 <div class="refsect3">
1712-<a name="id-1.2.6.7.8.8"></a><h4>Returns</h4>
1713+<a name="id-1.2.6.6.8.8"></a><h4>Returns</h4>
1714 <p> A newly-created pixbuf, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if any of several error
1715 conditions occurred: the file could not be opened, the image format is
1716 not supported, there was not enough memory to allocate the image buffer,
1717@@ -558,7 +554,7 @@
1718 will be called in the main thread.
1719 You can then call <a class="link" href="gdk-pixbuf-File-Loading.html#gdk-pixbuf-new-from-stream-finish" title="gdk_pixbuf_new_from_stream_finish ()"><code class="function">gdk_pixbuf_new_from_stream_finish()</code></a> to get the result of the operation.</p>
1720 <div class="refsect3">
1721-<a name="id-1.2.6.7.9.7"></a><h4>Parameters</h4>
1722+<a name="id-1.2.6.6.9.7"></a><h4>Parameters</h4>
1723 <div class="informaltable"><table width="100%" border="0">
1724 <colgroup>
1725 <col width="150px" class="parameters_name">
1726@@ -600,7 +596,7 @@
1727 <p>Finishes an asynchronous pixbuf creation operation started with
1728 <a class="link" href="gdk-pixbuf-File-Loading.html#gdk-pixbuf-new-from-stream-async" title="gdk_pixbuf_new_from_stream_async ()"><code class="function">gdk_pixbuf_new_from_stream_async()</code></a>.</p>
1729 <div class="refsect3">
1730-<a name="id-1.2.6.7.10.5"></a><h4>Parameters</h4>
1731+<a name="id-1.2.6.6.10.5"></a><h4>Parameters</h4>
1732 <div class="informaltable"><table width="100%" border="0">
1733 <colgroup>
1734 <col width="150px" class="parameters_name">
1735@@ -622,7 +618,7 @@
1736 </table></div>
1737 </div>
1738 <div class="refsect3">
1739-<a name="id-1.2.6.7.10.6"></a><h4>Returns</h4>
1740+<a name="id-1.2.6.6.10.6"></a><h4>Returns</h4>
1741 <p> a <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error. Free the returned
1742 object with <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref"><code class="function">g_object_unref()</code></a>.</p>
1743 <p></p>
1744@@ -648,18 +644,23 @@
1745 <code class="literal">G_IO_ERROR_CANCELLED</code> will be returned. Other possible errors are in
1746 the <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GDK-PIXBUF-ERROR:CAPS" title="GDK_PIXBUF_ERROR"><span class="type">GDK_PIXBUF_ERROR</span></a> and <a href="http://library.gnome.org/devel/gio/unstable/gio-GIOError.html#G-IO-ERROR:CAPS"><code class="literal">G_IO_ERROR</code></a> domains. </p>
1747 <p>The image will be scaled to fit in the requested size, optionally
1748-preserving the image's aspect ratio. When preserving the aspect ratio,
1749-a <em class="parameter"><code>width</code></em>
1750- of -1 will cause the image to be scaled to the exact given
1751-height, and a <em class="parameter"><code>height</code></em>
1752- of -1 will cause the image to be scaled to the
1753-exact given width. When not preserving aspect ratio, a <em class="parameter"><code>width</code></em>
1754- or
1755-<em class="parameter"><code>height</code></em>
1756- of -1 means to not scale the image at all in that dimension.</p>
1757+preserving the image's aspect ratio.</p>
1758+<p>When preserving the aspect ratio, a <em class="parameter"><code>width</code></em>
1759+ of -1 will cause the image to be
1760+scaled to the exact given height, and a <em class="parameter"><code>height</code></em>
1761+ of -1 will cause the image
1762+to be scaled to the exact given width. If both <em class="parameter"><code>width</code></em>
1763+ and <em class="parameter"><code>height</code></em>
1764+ are
1765+given, this function will behave as if the smaller of the two values
1766+is passed as -1.</p>
1767+<p>When not preserving aspect ratio, a <em class="parameter"><code>width</code></em>
1768+ or <em class="parameter"><code>height</code></em>
1769+ of -1 means to not
1770+scale the image at all in that dimension.</p>
1771 <p>The stream is not closed.</p>
1772 <div class="refsect3">
1773-<a name="id-1.2.6.7.11.8"></a><h4>Parameters</h4>
1774+<a name="id-1.2.6.6.11.10"></a><h4>Parameters</h4>
1775 <div class="informaltable"><table width="100%" border="0">
1776 <colgroup>
1777 <col width="150px" class="parameters_name">
1778@@ -701,7 +702,7 @@
1779 </table></div>
1780 </div>
1781 <div class="refsect3">
1782-<a name="id-1.2.6.7.11.9"></a><h4>Returns</h4>
1783+<a name="id-1.2.6.6.11.11"></a><h4>Returns</h4>
1784 <p> A newly-created pixbuf, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if any of several error
1785 conditions occurred: the file could not be opened, the image format is
1786 not supported, there was not enough memory to allocate the image buffer,
1787@@ -729,7 +730,7 @@
1788 will be called in the main thread.
1789 You can then call <a class="link" href="gdk-pixbuf-File-Loading.html#gdk-pixbuf-new-from-stream-finish" title="gdk_pixbuf_new_from_stream_finish ()"><code class="function">gdk_pixbuf_new_from_stream_finish()</code></a> to get the result of the operation.</p>
1790 <div class="refsect3">
1791-<a name="id-1.2.6.7.12.7"></a><h4>Parameters</h4>
1792+<a name="id-1.2.6.6.12.7"></a><h4>Parameters</h4>
1793 <div class="informaltable"><table width="100%" border="0">
1794 <colgroup>
1795 <col width="150px" class="parameters_name">
1796@@ -788,6 +789,6 @@
1797 </div>
1798 <div class="footer">
1799 <hr>
1800- Generated by GTK-Doc V1.20</div>
1801+ Generated by GTK-Doc V1.20.1</div>
1802 </body>
1803 </html>
1804\ No newline at end of file
1805
1806=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-File-saving.html'
1807--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-File-saving.html 2014-04-23 15:46:48 +0000
1808+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-File-saving.html 2014-08-24 22:11:39 +0000
1809@@ -8,15 +8,14 @@
1810 <link rel="up" href="rn01.html" title="API Reference">
1811 <link rel="prev" href="gdk-pixbuf-File-Loading.html" title="File Loading">
1812 <link rel="next" href="gdk-pixbuf-Image-Data-in-Memory.html" title="Image Data in Memory">
1813-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
1814+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
1815 <link rel="stylesheet" href="style.css" type="text/css">
1816 </head>
1817 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
1818-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
1819+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
1820 <td width="100%" align="left" class="shortcuts">
1821-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
1822- <a href="#gdk-pixbuf-File-saving.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
1823- <a href="#gdk-pixbuf-File-saving.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
1824+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
1825+ <a href="#gdk-pixbuf-File-saving.description" class="shortcut">Description</a></span>
1826 </td>
1827 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
1828 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
1829@@ -124,11 +123,6 @@
1830 </table></div>
1831 </div>
1832 <div class="refsect1">
1833-<a name="gdk-pixbuf-File-saving.object-hierarchy"></a><h2>Object Hierarchy</h2>
1834-<pre class="screen">
1835-</pre>
1836-</div>
1837-<div class="refsect1">
1838 <a name="gdk-pixbuf-File-saving.includes"></a><h2>Includes</h2>
1839 <pre class="synopsis">#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;
1840 </pre>
1841@@ -158,7 +152,7 @@
1842 is set, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> will be returned.
1843 See <a class="link" href="gdk-pixbuf-File-saving.html#gdk-pixbuf-save" title="gdk_pixbuf_save ()"><code class="function">gdk_pixbuf_save()</code></a> for more details.</p>
1844 <div class="refsect3">
1845-<a name="id-1.2.7.7.2.5"></a><h4>Parameters</h4>
1846+<a name="id-1.2.7.6.2.5"></a><h4>Parameters</h4>
1847 <div class="informaltable"><table width="100%" border="0">
1848 <colgroup>
1849 <col width="150px" class="parameters_name">
1850@@ -200,7 +194,7 @@
1851 </table></div>
1852 </div>
1853 <div class="refsect3">
1854-<a name="id-1.2.7.7.2.6"></a><h4>Returns</h4>
1855+<a name="id-1.2.7.6.2.6"></a><h4>Returns</h4>
1856 <p> whether an error was set</p>
1857 <p></p>
1858 </div>
1859@@ -306,7 +300,7 @@
1860 parameter. When the ICO saver is given "x_hot" and "y_hot" parameters,
1861 it produces a CUR instead of an ICO.</p>
1862 <div class="refsect3">
1863-<a name="id-1.2.7.7.3.18"></a><h4>Parameters</h4>
1864+<a name="id-1.2.7.6.3.18"></a><h4>Parameters</h4>
1865 <div class="informaltable"><table width="100%" border="0">
1866 <colgroup>
1867 <col width="150px" class="parameters_name">
1868@@ -343,7 +337,7 @@
1869 </table></div>
1870 </div>
1871 <div class="refsect3">
1872-<a name="id-1.2.7.7.3.19"></a><h4>Returns</h4>
1873+<a name="id-1.2.7.6.3.19"></a><h4>Returns</h4>
1874 <p> whether an error was set</p>
1875 <p></p>
1876 </div>
1877@@ -364,7 +358,7 @@
1878 and return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>, in which case <a class="link" href="gdk-pixbuf-File-saving.html#gdk-pixbuf-save-to-callback" title="gdk_pixbuf_save_to_callback ()"><code class="function">gdk_pixbuf_save_to_callback()</code></a>
1879 will fail with the same error.</p>
1880 <div class="refsect3">
1881-<a name="id-1.2.7.7.4.5"></a><h4>Parameters</h4>
1882+<a name="id-1.2.7.6.4.5"></a><h4>Parameters</h4>
1883 <div class="informaltable"><table width="100%" border="0">
1884 <colgroup>
1885 <col width="150px" class="parameters_name">
1886@@ -397,7 +391,7 @@
1887 </table></div>
1888 </div>
1889 <div class="refsect3">
1890-<a name="id-1.2.7.7.4.6"></a><h4>Returns</h4>
1891+<a name="id-1.2.7.6.4.6"></a><h4>Returns</h4>
1892 <p> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if successful, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> (with <em class="parameter"><code>error</code></em>
1893 set) if failed.</p>
1894 <p></p>
1895@@ -424,7 +418,7 @@
1896 function generates.</p>
1897 <p>See <a class="link" href="gdk-pixbuf-File-saving.html#gdk-pixbuf-save" title="gdk_pixbuf_save ()"><code class="function">gdk_pixbuf_save()</code></a> for more details.</p>
1898 <div class="refsect3">
1899-<a name="id-1.2.7.7.5.6"></a><h4>Parameters</h4>
1900+<a name="id-1.2.7.6.5.6"></a><h4>Parameters</h4>
1901 <div class="informaltable"><table width="100%" border="0">
1902 <colgroup>
1903 <col width="150px" class="parameters_name">
1904@@ -467,7 +461,7 @@
1905 </table></div>
1906 </div>
1907 <div class="refsect3">
1908-<a name="id-1.2.7.7.5.7"></a><h4>Returns</h4>
1909+<a name="id-1.2.7.6.5.7"></a><h4>Returns</h4>
1910 <p> whether an error was set</p>
1911 <p></p>
1912 </div>
1913@@ -490,7 +484,7 @@
1914 is set, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> will be returned. See
1915 <a class="link" href="gdk-pixbuf-File-saving.html#gdk-pixbuf-save-to-callback" title="gdk_pixbuf_save_to_callback ()"><code class="function">gdk_pixbuf_save_to_callback()</code></a> for more details.</p>
1916 <div class="refsect3">
1917-<a name="id-1.2.7.7.6.5"></a><h4>Parameters</h4>
1918+<a name="id-1.2.7.6.6.5"></a><h4>Parameters</h4>
1919 <div class="informaltable"><table width="100%" border="0">
1920 <colgroup>
1921 <col width="150px" class="parameters_name">
1922@@ -538,7 +532,7 @@
1923 </table></div>
1924 </div>
1925 <div class="refsect3">
1926-<a name="id-1.2.7.7.6.6"></a><h4>Returns</h4>
1927+<a name="id-1.2.7.6.6.6"></a><h4>Returns</h4>
1928 <p> whether an error was set</p>
1929 <p></p>
1930 </div>
1931@@ -566,7 +560,7 @@
1932 domain.</p>
1933 <p>See <a class="link" href="gdk-pixbuf-File-saving.html#gdk-pixbuf-save" title="gdk_pixbuf_save ()"><code class="function">gdk_pixbuf_save()</code></a> for more details.</p>
1934 <div class="refsect3">
1935-<a name="id-1.2.7.7.7.6"></a><h4>Parameters</h4>
1936+<a name="id-1.2.7.6.7.6"></a><h4>Parameters</h4>
1937 <div class="informaltable"><table width="100%" border="0">
1938 <colgroup>
1939 <col width="150px" class="parameters_name">
1940@@ -609,7 +603,7 @@
1941 </table></div>
1942 </div>
1943 <div class="refsect3">
1944-<a name="id-1.2.7.7.7.7"></a><h4>Returns</h4>
1945+<a name="id-1.2.7.6.7.7"></a><h4>Returns</h4>
1946 <p> whether an error was set</p>
1947 <p></p>
1948 </div>
1949@@ -631,7 +625,7 @@
1950 "tiff", "png", "ico" or "bmp". See <a class="link" href="gdk-pixbuf-File-saving.html#gdk-pixbuf-save-to-buffer" title="gdk_pixbuf_save_to_buffer ()"><code class="function">gdk_pixbuf_save_to_buffer()</code></a>
1951 for more details.</p>
1952 <div class="refsect3">
1953-<a name="id-1.2.7.7.8.5"></a><h4>Parameters</h4>
1954+<a name="id-1.2.7.6.8.5"></a><h4>Parameters</h4>
1955 <div class="informaltable"><table width="100%" border="0">
1956 <colgroup>
1957 <col width="150px" class="parameters_name">
1958@@ -678,7 +672,7 @@
1959 </table></div>
1960 </div>
1961 <div class="refsect3">
1962-<a name="id-1.2.7.7.8.6"></a><h4>Returns</h4>
1963+<a name="id-1.2.7.6.8.6"></a><h4>Returns</h4>
1964 <p> whether an error was set</p>
1965 <p></p>
1966 </div>
1967@@ -705,7 +699,7 @@
1968 and <a href="http://library.gnome.org/devel/gio/unstable/gio-GIOError.html#G-IO-ERROR:CAPS"><code class="literal">G_IO_ERROR</code></a> domains. </p>
1969 <p>The stream is not closed.</p>
1970 <div class="refsect3">
1971-<a name="id-1.2.7.7.9.8"></a><h4>Parameters</h4>
1972+<a name="id-1.2.7.6.9.8"></a><h4>Parameters</h4>
1973 <div class="informaltable"><table width="100%" border="0">
1974 <colgroup>
1975 <col width="150px" class="parameters_name">
1976@@ -747,7 +741,7 @@
1977 </table></div>
1978 </div>
1979 <div class="refsect3">
1980-<a name="id-1.2.7.7.9.9"></a><h4>Returns</h4>
1981+<a name="id-1.2.7.6.9.9"></a><h4>Returns</h4>
1982 <p> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the pixbuf was saved successfully, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if an
1983 error was set.</p>
1984 <p></p>
1985@@ -773,7 +767,7 @@
1986 will be called in the main thread.
1987 You can then call <a class="link" href="gdk-pixbuf-File-saving.html#gdk-pixbuf-save-to-stream-finish" title="gdk_pixbuf_save_to_stream_finish ()"><code class="function">gdk_pixbuf_save_to_stream_finish()</code></a> to get the result of the operation.</p>
1988 <div class="refsect3">
1989-<a name="id-1.2.7.7.10.7"></a><h4>Parameters</h4>
1990+<a name="id-1.2.7.6.10.7"></a><h4>Parameters</h4>
1991 <div class="informaltable"><table width="100%" border="0">
1992 <colgroup>
1993 <col width="150px" class="parameters_name">
1994@@ -830,7 +824,7 @@
1995 <p>Finishes an asynchronous pixbuf save operation started with
1996 <a class="link" href="gdk-pixbuf-File-saving.html#gdk-pixbuf-save-to-stream-async" title="gdk_pixbuf_save_to_stream_async ()"><code class="function">gdk_pixbuf_save_to_stream_async()</code></a>.</p>
1997 <div class="refsect3">
1998-<a name="id-1.2.7.7.11.5"></a><h4>Parameters</h4>
1999+<a name="id-1.2.7.6.11.5"></a><h4>Parameters</h4>
2000 <div class="informaltable"><table width="100%" border="0">
2001 <colgroup>
2002 <col width="150px" class="parameters_name">
2003@@ -852,7 +846,7 @@
2004 </table></div>
2005 </div>
2006 <div class="refsect3">
2007-<a name="id-1.2.7.7.11.6"></a><h4>Returns</h4>
2008+<a name="id-1.2.7.6.11.6"></a><h4>Returns</h4>
2009 <p> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the pixbuf was saved successfully, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if an error was set.</p>
2010 <p></p>
2011 </div>
2012@@ -865,6 +859,6 @@
2013 </div>
2014 <div class="footer">
2015 <hr>
2016- Generated by GTK-Doc V1.20</div>
2017+ Generated by GTK-Doc V1.20.1</div>
2018 </body>
2019 </html>
2020\ No newline at end of file
2021
2022=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-Image-Data-in-Memory.html'
2023--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-Image-Data-in-Memory.html 2014-04-23 15:46:48 +0000
2024+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-Image-Data-in-Memory.html 2014-08-24 22:11:39 +0000
2025@@ -8,15 +8,14 @@
2026 <link rel="up" href="rn01.html" title="API Reference">
2027 <link rel="prev" href="gdk-pixbuf-File-saving.html" title="File saving">
2028 <link rel="next" href="gdk-pixbuf-Inline-data.html" title="Inline data">
2029-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
2030+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
2031 <link rel="stylesheet" href="style.css" type="text/css">
2032 </head>
2033 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
2034-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
2035+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
2036 <td width="100%" align="left" class="shortcuts">
2037-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
2038- <a href="#gdk-pixbuf-Image-Data-in-Memory.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
2039- <a href="#gdk-pixbuf-Image-Data-in-Memory.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
2040+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
2041+ <a href="#gdk-pixbuf-Image-Data-in-Memory.description" class="shortcut">Description</a></span>
2042 </td>
2043 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
2044 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
2045@@ -92,11 +91,6 @@
2046 </table></div>
2047 </div>
2048 <div class="refsect1">
2049-<a name="gdk-pixbuf-Image-Data-in-Memory.object-hierarchy"></a><h2>Object Hierarchy</h2>
2050-<pre class="screen">
2051-</pre>
2052-</div>
2053-<div class="refsect1">
2054 <a name="gdk-pixbuf-Image-Data-in-Memory.includes"></a><h2>Includes</h2>
2055 <pre class="synopsis">#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;
2056 </pre>
2057@@ -139,7 +133,7 @@
2058 buffer has an optimal rowstride. Note that the buffer is not cleared;
2059 you will have to fill it completely yourself.</p>
2060 <div class="refsect3">
2061-<a name="id-1.2.8.7.2.5"></a><h4>Parameters</h4>
2062+<a name="id-1.2.8.6.2.5"></a><h4>Parameters</h4>
2063 <div class="informaltable"><table width="100%" border="0">
2064 <colgroup>
2065 <col width="150px" class="parameters_name">
2066@@ -176,7 +170,7 @@
2067 </table></div>
2068 </div>
2069 <div class="refsect3">
2070-<a name="id-1.2.8.7.2.6"></a><h4>Returns</h4>
2071+<a name="id-1.2.8.6.2.6"></a><h4>Returns</h4>
2072 <p> A newly-created <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> with a reference count of 1, or
2073 <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if not enough memory could be allocated for the image buffer.</p>
2074 <p></p>
2075@@ -198,7 +192,7 @@
2076 <p>Creates a new <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> out of in-memory image data. Currently only RGB
2077 images with 8 bits per sample are supported.</p>
2078 <div class="refsect3">
2079-<a name="id-1.2.8.7.3.5"></a><h4>Parameters</h4>
2080+<a name="id-1.2.8.6.3.5"></a><h4>Parameters</h4>
2081 <div class="informaltable"><table width="100%" border="0">
2082 <colgroup>
2083 <col width="150px" class="parameters_name">
2084@@ -256,7 +250,7 @@
2085 </table></div>
2086 </div>
2087 <div class="refsect3">
2088-<a name="id-1.2.8.7.3.6"></a><h4>Returns</h4>
2089+<a name="id-1.2.8.6.3.6"></a><h4>Returns</h4>
2090 <p> A newly-created <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> structure with a reference count of 1. </p>
2091 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
2092 </div>
2093@@ -269,7 +263,7 @@
2094 <p>Creates a new pixbuf by parsing XPM data in memory. This data is commonly
2095 the result of including an XPM file into a program's C source.</p>
2096 <div class="refsect3">
2097-<a name="id-1.2.8.7.4.5"></a><h4>Parameters</h4>
2098+<a name="id-1.2.8.6.4.5"></a><h4>Parameters</h4>
2099 <div class="informaltable"><table width="100%" border="0">
2100 <colgroup>
2101 <col width="150px" class="parameters_name">
2102@@ -284,7 +278,7 @@
2103 </table></div>
2104 </div>
2105 <div class="refsect3">
2106-<a name="id-1.2.8.7.4.6"></a><h4>Returns</h4>
2107+<a name="id-1.2.8.6.4.6"></a><h4>Returns</h4>
2108 <p> A newly-created pixbuf with a reference count of 1.</p>
2109 <p></p>
2110 </div>
2111@@ -343,7 +337,7 @@
2112 inline data located at runtime, you could have corrupt inline data in
2113 addition.</p>
2114 <div class="refsect3">
2115-<a name="id-1.2.8.7.5.13"></a><h4>Parameters</h4>
2116+<a name="id-1.2.8.6.5.13"></a><h4>Parameters</h4>
2117 <div class="informaltable"><table width="100%" border="0">
2118 <colgroup>
2119 <col width="150px" class="parameters_name">
2120@@ -380,7 +374,7 @@
2121 </table></div>
2122 </div>
2123 <div class="refsect3">
2124-<a name="id-1.2.8.7.5.14"></a><h4>Returns</h4>
2125+<a name="id-1.2.8.6.5.14"></a><h4>Returns</h4>
2126 <p> A newly-created <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> structure with a reference,
2127 count of 1, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if an error occurred.</p>
2128 <p></p>
2129@@ -405,7 +399,7 @@
2130 will not be finalized until the new pixbuf
2131 is finalized.</p>
2132 <div class="refsect3">
2133-<a name="id-1.2.8.7.6.5"></a><h4>Parameters</h4>
2134+<a name="id-1.2.8.6.6.5"></a><h4>Parameters</h4>
2135 <div class="informaltable"><table width="100%" border="0">
2136 <colgroup>
2137 <col width="150px" class="parameters_name">
2138@@ -446,7 +440,7 @@
2139 </table></div>
2140 </div>
2141 <div class="refsect3">
2142-<a name="id-1.2.8.7.6.6"></a><h4>Returns</h4>
2143+<a name="id-1.2.8.6.6.6"></a><h4>Returns</h4>
2144 <p> a new pixbuf. </p>
2145 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
2146 </div>
2147@@ -460,7 +454,7 @@
2148 <em class="parameter"><code>pixbuf</code></em>
2149 .</p>
2150 <div class="refsect3">
2151-<a name="id-1.2.8.7.7.5"></a><h4>Parameters</h4>
2152+<a name="id-1.2.8.6.7.5"></a><h4>Parameters</h4>
2153 <div class="informaltable"><table width="100%" border="0">
2154 <colgroup>
2155 <col width="150px" class="parameters_name">
2156@@ -475,7 +469,7 @@
2157 </table></div>
2158 </div>
2159 <div class="refsect3">
2160-<a name="id-1.2.8.7.7.6"></a><h4>Returns</h4>
2161+<a name="id-1.2.8.6.7.6"></a><h4>Returns</h4>
2162 <p> A newly-created pixbuf with a reference count of 1, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if
2163 not enough memory could be allocated. </p>
2164 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
2165@@ -492,6 +486,6 @@
2166 </div>
2167 <div class="footer">
2168 <hr>
2169- Generated by GTK-Doc V1.20</div>
2170+ Generated by GTK-Doc V1.20.1</div>
2171 </body>
2172 </html>
2173\ No newline at end of file
2174
2175=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-Inline-data.html'
2176--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-Inline-data.html 2014-04-23 15:46:48 +0000
2177+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-Inline-data.html 2014-08-24 22:11:39 +0000
2178@@ -8,15 +8,14 @@
2179 <link rel="up" href="rn01.html" title="API Reference">
2180 <link rel="prev" href="gdk-pixbuf-Image-Data-in-Memory.html" title="Image Data in Memory">
2181 <link rel="next" href="gdk-pixbuf-Scaling.html" title="Scaling">
2182-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
2183+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
2184 <link rel="stylesheet" href="style.css" type="text/css">
2185 </head>
2186 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
2187-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
2188+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
2189 <td width="100%" align="left" class="shortcuts">
2190-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
2191- <a href="#gdk-pixbuf-Inline-data.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
2192- <a href="#gdk-pixbuf-Inline-data.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
2193+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
2194+ <a href="#gdk-pixbuf-Inline-data.description" class="shortcut">Description</a></span>
2195 </td>
2196 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
2197 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
2198@@ -115,11 +114,6 @@
2199 </table></div>
2200 </div>
2201 <div class="refsect1">
2202-<a name="gdk-pixbuf-Inline-data.object-hierarchy"></a><h2>Object Hierarchy</h2>
2203-<pre class="screen">
2204-</pre>
2205-</div>
2206-<div class="refsect1">
2207 <a name="gdk-pixbuf-Inline-data.includes"></a><h2>Includes</h2>
2208 <pre class="synopsis">#include &lt;gdk-pixbuf/gdk-pixdata.h&gt;
2209 </pre>
2210@@ -153,7 +147,7 @@
2211 pixel data is run-length encoded into newly-allocated memory and a
2212 pointer to that memory is returned.</p>
2213 <div class="refsect3">
2214-<a name="id-1.2.9.8.3.5"></a><h4>Parameters</h4>
2215+<a name="id-1.2.9.7.3.5"></a><h4>Parameters</h4>
2216 <div class="informaltable"><table width="100%" border="0">
2217 <colgroup>
2218 <col width="150px" class="parameters_name">
2219@@ -181,11 +175,12 @@
2220 </table></div>
2221 </div>
2222 <div class="refsect3">
2223-<a name="id-1.2.9.8.3.6"></a><h4>Returns</h4>
2224-<p> If <em class="parameter"><code>ure_rle</code></em>
2225-is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>, a pointer to the newly-allocated memory
2226-for the run-length encoded pixel data, otherwise <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.</p>
2227-<p></p>
2228+<a name="id-1.2.9.7.3.6"></a><h4>Returns</h4>
2229+<p> If <em class="parameter"><code>use_rle</code></em>
2230+is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>, a pointer to the
2231+newly-allocated memory for the run-length encoded pixel data,
2232+otherwise <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p>
2233+<p><span class="annotation">[nullable]</span></p>
2234 </div>
2235 </div>
2236 <hr>
2237@@ -200,7 +195,7 @@
2238 if the pixel data is run-length-encoded, the pixel data is copied into
2239 newly-allocated memory; otherwise it is reused.</p>
2240 <div class="refsect3">
2241-<a name="id-1.2.9.8.4.5"></a><h4>Parameters</h4>
2242+<a name="id-1.2.9.7.4.5"></a><h4>Parameters</h4>
2243 <div class="informaltable"><table width="100%" border="0">
2244 <colgroup>
2245 <col width="150px" class="parameters_name">
2246@@ -228,7 +223,7 @@
2247 </table></div>
2248 </div>
2249 <div class="refsect3">
2250-<a name="id-1.2.9.8.4.6"></a><h4>Returns</h4>
2251+<a name="id-1.2.9.7.4.6"></a><h4>Returns</h4>
2252 <p> a new <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a>. </p>
2253 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
2254 </div>
2255@@ -245,7 +240,7 @@
2256
2257 bytes the structure points to.</p>
2258 <div class="refsect3">
2259-<a name="id-1.2.9.8.5.5"></a><h4>Parameters</h4>
2260+<a name="id-1.2.9.7.5.5"></a><h4>Parameters</h4>
2261 <div class="informaltable"><table width="100%" border="0">
2262 <colgroup>
2263 <col width="150px" class="parameters_name">
2264@@ -267,7 +262,7 @@
2265 </table></div>
2266 </div>
2267 <div class="refsect3">
2268-<a name="id-1.2.9.8.5.6"></a><h4>Returns</h4>
2269+<a name="id-1.2.9.7.5.6"></a><h4>Returns</h4>
2270 <p> A
2271 newly-allocated string containing the serialized <a class="link" href="gdk-pixbuf-Inline-data.html#GdkPixdata" title="struct GdkPixdata"><span class="type">GdkPixdata</span></a>
2272 structure. </p>
2273@@ -292,7 +287,7 @@
2274 for validity. This function may fail with <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GDK-PIXBUF-ERROR-CORRUPT-IMAGE:CAPS"><code class="literal">GDK_PIXBUF_ERROR_CORRUPT_IMAGE</code></a>
2275 or <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GDK-PIXBUF-ERROR-UNKNOWN-TYPE:CAPS"><code class="literal">GDK_PIXBUF_ERROR_UNKNOWN_TYPE</code></a>.</p>
2276 <div class="refsect3">
2277-<a name="id-1.2.9.8.6.5"></a><h4>Parameters</h4>
2278+<a name="id-1.2.9.7.6.5"></a><h4>Parameters</h4>
2279 <div class="informaltable"><table width="100%" border="0">
2280 <colgroup>
2281 <col width="150px" class="parameters_name">
2282@@ -325,7 +320,7 @@
2283 </table></div>
2284 </div>
2285 <div class="refsect3">
2286-<a name="id-1.2.9.8.6.6"></a><h4>Returns</h4>
2287+<a name="id-1.2.9.7.6.6"></a><h4>Returns</h4>
2288 <p> Upon successful deserialization <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> is returned,
2289 <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise.</p>
2290 <p></p>
2291@@ -344,7 +339,7 @@
2292 <a class="link" href="gdk-pixbuf-csource.html" title="gdk-pixbuf-csource">gdk-pixbuf-csource</a>, which offers a command
2293 line interface to this function.</p>
2294 <div class="refsect3">
2295-<a name="id-1.2.9.8.7.6"></a><h4>Parameters</h4>
2296+<a name="id-1.2.9.7.7.6"></a><h4>Parameters</h4>
2297 <div class="informaltable"><table width="100%" border="0">
2298 <colgroup>
2299 <col width="150px" class="parameters_name">
2300@@ -372,7 +367,7 @@
2301 </table></div>
2302 </div>
2303 <div class="refsect3">
2304-<a name="id-1.2.9.8.7.7"></a><h4>Returns</h4>
2305+<a name="id-1.2.9.7.7.7"></a><h4>Returns</h4>
2306 <p> a newly-allocated string containing the C source form
2307 of <em class="parameter"><code>pixdata</code></em>
2308 .</p>
2309@@ -399,7 +394,7 @@
2310 <p>A <a class="link" href="gdk-pixbuf-Inline-data.html#GdkPixdata" title="struct GdkPixdata"><span class="type">GdkPixdata</span></a> contains pixbuf information in a form suitable for
2311 serialization and streaming.</p>
2312 <div class="refsect3">
2313-<a name="id-1.2.9.9.2.5"></a><h4>Members</h4>
2314+<a name="id-1.2.9.8.2.5"></a><h4>Members</h4>
2315 <div class="informaltable"><table width="100%" border="0">
2316 <colgroup>
2317 <col width="300px" class="struct_members_name">
2318@@ -461,7 +456,7 @@
2319 one for the used colorspace, one for the width of the samples and one
2320 for the encoding of the pixel data.</p>
2321 <div class="refsect3">
2322-<a name="id-1.2.9.9.3.4"></a><h4>Members</h4>
2323+<a name="id-1.2.9.8.3.4"></a><h4>Members</h4>
2324 <div class="informaltable"><table width="100%" border="0">
2325 <colgroup>
2326 <col width="300px" class="enum_members_name">
2327@@ -549,7 +544,7 @@
2328 . The remaining
2329 elements are optional flags that can be freely added.</p>
2330 <div class="refsect3">
2331-<a name="id-1.2.9.9.4.4"></a><h4>Members</h4>
2332+<a name="id-1.2.9.8.4.4"></a><h4>Members</h4>
2333 <div class="informaltable"><table width="100%" border="0">
2334 <colgroup>
2335 <col width="300px" class="enum_members_name">
2336@@ -639,6 +634,6 @@
2337 </div>
2338 <div class="footer">
2339 <hr>
2340- Generated by GTK-Doc V1.20</div>
2341+ Generated by GTK-Doc V1.20.1</div>
2342 </body>
2343 </html>
2344\ No newline at end of file
2345
2346=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-Module-Interface.html'
2347--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-Module-Interface.html 2014-04-23 15:46:48 +0000
2348+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-Module-Interface.html 2014-08-24 22:11:39 +0000
2349@@ -8,15 +8,14 @@
2350 <link rel="up" href="rn01.html" title="API Reference">
2351 <link rel="prev" href="GdkPixbufLoader.html" title="GdkPixbufLoader">
2352 <link rel="next" href="gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html" title="gdk-pixbuf Xlib initialization">
2353-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
2354+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
2355 <link rel="stylesheet" href="style.css" type="text/css">
2356 </head>
2357 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
2358-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
2359+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
2360 <td width="100%" align="left" class="shortcuts">
2361-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
2362- <a href="#gdk-pixbuf-Module-Interface.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
2363- <a href="#gdk-pixbuf-Module-Interface.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
2364+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
2365+ <a href="#gdk-pixbuf-Module-Interface.description" class="shortcut">Description</a></span>
2366 </td>
2367 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
2368 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
2369@@ -223,11 +222,6 @@
2370 </table></div>
2371 </div>
2372 <div class="refsect1">
2373-<a name="gdk-pixbuf-Module-Interface.object-hierarchy"></a><h2>Object Hierarchy</h2>
2374-<pre class="screen">
2375-</pre>
2376-</div>
2377-<div class="refsect1">
2378 <a name="gdk-pixbuf-Module-Interface.includes"></a><h2>Includes</h2>
2379 <pre class="synopsis">#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;
2380 </pre>
2381@@ -257,10 +251,10 @@
2382 <p>Installing a module is a two-step process:</p>
2383 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
2384 <li class="listitem"><p>copy the module file(s) to the loader directory (normally
2385-<code class="literal">$libdir/gtk-2.0/$version/loaders</code>, unless overridden by the
2386+<code class="literal">$libdir/gdk-pixbuf-2.0/$version/loaders</code>, unless overridden by the
2387 environment variable <code class="literal">GDK_PIXBUF_MODULEDIR</code>) </p></li>
2388 <li class="listitem"><p>call gdk-pixbuf-query-loaders to update the module file (normally
2389-<code class="literal">$sysconfdir/gtk-2.0/gdk-pixbuf.loaders</code>, unless overridden by the
2390+<code class="literal">$libdir/gdk-pixbuf-2.0/$version/loaders.cache</code>, unless overridden by the
2391 environment variable <code class="literal">GDK_PIXBUF_MODULE_FILE</code>)</p></li>
2392 </ul></div>
2393 <p>The GdkPixBuf interfaces needed for implementing modules are contained in
2394@@ -283,7 +277,7 @@
2395 , the new value is
2396 ignored and <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is returned.</p>
2397 <div class="refsect3">
2398-<a name="id-1.2.16.8.2.5"></a><h4>Parameters</h4>
2399+<a name="id-1.2.16.7.2.5"></a><h4>Parameters</h4>
2400 <div class="informaltable"><table width="100%" border="0">
2401 <colgroup>
2402 <col width="150px" class="parameters_name">
2403@@ -310,7 +304,7 @@
2404 </table></div>
2405 </div>
2406 <div class="refsect3">
2407-<a name="id-1.2.16.8.2.6"></a><h4>Returns</h4>
2408+<a name="id-1.2.16.7.2.6"></a><h4>Returns</h4>
2409 <p> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success.</p>
2410 <p></p>
2411 </div>
2412@@ -324,7 +318,7 @@
2413 <p>Obtains the available information about the image formats supported
2414 by GdkPixbuf.</p>
2415 <div class="refsect3">
2416-<a name="id-1.2.16.8.3.5"></a><h4>Returns</h4>
2417+<a name="id-1.2.16.7.3.5"></a><h4>Returns</h4>
2418 <p> A list of
2419 <a href="gdk-pixbuf-Module-Interface.html#GdkPixbufFormat"><span class="type">GdkPixbufFormats</span></a> describing the supported image formats. The list should
2420 be freed when it is no longer needed, but the structures themselves are
2421@@ -341,7 +335,7 @@
2422 <p>Creates a copy of <em class="parameter"><code>format</code></em>
2423 </p>
2424 <div class="refsect3">
2425-<a name="id-1.2.16.8.4.5"></a><h4>Parameters</h4>
2426+<a name="id-1.2.16.7.4.5"></a><h4>Parameters</h4>
2427 <div class="informaltable"><table width="100%" border="0">
2428 <colgroup>
2429 <col width="150px" class="parameters_name">
2430@@ -356,7 +350,7 @@
2431 </table></div>
2432 </div>
2433 <div class="refsect3">
2434-<a name="id-1.2.16.8.4.6"></a><h4>Returns</h4>
2435+<a name="id-1.2.16.7.4.6"></a><h4>Returns</h4>
2436 <p> the newly allocated copy of a <a class="link" href="gdk-pixbuf-Module-Interface.html#GdkPixbufFormat" title="struct GdkPixbufFormat"><span class="type">GdkPixbufFormat</span></a>. Use
2437 <a class="link" href="gdk-pixbuf-Module-Interface.html#gdk-pixbuf-format-free" title="gdk_pixbuf_format_free ()"><code class="function">gdk_pixbuf_format_free()</code></a> to free the resources when done</p>
2438 <p></p>
2439@@ -371,7 +365,7 @@
2440 <p>Frees the resources allocated when copying a <a class="link" href="gdk-pixbuf-Module-Interface.html#GdkPixbufFormat" title="struct GdkPixbufFormat"><span class="type">GdkPixbufFormat</span></a>
2441 using <a class="link" href="gdk-pixbuf-Module-Interface.html#gdk-pixbuf-format-copy" title="gdk_pixbuf_format_copy ()"><code class="function">gdk_pixbuf_format_copy()</code></a></p>
2442 <div class="refsect3">
2443-<a name="id-1.2.16.8.5.5"></a><h4>Parameters</h4>
2444+<a name="id-1.2.16.7.5.5"></a><h4>Parameters</h4>
2445 <div class="informaltable"><table width="100%" border="0">
2446 <colgroup>
2447 <col width="150px" class="parameters_name">
2448@@ -394,7 +388,7 @@
2449 gdk_pixbuf_format_get_name (<em class="parameter"><code><a class="link" href="gdk-pixbuf-Module-Interface.html#GdkPixbufFormat" title="struct GdkPixbufFormat"><span class="type">GdkPixbufFormat</span></a> *format</code></em>);</pre>
2450 <p>Returns the name of the format.</p>
2451 <div class="refsect3">
2452-<a name="id-1.2.16.8.6.5"></a><h4>Parameters</h4>
2453+<a name="id-1.2.16.7.6.5"></a><h4>Parameters</h4>
2454 <div class="informaltable"><table width="100%" border="0">
2455 <colgroup>
2456 <col width="150px" class="parameters_name">
2457@@ -409,7 +403,7 @@
2458 </table></div>
2459 </div>
2460 <div class="refsect3">
2461-<a name="id-1.2.16.8.6.6"></a><h4>Returns</h4>
2462+<a name="id-1.2.16.7.6.6"></a><h4>Returns</h4>
2463 <p> the name of the format. </p>
2464 <p></p>
2465 </div>
2466@@ -422,7 +416,7 @@
2467 gdk_pixbuf_format_get_description (<em class="parameter"><code><a class="link" href="gdk-pixbuf-Module-Interface.html#GdkPixbufFormat" title="struct GdkPixbufFormat"><span class="type">GdkPixbufFormat</span></a> *format</code></em>);</pre>
2468 <p>Returns a description of the format.</p>
2469 <div class="refsect3">
2470-<a name="id-1.2.16.8.7.5"></a><h4>Parameters</h4>
2471+<a name="id-1.2.16.7.7.5"></a><h4>Parameters</h4>
2472 <div class="informaltable"><table width="100%" border="0">
2473 <colgroup>
2474 <col width="150px" class="parameters_name">
2475@@ -437,7 +431,7 @@
2476 </table></div>
2477 </div>
2478 <div class="refsect3">
2479-<a name="id-1.2.16.8.7.6"></a><h4>Returns</h4>
2480+<a name="id-1.2.16.7.7.6"></a><h4>Returns</h4>
2481 <p> a description of the format.</p>
2482 <p></p>
2483 </div>
2484@@ -450,7 +444,7 @@
2485 gdk_pixbuf_format_get_mime_types (<em class="parameter"><code><a class="link" href="gdk-pixbuf-Module-Interface.html#GdkPixbufFormat" title="struct GdkPixbufFormat"><span class="type">GdkPixbufFormat</span></a> *format</code></em>);</pre>
2486 <p>Returns the mime types supported by the format.</p>
2487 <div class="refsect3">
2488-<a name="id-1.2.16.8.8.5"></a><h4>Parameters</h4>
2489+<a name="id-1.2.16.7.8.5"></a><h4>Parameters</h4>
2490 <div class="informaltable"><table width="100%" border="0">
2491 <colgroup>
2492 <col width="150px" class="parameters_name">
2493@@ -465,7 +459,7 @@
2494 </table></div>
2495 </div>
2496 <div class="refsect3">
2497-<a name="id-1.2.16.8.8.6"></a><h4>Returns</h4>
2498+<a name="id-1.2.16.7.8.6"></a><h4>Returns</h4>
2499 <p> a <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array of mime types which must be freed with
2500 <a href="http://library.gnome.org/devel/glib/unstable/glib-String-Utility-Functions.html#g-strfreev"><code class="function">g_strfreev()</code></a> when it is no longer needed. </p>
2501 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
2502@@ -480,7 +474,7 @@
2503 <p>Returns the filename extensions typically used for files in the
2504 given format.</p>
2505 <div class="refsect3">
2506-<a name="id-1.2.16.8.9.5"></a><h4>Parameters</h4>
2507+<a name="id-1.2.16.7.9.5"></a><h4>Parameters</h4>
2508 <div class="informaltable"><table width="100%" border="0">
2509 <colgroup>
2510 <col width="150px" class="parameters_name">
2511@@ -495,7 +489,7 @@
2512 </table></div>
2513 </div>
2514 <div class="refsect3">
2515-<a name="id-1.2.16.8.9.6"></a><h4>Returns</h4>
2516+<a name="id-1.2.16.7.9.6"></a><h4>Returns</h4>
2517 <p> a <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array of filename extensions which must be
2518 freed with <a href="http://library.gnome.org/devel/glib/unstable/glib-String-Utility-Functions.html#g-strfreev"><code class="function">g_strfreev()</code></a> when it is no longer needed. </p>
2519 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
2520@@ -509,7 +503,7 @@
2521 gdk_pixbuf_format_is_writable (<em class="parameter"><code><a class="link" href="gdk-pixbuf-Module-Interface.html#GdkPixbufFormat" title="struct GdkPixbufFormat"><span class="type">GdkPixbufFormat</span></a> *format</code></em>);</pre>
2522 <p>Returns whether pixbufs can be saved in the given format.</p>
2523 <div class="refsect3">
2524-<a name="id-1.2.16.8.10.5"></a><h4>Parameters</h4>
2525+<a name="id-1.2.16.7.10.5"></a><h4>Parameters</h4>
2526 <div class="informaltable"><table width="100%" border="0">
2527 <colgroup>
2528 <col width="150px" class="parameters_name">
2529@@ -524,7 +518,7 @@
2530 </table></div>
2531 </div>
2532 <div class="refsect3">
2533-<a name="id-1.2.16.8.10.6"></a><h4>Returns</h4>
2534+<a name="id-1.2.16.7.10.6"></a><h4>Returns</h4>
2535 <p> whether pixbufs can be saved in the given format.</p>
2536 <p></p>
2537 </div>
2538@@ -540,7 +534,7 @@
2539 rather than loading it at the default size and scaling the
2540 resulting pixbuf to the desired size.</p>
2541 <div class="refsect3">
2542-<a name="id-1.2.16.8.11.5"></a><h4>Parameters</h4>
2543+<a name="id-1.2.16.7.11.5"></a><h4>Parameters</h4>
2544 <div class="informaltable"><table width="100%" border="0">
2545 <colgroup>
2546 <col width="150px" class="parameters_name">
2547@@ -555,7 +549,7 @@
2548 </table></div>
2549 </div>
2550 <div class="refsect3">
2551-<a name="id-1.2.16.8.11.6"></a><h4>Returns</h4>
2552+<a name="id-1.2.16.7.11.6"></a><h4>Returns</h4>
2553 <p> whether this image format is scalable.</p>
2554 <p></p>
2555 </div>
2556@@ -569,7 +563,7 @@
2557 <p>Returns whether this image format is disabled. See
2558 <a class="link" href="gdk-pixbuf-Module-Interface.html#gdk-pixbuf-format-set-disabled" title="gdk_pixbuf_format_set_disabled ()"><code class="function">gdk_pixbuf_format_set_disabled()</code></a>.</p>
2559 <div class="refsect3">
2560-<a name="id-1.2.16.8.12.5"></a><h4>Parameters</h4>
2561+<a name="id-1.2.16.7.12.5"></a><h4>Parameters</h4>
2562 <div class="informaltable"><table width="100%" border="0">
2563 <colgroup>
2564 <col width="150px" class="parameters_name">
2565@@ -584,7 +578,7 @@
2566 </table></div>
2567 </div>
2568 <div class="refsect3">
2569-<a name="id-1.2.16.8.12.6"></a><h4>Returns</h4>
2570+<a name="id-1.2.16.7.12.6"></a><h4>Returns</h4>
2571 <p> whether this image format is disabled.</p>
2572 <p></p>
2573 </div>
2574@@ -601,7 +595,7 @@
2575 images. Applications can use this to avoid using image loaders
2576 with an inappropriate license, see <a class="link" href="gdk-pixbuf-Module-Interface.html#gdk-pixbuf-format-get-license" title="gdk_pixbuf_format_get_license ()"><code class="function">gdk_pixbuf_format_get_license()</code></a>.</p>
2577 <div class="refsect3">
2578-<a name="id-1.2.16.8.13.5"></a><h4>Parameters</h4>
2579+<a name="id-1.2.16.7.13.5"></a><h4>Parameters</h4>
2580 <div class="informaltable"><table width="100%" border="0">
2581 <colgroup>
2582 <col width="150px" class="parameters_name">
2583@@ -635,7 +629,7 @@
2584 "GPL", "QPL", "GPL/QPL", or "other" to indicate some other license. This
2585 string should be freed with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a> when it's no longer needed.</p>
2586 <div class="refsect3">
2587-<a name="id-1.2.16.8.14.5"></a><h4>Parameters</h4>
2588+<a name="id-1.2.16.7.14.5"></a><h4>Parameters</h4>
2589 <div class="informaltable"><table width="100%" border="0">
2590 <colgroup>
2591 <col width="150px" class="parameters_name">
2592@@ -650,7 +644,7 @@
2593 </table></div>
2594 </div>
2595 <div class="refsect3">
2596-<a name="id-1.2.16.8.14.6"></a><h4>Returns</h4>
2597+<a name="id-1.2.16.7.14.6"></a><h4>Returns</h4>
2598 <p> a string describing the license of <em class="parameter"><code>format</code></em>
2599 . </p>
2600 <p></p>
2601@@ -665,7 +659,7 @@
2602 <p>Defines the type of the function used to set the vtable of a
2603 <a class="link" href="gdk-pixbuf-Module-Interface.html#GdkPixbufModule" title="struct GdkPixbufModule"><span class="type">GdkPixbufModule</span></a> when it is loaded.</p>
2604 <div class="refsect3">
2605-<a name="id-1.2.16.8.15.5"></a><h4>Parameters</h4>
2606+<a name="id-1.2.16.7.15.5"></a><h4>Parameters</h4>
2607 <div class="informaltable"><table width="100%" border="0">
2608 <colgroup>
2609 <col width="150px" class="parameters_name">
2610@@ -689,7 +683,7 @@
2611 <p>Defines the type of the function used to fill a
2612 <a class="link" href="gdk-pixbuf-Module-Interface.html#GdkPixbufFormat" title="struct GdkPixbufFormat"><span class="type">GdkPixbufFormat</span></a> structure with information about a module.</p>
2613 <div class="refsect3">
2614-<a name="id-1.2.16.8.16.5"></a><h4>Parameters</h4>
2615+<a name="id-1.2.16.7.16.5"></a><h4>Parameters</h4>
2616 <div class="informaltable"><table width="100%" border="0">
2617 <colgroup>
2618 <col width="150px" class="parameters_name">
2619@@ -728,7 +722,7 @@
2620 resources. This convention is used to implement <a class="link" href="gdk-pixbuf-File-Loading.html#gdk-pixbuf-get-file-info" title="gdk_pixbuf_get_file_info ()"><code class="function">gdk_pixbuf_get_file_info()</code></a>
2621 efficiently.</p>
2622 <div class="refsect3">
2623-<a name="id-1.2.16.8.17.7"></a><h4>Parameters</h4>
2624+<a name="id-1.2.16.7.17.7"></a><h4>Parameters</h4>
2625 <div class="informaltable"><table width="100%" border="0">
2626 <colgroup>
2627 <col width="150px" class="parameters_name">
2628@@ -770,7 +764,7 @@
2629 "&lt;link linkend="GdkPixbufLoader-area-prepared"&gt;area_prepared&lt;/link&gt;"
2630 signal.</p>
2631 <div class="refsect3">
2632-<a name="id-1.2.16.8.18.6"></a><h4>Parameters</h4>
2633+<a name="id-1.2.16.7.18.6"></a><h4>Parameters</h4>
2634 <div class="informaltable"><table width="100%" border="0">
2635 <colgroup>
2636 <col width="150px" class="parameters_name">
2637@@ -815,7 +809,7 @@
2638 "&lt;link linkend="GdkPixbufLoader-area-updated"&gt;area_updated&lt;/link&gt;"
2639 signal.</p>
2640 <div class="refsect3">
2641-<a name="id-1.2.16.8.19.6"></a><h4>Parameters</h4>
2642+<a name="id-1.2.16.7.19.6"></a><h4>Parameters</h4>
2643 <div class="informaltable"><table width="100%" border="0">
2644 <colgroup>
2645 <col width="150px" class="parameters_name">
2646@@ -879,7 +873,7 @@
2647 module. Only modules should access the fields directly, applications should
2648 use the &lt;function&gt;gdk_pixbuf_format_*&lt;/function&gt; functions.</p>
2649 <div class="refsect3">
2650-<a name="id-1.2.16.9.2.5"></a><h4>Members</h4>
2651+<a name="id-1.2.16.8.2.5"></a><h4>Members</h4>
2652 <div class="informaltable"><table width="100%" border="0">
2653 <colgroup>
2654 <col width="300px" class="struct_members_name">
2655@@ -946,7 +940,7 @@
2656 <p>Flags which allow a module to specify further details about the supported
2657 operations.</p>
2658 <div class="refsect3">
2659-<a name="id-1.2.16.9.3.4"></a><h4>Members</h4>
2660+<a name="id-1.2.16.8.3.4"></a><h4>Members</h4>
2661 <div class="informaltable"><table width="100%" border="0">
2662 <colgroup>
2663 <col width="300px" class="enum_members_name">
2664@@ -1015,7 +1009,7 @@
2665 The example matches e.g. "auud\0" with relevance 100, and "blau" with
2666 relevance 90.&lt;/informalexample&gt;</p>
2667 <div class="refsect3">
2668-<a name="id-1.2.16.9.4.8"></a><h4>Members</h4>
2669+<a name="id-1.2.16.8.4.8"></a><h4>Members</h4>
2670 <div class="informaltable"><table width="100%" border="0">
2671 <colgroup>
2672 <col width="300px" class="struct_members_name">
2673@@ -1097,7 +1091,7 @@
2674 named &lt;function&gt;fill_vtable&lt;/function&gt;, which will get called when the module
2675 is loaded and must set the function pointers of the <a class="link" href="gdk-pixbuf-Module-Interface.html#GdkPixbufModule" title="struct GdkPixbufModule"><span class="type">GdkPixbufModule</span></a>.</p>
2676 <div class="refsect3">
2677-<a name="id-1.2.16.9.5.6"></a><h4>Members</h4>
2678+<a name="id-1.2.16.8.5.6"></a><h4>Members</h4>
2679 <div class="informaltable"><table width="100%" border="0">
2680 <colgroup>
2681 <col width="300px" class="struct_members_name">
2682@@ -1193,7 +1187,7 @@
2683 <a class="link" href="gdk-pixbuf-Animations.html#GdkPixbufAnimation"><span class="type">GdkPixbufAnimation</span></a>, providing suitable implementations of the
2684 virtual functions.</p>
2685 <div class="refsect3">
2686-<a name="id-1.2.16.9.6.5"></a><h4>Members</h4>
2687+<a name="id-1.2.16.8.6.5"></a><h4>Members</h4>
2688 <div class="informaltable"><table width="100%" border="0">
2689 <colgroup>
2690 <col width="300px" class="struct_members_name">
2691@@ -1253,7 +1247,7 @@
2692 <a class="link" href="gdk-pixbuf-Animations.html#GdkPixbufAnimationIter"><span class="type">GdkPixbufAnimationIter</span></a>, providing suitable implementations of the
2693 virtual functions.</p>
2694 <div class="refsect3">
2695-<a name="id-1.2.16.9.7.5"></a><h4>Members</h4>
2696+<a name="id-1.2.16.8.7.5"></a><h4>Members</h4>
2697 <div class="informaltable"><table width="100%" border="0">
2698 <colgroup>
2699 <col width="300px" class="struct_members_name">
2700@@ -1299,6 +1293,6 @@
2701 </div>
2702 <div class="footer">
2703 <hr>
2704- Generated by GTK-Doc V1.20</div>
2705+ Generated by GTK-Doc V1.20.1</div>
2706 </body>
2707 </html>
2708\ No newline at end of file
2709
2710=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html'
2711--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html 2014-04-23 15:46:48 +0000
2712+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html 2014-08-24 22:11:39 +0000
2713@@ -8,15 +8,14 @@
2714 <link rel="up" href="rn01.html" title="API Reference">
2715 <link rel="prev" href="gdk-pixbuf-The-GdkPixbuf-Structure.html" title="The GdkPixbuf Structure">
2716 <link rel="next" href="gdk-pixbuf-File-Loading.html" title="File Loading">
2717-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
2718+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
2719 <link rel="stylesheet" href="style.css" type="text/css">
2720 </head>
2721 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
2722-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
2723+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
2724 <td width="100%" align="left" class="shortcuts">
2725-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
2726- <a href="#gdk-pixbuf-Reference-Counting-and-Memory-Mangement.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
2727- <a href="#gdk-pixbuf-Reference-Counting-and-Memory-Mangement.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
2728+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
2729+ <a href="#gdk-pixbuf-Reference-Counting-and-Memory-Mangement.description" class="shortcut">Description</a></span>
2730 </td>
2731 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
2732 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
2733@@ -68,11 +67,6 @@
2734 </table></div>
2735 </div>
2736 <div class="refsect1">
2737-<a name="gdk-pixbuf-Reference-Counting-and-Memory-Mangement.object-hierarchy"></a><h2>Object Hierarchy</h2>
2738-<pre class="screen">
2739-</pre>
2740-</div>
2741-<div class="refsect1">
2742 <a name="gdk-pixbuf-Reference-Counting-and-Memory-Mangement.includes"></a><h2>Includes</h2>
2743 <pre class="synopsis">#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;
2744 </pre>
2745@@ -87,9 +81,9 @@
2746 by calling <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref"><code class="function">g_object_unref()</code></a>. The pixbuf will be destroyed when
2747 its reference count drops to zero. Newly-created <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a>
2748 structures start with a reference count of one.</p>
2749-<p>&gt; As <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> is derived from <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> now, <a class="link" href="gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html#gdk-pixbuf-ref" title="gdk_pixbuf_ref ()"><code class="function">gdk_pixbuf_ref()</code></a> and
2750-&gt; <a class="link" href="gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html#gdk-pixbuf-unref" title="gdk_pixbuf_unref ()"><code class="function">gdk_pixbuf_unref()</code></a> are deprecated in favour of <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-ref"><code class="function">g_object_ref()</code></a>
2751-&gt; and <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref"><code class="function">g_object_unref()</code></a> resp.</p>
2752+<div class="blockquote"><blockquote class="blockquote"><p>As <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> is derived from <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> now, <a class="link" href="gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html#gdk-pixbuf-ref" title="gdk_pixbuf_ref ()"><code class="function">gdk_pixbuf_ref()</code></a> and
2753+<a class="link" href="gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html#gdk-pixbuf-unref" title="gdk_pixbuf_unref ()"><code class="function">gdk_pixbuf_unref()</code></a> are deprecated in favour of <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-ref"><code class="function">g_object_ref()</code></a>
2754+and <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref"><code class="function">g_object_unref()</code></a> resp.</p></blockquote></div>
2755 <p>Finalizing a pixbuf means to free its pixel
2756 data and to free the <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> structure itself. Most of the
2757 library functions that create <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> structures create the
2758@@ -115,7 +109,7 @@
2759 </div>
2760 <p>Adds a reference to a pixbuf.</p>
2761 <div class="refsect3">
2762-<a name="id-1.2.5.7.2.6"></a><h4>Parameters</h4>
2763+<a name="id-1.2.5.6.2.6"></a><h4>Parameters</h4>
2764 <div class="informaltable"><table width="100%" border="0">
2765 <colgroup>
2766 <col width="150px" class="parameters_name">
2767@@ -130,7 +124,7 @@
2768 </table></div>
2769 </div>
2770 <div class="refsect3">
2771-<a name="id-1.2.5.7.2.7"></a><h4>Returns</h4>
2772+<a name="id-1.2.5.6.2.7"></a><h4>Returns</h4>
2773 <p> The same as the <em class="parameter"><code>pixbuf</code></em>
2774 argument.</p>
2775 <p></p>
2776@@ -147,7 +141,7 @@
2777 </div>
2778 <p>Removes a reference from a pixbuf.</p>
2779 <div class="refsect3">
2780-<a name="id-1.2.5.7.3.6"></a><h4>Parameters</h4>
2781+<a name="id-1.2.5.6.3.6"></a><h4>Parameters</h4>
2782 <div class="informaltable"><table width="100%" border="0">
2783 <colgroup>
2784 <col width="150px" class="parameters_name">
2785@@ -175,7 +169,7 @@
2786 of <a class="link" href="gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html#GdkPixbufDestroyNotify" title="GdkPixbufDestroyNotify ()"><span class="type">GdkPixbufDestroyNotify</span></a> so that the pixel data can be freed
2787 when the pixbuf is finalized.</p>
2788 <div class="refsect3">
2789-<a name="id-1.2.5.7.4.5"></a><h4>Parameters</h4>
2790+<a name="id-1.2.5.6.4.5"></a><h4>Parameters</h4>
2791 <div class="informaltable"><table width="100%" border="0">
2792 <colgroup>
2793 <col width="150px" class="parameters_name">
2794@@ -209,6 +203,6 @@
2795 </div>
2796 <div class="footer">
2797 <hr>
2798- Generated by GTK-Doc V1.20</div>
2799+ Generated by GTK-Doc V1.20.1</div>
2800 </body>
2801 </html>
2802\ No newline at end of file
2803
2804=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-Scaling.html'
2805--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-Scaling.html 2014-04-23 15:46:48 +0000
2806+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-Scaling.html 2014-08-24 22:11:39 +0000
2807@@ -8,15 +8,14 @@
2808 <link rel="up" href="rn01.html" title="API Reference">
2809 <link rel="prev" href="gdk-pixbuf-Inline-data.html" title="Inline data">
2810 <link rel="next" href="gdk-pixbuf-gdk-pixbuf-rendering.html" title="Rendering">
2811-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
2812+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
2813 <link rel="stylesheet" href="style.css" type="text/css">
2814 </head>
2815 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
2816-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
2817+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
2818 <td width="100%" align="left" class="shortcuts">
2819-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
2820- <a href="#gdk-pixbuf-Scaling.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
2821- <a href="#gdk-pixbuf-Scaling.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
2822+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
2823+ <a href="#gdk-pixbuf-Scaling.description" class="shortcut">Description</a></span>
2824 </td>
2825 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
2826 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
2827@@ -119,11 +118,6 @@
2828 </table></div>
2829 </div>
2830 <div class="refsect1">
2831-<a name="gdk-pixbuf-Scaling.object-hierarchy"></a><h2>Object Hierarchy</h2>
2832-<pre class="screen">
2833-</pre>
2834-</div>
2835-<div class="refsect1">
2836 <a name="gdk-pixbuf-Scaling.includes"></a><h2>Includes</h2>
2837 <pre class="synopsis">#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;
2838 </pre>
2839@@ -157,7 +151,7 @@
2840 <a class="link" href="gdk-pixbuf-Scaling.html#gdk-pixbuf-composite-color" title="gdk_pixbuf_composite_color ()"><code class="function">gdk_pixbuf_composite_color()</code></a> function has exactly the same effect
2841 as calling <a class="link" href="gdk-pixbuf-Scaling.html#gdk-pixbuf-scale" title="gdk_pixbuf_scale ()"><code class="function">gdk_pixbuf_scale()</code></a>.</p>
2842 <div class="refsect3">
2843-<a name="id-1.2.10.7.6"></a><h4>Handling an expose event</h4>
2844+<a name="id-1.2.10.6.6"></a><h4>Handling an expose event</h4>
2845 <div class="informalexample">
2846 <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
2847 <tbody>
2848@@ -201,10 +195,10 @@
2849 <span class="normal"> GDK_INTERP_BILINEAR</span><span class="symbol">,</span><span class="normal"> </span><span class="number">255</span><span class="symbol">,</span>
2850 <span class="normal"> event</span><span class="symbol">-&gt;</span><span class="normal">area</span><span class="symbol">.</span><span class="normal">x</span><span class="symbol">,</span><span class="normal"> event</span><span class="symbol">-&gt;</span><span class="normal">area</span><span class="symbol">.</span><span class="normal">y</span><span class="symbol">,</span><span class="normal"> </span><span class="number">16</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xaaaaaa</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x555555</span><span class="symbol">);</span>
2851
2852-<span class="normal"> </span><span class="function"><a href="../gdk2/gdk2-Drawing-Primitives.html#gdk-draw-pixbuf">gdk_draw_pixbuf</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">widget</span><span class="symbol">-&gt;</span><span class="normal">window</span><span class="symbol">,</span><span class="normal"> widget</span><span class="symbol">-&gt;</span><span class="normal">style</span><span class="symbol">-&gt;</span><span class="normal">fg_gc</span><span class="symbol">[</span><span class="normal"><a href="../gtk2/gtk2-Standard-Enumerations.html#GTK-STATE-NORMAL:CAPS">GTK_STATE_NORMAL</a></span><span class="symbol">],</span><span class="normal"> dest</span><span class="symbol">,</span>
2853+<span class="normal"> </span><span class="function"><a href="http://library.gnome.org/devel/gdk3/gdk2-Drawing-Primitives.html#gdk-draw-pixbuf">gdk_draw_pixbuf</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">widget</span><span class="symbol">-&gt;</span><span class="normal">window</span><span class="symbol">,</span><span class="normal"> widget</span><span class="symbol">-&gt;</span><span class="normal">style</span><span class="symbol">-&gt;</span><span class="normal">fg_gc</span><span class="symbol">[</span><span class="normal">GTK_STATE_NORMAL</span><span class="symbol">],</span><span class="normal"> dest</span><span class="symbol">,</span>
2854 <span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> event</span><span class="symbol">-&gt;</span><span class="normal">area</span><span class="symbol">.</span><span class="normal">x</span><span class="symbol">,</span><span class="normal"> event</span><span class="symbol">-&gt;</span><span class="normal">area</span><span class="symbol">.</span><span class="normal">y</span><span class="symbol">,</span>
2855 <span class="normal"> event</span><span class="symbol">-&gt;</span><span class="normal">area</span><span class="symbol">.</span><span class="normal">width</span><span class="symbol">,</span><span class="normal"> event</span><span class="symbol">-&gt;</span><span class="normal">area</span><span class="symbol">.</span><span class="normal">height</span><span class="symbol">,</span>
2856-<span class="normal"> <a href="../gdk2/gdk2-GdkRGB.html#GDK-RGB-DITHER-NORMAL:CAPS">GDK_RGB_DITHER_NORMAL</a></span><span class="symbol">,</span><span class="normal"> event</span><span class="symbol">-&gt;</span><span class="normal">area</span><span class="symbol">.</span><span class="normal">x</span><span class="symbol">,</span><span class="normal"> event</span><span class="symbol">-&gt;</span><span class="normal">area</span><span class="symbol">.</span><span class="normal">y</span><span class="symbol">);</span>
2857+<span class="normal"> GDK_RGB_DITHER_NORMAL</span><span class="symbol">,</span><span class="normal"> event</span><span class="symbol">-&gt;</span><span class="normal">area</span><span class="symbol">.</span><span class="normal">x</span><span class="symbol">,</span><span class="normal"> event</span><span class="symbol">-&gt;</span><span class="normal">area</span><span class="symbol">.</span><span class="normal">y</span><span class="symbol">);</span>
2858 <span class="normal"> </span>
2859 <span class="normal"> </span><span class="function"><a href="gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html#gdk-pixbuf-unref">gdk_pixbuf_unref</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">dest</span><span class="symbol">);</span>
2860 <span class="normal"> </span>
2861@@ -246,7 +240,7 @@
2862 <p>For more complicated scaling/compositing see <a class="link" href="gdk-pixbuf-Scaling.html#gdk-pixbuf-scale" title="gdk_pixbuf_scale ()"><code class="function">gdk_pixbuf_scale()</code></a>
2863 and <a class="link" href="gdk-pixbuf-Scaling.html#gdk-pixbuf-composite" title="gdk_pixbuf_composite ()"><code class="function">gdk_pixbuf_composite()</code></a>.</p>
2864 <div class="refsect3">
2865-<a name="id-1.2.10.8.2.7"></a><h4>Parameters</h4>
2866+<a name="id-1.2.10.7.2.7"></a><h4>Parameters</h4>
2867 <div class="informaltable"><table width="100%" border="0">
2868 <colgroup>
2869 <col width="150px" class="parameters_name">
2870@@ -278,7 +272,7 @@
2871 </table></div>
2872 </div>
2873 <div class="refsect3">
2874-<a name="id-1.2.10.8.2.8"></a><h4>Returns</h4>
2875+<a name="id-1.2.10.7.2.8"></a><h4>Returns</h4>
2876 <p> the new <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if not enough memory could be
2877 allocated for it. </p>
2878 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
2879@@ -320,7 +314,7 @@
2880 same pixbuf, it will be overwritten during the scaling which
2881 results in rendering artifacts.</p>
2882 <div class="refsect3">
2883-<a name="id-1.2.10.8.3.7"></a><h4>Parameters</h4>
2884+<a name="id-1.2.10.7.3.7"></a><h4>Parameters</h4>
2885 <div class="informaltable"><table width="100%" border="0">
2886 <colgroup>
2887 <col width="150px" class="parameters_name">
2888@@ -408,7 +402,7 @@
2889 and <em class="parameter"><code>color2</code></em>
2890 .</p>
2891 <div class="refsect3">
2892-<a name="id-1.2.10.8.4.5"></a><h4>Parameters</h4>
2893+<a name="id-1.2.10.7.4.5"></a><h4>Parameters</h4>
2894 <div class="informaltable"><table width="100%" border="0">
2895 <colgroup>
2896 <col width="150px" class="parameters_name">
2897@@ -460,7 +454,7 @@
2898 </table></div>
2899 </div>
2900 <div class="refsect3">
2901-<a name="id-1.2.10.8.4.6"></a><h4>Returns</h4>
2902+<a name="id-1.2.10.7.4.6"></a><h4>Returns</h4>
2903 <p> the new <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if not enough memory could be
2904 allocated for it. </p>
2905 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
2906@@ -502,7 +496,7 @@
2907 to infinity. </p>
2908 <p><span class="inlinemediaobject"><img src="composite.png"></span></p>
2909 <div class="refsect3">
2910-<a name="id-1.2.10.8.5.7"></a><h4>Parameters</h4>
2911+<a name="id-1.2.10.7.5.7"></a><h4>Parameters</h4>
2912 <div class="informaltable"><table width="100%" border="0">
2913 <colgroup>
2914 <col width="150px" class="parameters_name">
2915@@ -615,7 +609,7 @@
2916 <p>See <a class="link" href="gdk-pixbuf-Scaling.html#gdk-pixbuf-composite-color-simple" title="gdk_pixbuf_composite_color_simple ()"><code class="function">gdk_pixbuf_composite_color_simple()</code></a> for a simpler variant of this
2917 function suitable for many tasks.</p>
2918 <div class="refsect3">
2919-<a name="id-1.2.10.8.6.6"></a><h4>Parameters</h4>
2920+<a name="id-1.2.10.7.6.6"></a><h4>Parameters</h4>
2921 <div class="informaltable"><table width="100%" border="0">
2922 <colgroup>
2923 <col width="150px" class="parameters_name">
2924@@ -723,7 +717,7 @@
2925 <p>Rotates a pixbuf by a multiple of 90 degrees, and returns the
2926 result in a new pixbuf.</p>
2927 <div class="refsect3">
2928-<a name="id-1.2.10.8.7.5"></a><h4>Parameters</h4>
2929+<a name="id-1.2.10.7.7.5"></a><h4>Parameters</h4>
2930 <div class="informaltable"><table width="100%" border="0">
2931 <colgroup>
2932 <col width="150px" class="parameters_name">
2933@@ -745,10 +739,10 @@
2934 </table></div>
2935 </div>
2936 <div class="refsect3">
2937-<a name="id-1.2.10.8.7.6"></a><h4>Returns</h4>
2938-<p> the new <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if not enough memory could be
2939-allocated for it. </p>
2940-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
2941+<a name="id-1.2.10.7.7.6"></a><h4>Returns</h4>
2942+<p> the new <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
2943+if not enough memory could be allocated for it. </p>
2944+<p><span class="annotation">[nullable][<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
2945 </div>
2946 <p class="since">Since 2.6</p>
2947 </div>
2948@@ -761,7 +755,7 @@
2949 <p>Flips a pixbuf horizontally or vertically and returns the
2950 result in a new pixbuf.</p>
2951 <div class="refsect3">
2952-<a name="id-1.2.10.8.8.5"></a><h4>Parameters</h4>
2953+<a name="id-1.2.10.7.8.5"></a><h4>Parameters</h4>
2954 <div class="informaltable"><table width="100%" border="0">
2955 <colgroup>
2956 <col width="150px" class="parameters_name">
2957@@ -783,10 +777,10 @@
2958 </table></div>
2959 </div>
2960 <div class="refsect3">
2961-<a name="id-1.2.10.8.8.6"></a><h4>Returns</h4>
2962-<p> the new <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if not enough memory could be
2963-allocated for it. </p>
2964-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
2965+<a name="id-1.2.10.7.8.6"></a><h4>Returns</h4>
2966+<p> the new <a class="link" href="gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
2967+if not enough memory could be allocated for it. </p>
2968+<p><span class="annotation">[nullable][<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
2969 </div>
2970 <p class="since">Since 2.6</p>
2971 </div>
2972@@ -807,7 +801,7 @@
2973 interpolation is just as fast and results in higher quality.
2974 &lt;/note&gt;</p>
2975 <div class="refsect3">
2976-<a name="id-1.2.10.9.2.5"></a><h4>Members</h4>
2977+<a name="id-1.2.10.8.2.5"></a><h4>Members</h4>
2978 <div class="informaltable"><table width="100%" border="0">
2979 <colgroup>
2980 <col width="300px" class="enum_members_name">
2981@@ -867,7 +861,7 @@
2982 <p>The possible rotations which can be passed to <a class="link" href="gdk-pixbuf-Scaling.html#gdk-pixbuf-rotate-simple" title="gdk_pixbuf_rotate_simple ()"><code class="function">gdk_pixbuf_rotate_simple()</code></a>.
2983 To make them easier to use, their numerical values are the actual degrees.</p>
2984 <div class="refsect3">
2985-<a name="id-1.2.10.9.3.4"></a><h4>Members</h4>
2986+<a name="id-1.2.10.8.3.4"></a><h4>Members</h4>
2987 <div class="informaltable"><table width="100%" border="0">
2988 <colgroup>
2989 <col width="300px" class="enum_members_name">
2990@@ -915,6 +909,6 @@
2991 </div>
2992 <div class="footer">
2993 <hr>
2994- Generated by GTK-Doc V1.20</div>
2995+ Generated by GTK-Doc V1.20.1</div>
2996 </body>
2997 </html>
2998\ No newline at end of file
2999
3000=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-The-GdkPixbuf-Structure.html'
3001--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-The-GdkPixbuf-Structure.html 2014-04-23 15:46:48 +0000
3002+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-The-GdkPixbuf-Structure.html 2014-08-24 22:11:39 +0000
3003@@ -8,16 +8,16 @@
3004 <link rel="up" href="rn01.html" title="API Reference">
3005 <link rel="prev" href="gdk-pixbuf-Versioning.html" title="Initialization and Versions">
3006 <link rel="next" href="gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html" title="Reference Counting and Memory Mangement">
3007-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
3008+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
3009 <link rel="stylesheet" href="style.css" type="text/css">
3010 </head>
3011 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
3012-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
3013+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
3014 <td width="100%" align="left" class="shortcuts">
3015-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
3016- <a href="#gdk-pixbuf-The-GdkPixbuf-Structure.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
3017- <a href="#gdk-pixbuf-The-GdkPixbuf-Structure.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces"> <span class="dim">|</span> 
3018- <a href="#gdk-pixbuf-The-GdkPixbuf-Structure.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties"> <span class="dim">|</span> 
3019+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
3020+ <a href="#gdk-pixbuf-The-GdkPixbuf-Structure.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
3021+ <a href="#gdk-pixbuf-The-GdkPixbuf-Structure.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
3022+ <a href="#gdk-pixbuf-The-GdkPixbuf-Structure.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
3023 <a href="#gdk-pixbuf-The-GdkPixbuf-Structure.properties" class="shortcut">Properties</a></span>
3024 </td>
3025 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
3026@@ -764,7 +764,7 @@
3027 <div class="refsect2">
3028 <a name="GdkPixbufAlphaMode"></a><h3>enum GdkPixbufAlphaMode</h3>
3029 <p>These values can be passed to
3030-<a href="../gdk2/gdk2-Pixbufs.html#gdk-pixbuf-render-to-drawable-alpha"><code class="function">gdk_pixbuf_render_to_drawable_alpha()</code></a> to control how the alpha
3031+<a href="http://library.gnome.org/devel/gdk3/gdk2-Pixbufs.html#gdk-pixbuf-render-to-drawable-alpha"><code class="function">gdk_pixbuf_render_to_drawable_alpha()</code></a> to control how the alpha
3032 channel of an image should be handled. This function can create a
3033 bilevel clipping mask (black and white) and use it while painting
3034 the image. In the future, when the X Window System gets an alpha
3035@@ -893,6 +893,6 @@
3036 </div>
3037 <div class="footer">
3038 <hr>
3039- Generated by GTK-Doc V1.20</div>
3040+ Generated by GTK-Doc V1.20.1</div>
3041 </body>
3042 </html>
3043\ No newline at end of file
3044
3045=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-Utilities.html'
3046--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-Utilities.html 2014-04-23 15:46:48 +0000
3047+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-Utilities.html 2014-08-24 22:11:39 +0000
3048@@ -8,15 +8,14 @@
3049 <link rel="up" href="rn01.html" title="API Reference">
3050 <link rel="prev" href="gdk-pixbuf-gdk-pixbuf-from-drawables.html" title="Drawables to Pixbufs">
3051 <link rel="next" href="gdk-pixbuf-Animations.html" title="Animations">
3052-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
3053+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
3054 <link rel="stylesheet" href="style.css" type="text/css">
3055 </head>
3056 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
3057-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
3058+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
3059 <td width="100%" align="left" class="shortcuts">
3060-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
3061- <a href="#gdk-pixbuf-Utilities.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
3062- <a href="#gdk-pixbuf-Utilities.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
3063+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
3064+ <a href="#gdk-pixbuf-Utilities.description" class="shortcut">Description</a></span>
3065 </td>
3066 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
3067 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
3068@@ -84,11 +83,6 @@
3069 </table></div>
3070 </div>
3071 <div class="refsect1">
3072-<a name="gdk-pixbuf-Utilities.object-hierarchy"></a><h2>Object Hierarchy</h2>
3073-<pre class="screen">
3074-</pre>
3075-</div>
3076-<div class="refsect1">
3077 <a name="gdk-pixbuf-Utilities.includes"></a><h2>Includes</h2>
3078 <pre class="synopsis">#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;
3079 </pre>
3080@@ -122,7 +116,7 @@
3081 assigned zero opacity. That is, if you pass (255, 255, 255) for the
3082 substitute color, all white pixels will become fully transparent.</p>
3083 <div class="refsect3">
3084-<a name="id-1.2.13.7.2.6"></a><h4>Parameters</h4>
3085+<a name="id-1.2.13.6.2.6"></a><h4>Parameters</h4>
3086 <div class="informaltable"><table width="100%" border="0">
3087 <colgroup>
3088 <col width="150px" class="parameters_name">
3089@@ -163,7 +157,7 @@
3090 </table></div>
3091 </div>
3092 <div class="refsect3">
3093-<a name="id-1.2.13.7.2.7"></a><h4>Returns</h4>
3094+<a name="id-1.2.13.6.2.7"></a><h4>Returns</h4>
3095 <p> A newly-created pixbuf with a reference count of 1. </p>
3096 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
3097 </div>
3098@@ -188,7 +182,7 @@
3099 same pixbuf, it will be overwritten during the copy operation.
3100 Therefore, you can not use this function to scroll a pixbuf.</p>
3101 <div class="refsect3">
3102-<a name="id-1.2.13.7.3.6"></a><h4>Parameters</h4>
3103+<a name="id-1.2.13.6.3.6"></a><h4>Parameters</h4>
3104 <div class="informaltable"><table width="100%" border="0">
3105 <colgroup>
3106 <col width="150px" class="parameters_name">
3107@@ -269,7 +263,7 @@
3108 must have the same image format, size, and
3109 rowstride.</p>
3110 <div class="refsect3">
3111-<a name="id-1.2.13.7.4.5"></a><h4>Parameters</h4>
3112+<a name="id-1.2.13.6.4.5"></a><h4>Parameters</h4>
3113 <div class="informaltable"><table width="100%" border="0">
3114 <colgroup>
3115 <col width="150px" class="parameters_name">
3116@@ -316,7 +310,7 @@
3117 appropriate transform will be performed so that the pixbuf
3118 is oriented correctly.</p>
3119 <div class="refsect3">
3120-<a name="id-1.2.13.7.5.5"></a><h4>Parameters</h4>
3121+<a name="id-1.2.13.6.5.5"></a><h4>Parameters</h4>
3122 <div class="informaltable"><table width="100%" border="0">
3123 <colgroup>
3124 <col width="150px" class="parameters_name">
3125@@ -331,7 +325,7 @@
3126 </table></div>
3127 </div>
3128 <div class="refsect3">
3129-<a name="id-1.2.13.7.5.6"></a><h4>Returns</h4>
3130+<a name="id-1.2.13.6.5.6"></a><h4>Returns</h4>
3131 <p> A newly-created pixbuf, or a reference to the
3132 input pixbuf (with an increased reference count). </p>
3133 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
3134@@ -348,7 +342,7 @@
3135 the pixbuf's pixel format. The alpha will be ignored if the pixbuf
3136 doesn't have an alpha channel.</p>
3137 <div class="refsect3">
3138-<a name="id-1.2.13.7.6.5"></a><h4>Parameters</h4>
3139+<a name="id-1.2.13.6.6.5"></a><h4>Parameters</h4>
3140 <div class="informaltable"><table width="100%" border="0">
3141 <colgroup>
3142 <col width="150px" class="parameters_name">
3143@@ -382,6 +376,6 @@
3144 </div>
3145 <div class="footer">
3146 <hr>
3147- Generated by GTK-Doc V1.20</div>
3148+ Generated by GTK-Doc V1.20.1</div>
3149 </body>
3150 </html>
3151\ No newline at end of file
3152
3153=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-Versioning.html'
3154--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-Versioning.html 2014-04-23 15:46:48 +0000
3155+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-Versioning.html 2014-08-24 22:11:39 +0000
3156@@ -8,15 +8,14 @@
3157 <link rel="up" href="rn01.html" title="API Reference">
3158 <link rel="prev" href="rn01.html" title="API Reference">
3159 <link rel="next" href="gdk-pixbuf-The-GdkPixbuf-Structure.html" title="The GdkPixbuf Structure">
3160-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
3161+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
3162 <link rel="stylesheet" href="style.css" type="text/css">
3163 </head>
3164 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
3165-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
3166+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
3167 <td width="100%" align="left" class="shortcuts">
3168-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
3169- <a href="#gdk-pixbuf-Versioning.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
3170- <a href="#gdk-pixbuf-Versioning.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
3171+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
3172+ <a href="#gdk-pixbuf-Versioning.description" class="shortcut">Description</a></span>
3173 </td>
3174 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
3175 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
3176@@ -87,11 +86,6 @@
3177 </table></div>
3178 </div>
3179 <div class="refsect1">
3180-<a name="gdk-pixbuf-Versioning.object-hierarchy"></a><h2>Object Hierarchy</h2>
3181-<pre class="screen">
3182-</pre>
3183-</div>
3184-<div class="refsect1">
3185 <a name="gdk-pixbuf-Versioning.includes"></a><h2>Includes</h2>
3186 <pre class="synopsis">#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;
3187 </pre>
3188@@ -121,7 +115,7 @@
3189 <hr>
3190 <div class="refsect2">
3191 <a name="GDK-PIXBUF-MICRO:CAPS"></a><h3>GDK_PIXBUF_MICRO</h3>
3192-<pre class="programlisting">#define GDK_PIXBUF_MICRO (7)
3193+<pre class="programlisting">#define GDK_PIXBUF_MICRO (8)
3194 </pre>
3195 <p>Micro version of gdk-pixbuf library, that is the "2" in
3196 "0.8.2" for example.</p>
3197@@ -175,7 +169,7 @@
3198 <hr>
3199 <div class="refsect2">
3200 <a name="GDK-PIXBUF-VERSION:CAPS"></a><h3>GDK_PIXBUF_VERSION</h3>
3201-<pre class="programlisting">#define GDK_PIXBUF_VERSION "2.30.7"
3202+<pre class="programlisting">#define GDK_PIXBUF_VERSION "2.30.8"
3203 </pre>
3204 <p>Contains the full version of the gdk-pixbuf header as a string.
3205 This is the version being compiled against; contrast with
3206@@ -185,6 +179,6 @@
3207 </div>
3208 <div class="footer">
3209 <hr>
3210- Generated by GTK-Doc V1.20</div>
3211+ Generated by GTK-Doc V1.20.1</div>
3212 </body>
3213 </html>
3214\ No newline at end of file
3215
3216=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-X-Drawables-to-Pixbufs.html'
3217--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-X-Drawables-to-Pixbufs.html 2014-03-31 17:15:34 +0000
3218+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-X-Drawables-to-Pixbufs.html 2014-08-24 22:11:39 +0000
3219@@ -8,15 +8,14 @@
3220 <link rel="up" href="rn01.html" title="API Reference">
3221 <link rel="prev" href="gdk-pixbuf-Xlib-Rendering.html" title="Xlib Rendering">
3222 <link rel="next" href="gdk-pixbuf-XlibRGB.html" title="XlibRGB">
3223-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
3224+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
3225 <link rel="stylesheet" href="style.css" type="text/css">
3226 </head>
3227 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
3228-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
3229+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
3230 <td width="100%" align="left" class="shortcuts">
3231-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
3232- <a href="#gdk-pixbuf-X-Drawables-to-Pixbufs.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
3233- <a href="#gdk-pixbuf-X-Drawables-to-Pixbufs.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
3234+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
3235+ <a href="#gdk-pixbuf-X-Drawables-to-Pixbufs.description" class="shortcut">Description</a></span>
3236 </td>
3237 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
3238 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
3239@@ -50,11 +49,6 @@
3240 </table></div>
3241 </div>
3242 <div class="refsect1">
3243-<a name="gdk-pixbuf-X-Drawables-to-Pixbufs.object-hierarchy"></a><h2>Object Hierarchy</h2>
3244-<pre class="screen">
3245-</pre>
3246-</div>
3247-<div class="refsect1">
3248 <a name="gdk-pixbuf-X-Drawables-to-Pixbufs.includes"></a><h2>Includes</h2>
3249 <pre class="synopsis">#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;
3250 </pre>
3251@@ -114,7 +108,7 @@
3252 inferior windows of a different depth than that of the source window will also
3253 be undefined.</p>
3254 <div class="refsect3">
3255-<a name="id-1.2.19.7.2.9"></a><h4>Parameters</h4>
3256+<a name="id-1.2.19.6.2.9"></a><h4>Parameters</h4>
3257 <div class="informaltable"><table width="100%" border="0">
3258 <colgroup>
3259 <col width="150px" class="parameters_name">
3260@@ -182,7 +176,7 @@
3261 </table></div>
3262 </div>
3263 <div class="refsect3">
3264-<a name="id-1.2.19.7.2.10"></a><h4>Returns</h4>
3265+<a name="id-1.2.19.6.2.10"></a><h4>Returns</h4>
3266 <p> The same pixbuf as <em class="parameter"><code>dest</code></em>
3267 if it was non-NULL, or a newly-created
3268 pixbuf with a reference count of 1 if no destination pixbuf was specified; in
3269@@ -198,6 +192,6 @@
3270 </div>
3271 <div class="footer">
3272 <hr>
3273- Generated by GTK-Doc V1.20</div>
3274+ Generated by GTK-Doc V1.20.1</div>
3275 </body>
3276 </html>
3277\ No newline at end of file
3278
3279=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-Xlib-Rendering.html'
3280--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-Xlib-Rendering.html 2014-03-31 17:15:34 +0000
3281+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-Xlib-Rendering.html 2014-08-24 22:11:39 +0000
3282@@ -8,15 +8,14 @@
3283 <link rel="up" href="rn01.html" title="API Reference">
3284 <link rel="prev" href="gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html" title="gdk-pixbuf Xlib initialization">
3285 <link rel="next" href="gdk-pixbuf-X-Drawables-to-Pixbufs.html" title="X Drawables to Pixbufs">
3286-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
3287+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
3288 <link rel="stylesheet" href="style.css" type="text/css">
3289 </head>
3290 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
3291-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
3292+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
3293 <td width="100%" align="left" class="shortcuts">
3294-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
3295- <a href="#gdk-pixbuf-Xlib-Rendering.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
3296- <a href="#gdk-pixbuf-Xlib-Rendering.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
3297+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
3298+ <a href="#gdk-pixbuf-Xlib-Rendering.description" class="shortcut">Description</a></span>
3299 </td>
3300 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
3301 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
3302@@ -76,11 +75,6 @@
3303 </table></div>
3304 </div>
3305 <div class="refsect1">
3306-<a name="gdk-pixbuf-Xlib-Rendering.object-hierarchy"></a><h2>Object Hierarchy</h2>
3307-<pre class="screen">
3308-</pre>
3309-</div>
3310-<div class="refsect1">
3311 <a name="gdk-pixbuf-Xlib-Rendering.includes"></a><h2>Includes</h2>
3312 <pre class="synopsis">#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;
3313 </pre>
3314@@ -112,7 +106,7 @@
3315 them to produce a bi-level alpha mask that can be used as a clipping mask for
3316 a drawable.</p>
3317 <div class="refsect3">
3318-<a name="id-1.2.18.7.2.5"></a><h4>Parameters</h4>
3319+<a name="id-1.2.18.6.2.5"></a><h4>Parameters</h4>
3320 <div class="informaltable"><table width="100%" border="0">
3321 <colgroup>
3322 <col width="150px" class="parameters_name">
3323@@ -198,7 +192,7 @@
3324 for consistent visual results. If you do not have any of these cases, the
3325 dither offsets can be both zero.</p>
3326 <div class="refsect3">
3327-<a name="id-1.2.18.7.3.6"></a><h4>Parameters</h4>
3328+<a name="id-1.2.18.6.3.6"></a><h4>Parameters</h4>
3329 <div class="informaltable"><table width="100%" border="0">
3330 <colgroup>
3331 <col width="150px" class="parameters_name">
3332@@ -298,7 +292,7 @@
3333 the alpha channel yourself (possibly by caching it in your application) and
3334 using <a class="link" href="gdk-pixbuf-Xlib-Rendering.html#gdk-pixbuf-xlib-render-to-drawable" title="gdk_pixbuf_xlib_render_to_drawable ()"><code class="function">gdk_pixbuf_xlib_render_to_drawable()</code></a> or GdkRGB directly instead.</p>
3335 <div class="refsect3">
3336-<a name="id-1.2.18.7.4.6"></a><h4>Parameters</h4>
3337+<a name="id-1.2.18.6.4.6"></a><h4>Parameters</h4>
3338 <div class="informaltable"><table width="100%" border="0">
3339 <colgroup>
3340 <col width="150px" class="parameters_name">
3341@@ -400,7 +394,7 @@
3342 will be set
3343 to None.</p>
3344 <div class="refsect3">
3345-<a name="id-1.2.18.7.5.6"></a><h4>Parameters</h4>
3346+<a name="id-1.2.18.6.5.6"></a><h4>Parameters</h4>
3347 <div class="informaltable"><table width="100%" border="0">
3348 <colgroup>
3349 <col width="150px" class="parameters_name">
3350@@ -439,6 +433,6 @@
3351 </div>
3352 <div class="footer">
3353 <hr>
3354- Generated by GTK-Doc V1.20</div>
3355+ Generated by GTK-Doc V1.20.1</div>
3356 </body>
3357 </html>
3358\ No newline at end of file
3359
3360=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-XlibRGB.html'
3361--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-XlibRGB.html 2014-03-31 17:15:34 +0000
3362+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-XlibRGB.html 2014-08-24 22:11:39 +0000
3363@@ -8,15 +8,14 @@
3364 <link rel="up" href="rn01.html" title="API Reference">
3365 <link rel="prev" href="gdk-pixbuf-X-Drawables-to-Pixbufs.html" title="X Drawables to Pixbufs">
3366 <link rel="next" href="rn02.html" title="Tools Reference">
3367-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
3368+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
3369 <link rel="stylesheet" href="style.css" type="text/css">
3370 </head>
3371 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
3372-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
3373+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
3374 <td width="100%" align="left" class="shortcuts">
3375-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
3376- <a href="#gdk-pixbuf-XlibRGB.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
3377- <a href="#gdk-pixbuf-XlibRGB.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
3378+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
3379+ <a href="#gdk-pixbuf-XlibRGB.description" class="shortcut">Description</a></span>
3380 </td>
3381 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
3382 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
3383@@ -238,11 +237,6 @@
3384 </table></div>
3385 </div>
3386 <div class="refsect1">
3387-<a name="gdk-pixbuf-XlibRGB.object-hierarchy"></a><h2>Object Hierarchy</h2>
3388-<pre class="screen">
3389-</pre>
3390-</div>
3391-<div class="refsect1">
3392 <a name="gdk-pixbuf-XlibRGB.includes"></a><h2>Includes</h2>
3393 <pre class="synopsis">#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;
3394 </pre>
3395@@ -266,7 +260,7 @@
3396 display. This function or <a class="link" href="gdk-pixbuf-XlibRGB.html#xlib-rgb-init-with-depth" title="xlib_rgb_init_with_depth ()"><code class="function">xlib_rgb_init_with_depth()</code></a> must be called before
3397 using any of the other functions in XlibRGB.</p>
3398 <div class="refsect3">
3399-<a name="id-1.2.20.8.2.5"></a><h4>Parameters</h4>
3400+<a name="id-1.2.20.7.2.5"></a><h4>Parameters</h4>
3401 <div class="informaltable"><table width="100%" border="0">
3402 <colgroup>
3403 <col width="150px" class="parameters_name">
3404@@ -300,7 +294,7 @@
3405 function or <a class="link" href="gdk-pixbuf-XlibRGB.html#xlib-rgb-init" title="xlib_rgb_init ()"><code class="function">xlib_rgb_init()</code></a> must be called before using any of the other
3406 functions in XlibRGB.</p>
3407 <div class="refsect3">
3408-<a name="id-1.2.20.8.3.5"></a><h4>Parameters</h4>
3409+<a name="id-1.2.20.7.3.5"></a><h4>Parameters</h4>
3410 <div class="informaltable"><table width="100%" border="0">
3411 <colgroup>
3412 <col width="150px" class="parameters_name">
3413@@ -337,7 +331,7 @@
3414 <p>Converts an RGB triplet into the closest color that XlibRGB visual can
3415 handle.</p>
3416 <div class="refsect3">
3417-<a name="id-1.2.20.8.4.5"></a><h4>Parameters</h4>
3418+<a name="id-1.2.20.7.4.5"></a><h4>Parameters</h4>
3419 <div class="informaltable"><table width="100%" border="0">
3420 <colgroup>
3421 <col width="150px" class="parameters_name">
3422@@ -352,7 +346,7 @@
3423 </table></div>
3424 </div>
3425 <div class="refsect3">
3426-<a name="id-1.2.20.8.4.6"></a><h4>Returns</h4>
3427+<a name="id-1.2.20.7.4.6"></a><h4>Returns</h4>
3428 <p> X pixel value that corresponds to the closest color in the
3429 XlibRGB visual and colormap.</p>
3430 <p></p>
3431@@ -368,7 +362,7 @@
3432 triplet. It calls <a class="link" href="gdk-pixbuf-XlibRGB.html#xlib-rgb-xpixel-from-rgb" title="xlib_rgb_xpixel_from_rgb ()"><code class="function">xlib_rgb_xpixel_from_rgb()</code></a> internally and uses the
3433 returned pixel value to set the GC's foreground.</p>
3434 <div class="refsect3">
3435-<a name="id-1.2.20.8.5.5"></a><h4>Parameters</h4>
3436+<a name="id-1.2.20.7.5.5"></a><h4>Parameters</h4>
3437 <div class="informaltable"><table width="100%" border="0">
3438 <colgroup>
3439 <col width="150px" class="parameters_name">
3440@@ -400,7 +394,7 @@
3441 triplet. It calls <a class="link" href="gdk-pixbuf-XlibRGB.html#xlib-rgb-xpixel-from-rgb" title="xlib_rgb_xpixel_from_rgb ()"><code class="function">xlib_rgb_xpixel_from_rgb()</code></a> internally and uses the
3442 returned pixel value to set the GC's background.</p>
3443 <div class="refsect3">
3444-<a name="id-1.2.20.8.6.5"></a><h4>Parameters</h4>
3445+<a name="id-1.2.20.7.6.5"></a><h4>Parameters</h4>
3446 <div class="informaltable"><table width="100%" border="0">
3447 <colgroup>
3448 <col width="150px" class="parameters_name">
3449@@ -441,7 +435,7 @@
3450 offsets; applications that need to render partial regions of a buffer to
3451 build the final image should use <a class="link" href="gdk-pixbuf-XlibRGB.html#xlib-draw-rgb-image-dithalign" title="xlib_draw_rgb_image_dithalign ()"><code class="function">xlib_draw_rgb_image_dithalign()</code></a> instead.</p>
3452 <div class="refsect3">
3453-<a name="id-1.2.20.8.7.5"></a><h4>Parameters</h4>
3454+<a name="id-1.2.20.7.7.5"></a><h4>Parameters</h4>
3455 <div class="informaltable"><table width="100%" border="0">
3456 <colgroup>
3457 <col width="150px" class="parameters_name">
3458@@ -521,7 +515,7 @@
3459 separately to form the final image; the dither offsets let you align the
3460 dither mask appropriately.</p>
3461 <div class="refsect3">
3462-<a name="id-1.2.20.8.8.5"></a><h4>Parameters</h4>
3463+<a name="id-1.2.20.7.8.5"></a><h4>Parameters</h4>
3464 <div class="informaltable"><table width="100%" border="0">
3465 <colgroup>
3466 <col width="150px" class="parameters_name">
3467@@ -608,7 +602,7 @@
3468 faster results than <a class="link" href="gdk-pixbuf-XlibRGB.html#xlib-draw-rgb-image" title="xlib_draw_rgb_image ()"><code class="function">xlib_draw_rgb_image()</code></a> since the pixels are aligned on
3469 32-bit boundaries.</p>
3470 <div class="refsect3">
3471-<a name="id-1.2.20.8.9.5"></a><h4>Parameters</h4>
3472+<a name="id-1.2.20.7.9.5"></a><h4>Parameters</h4>
3473 <div class="informaltable"><table width="100%" border="0">
3474 <colgroup>
3475 <col width="150px" class="parameters_name">
3476@@ -683,7 +677,7 @@
3477 intensity values. An image will thus look as a GGGGGG sequence of 8-bit
3478 values.</p>
3479 <div class="refsect3">
3480-<a name="id-1.2.20.8.10.5"></a><h4>Parameters</h4>
3481+<a name="id-1.2.20.7.10.5"></a><h4>Parameters</h4>
3482 <div class="informaltable"><table width="100%" border="0">
3483 <colgroup>
3484 <col width="150px" class="parameters_name">
3485@@ -749,7 +743,7 @@
3486 <em class="parameter"><code><span class="type">int</span> n_colors</code></em>);</pre>
3487 <p>FIXME</p>
3488 <div class="refsect3">
3489-<a name="id-1.2.20.8.11.5"></a><h4>Parameters</h4>
3490+<a name="id-1.2.20.7.11.5"></a><h4>Parameters</h4>
3491 <div class="informaltable"><table width="100%" border="0">
3492 <colgroup>
3493 <col width="150px" class="parameters_name">
3494@@ -771,7 +765,7 @@
3495 </table></div>
3496 </div>
3497 <div class="refsect3">
3498-<a name="id-1.2.20.8.11.6"></a><h4>Returns</h4>
3499+<a name="id-1.2.20.7.11.6"></a><h4>Returns</h4>
3500 <p> FIXME</p>
3501 <p></p>
3502 </div>
3503@@ -783,7 +777,7 @@
3504 xlib_rgb_cmap_free (<em class="parameter"><code><a class="link" href="gdk-pixbuf-XlibRGB.html#XlibRgbCmap" title="struct XlibRgbCmap"><span class="type">XlibRgbCmap</span></a> *cmap</code></em>);</pre>
3505 <p>Frees an XlibRGB colormap.</p>
3506 <div class="refsect3">
3507-<a name="id-1.2.20.8.12.5"></a><h4>Parameters</h4>
3508+<a name="id-1.2.20.7.12.5"></a><h4>Parameters</h4>
3509 <div class="informaltable"><table width="100%" border="0">
3510 <colgroup>
3511 <col width="150px" class="parameters_name">
3512@@ -814,7 +808,7 @@
3513 <em class="parameter"><code><a class="link" href="gdk-pixbuf-XlibRGB.html#XlibRgbCmap" title="struct XlibRgbCmap"><span class="type">XlibRgbCmap</span></a> *cmap</code></em>);</pre>
3514 <p>FIXME</p>
3515 <div class="refsect3">
3516-<a name="id-1.2.20.8.13.5"></a><h4>Parameters</h4>
3517+<a name="id-1.2.20.7.13.5"></a><h4>Parameters</h4>
3518 <div class="informaltable"><table width="100%" border="0">
3519 <colgroup>
3520 <col width="150px" class="parameters_name">
3521@@ -883,7 +877,7 @@
3522 xlib_rgb_ditherable (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
3523 <p>Queries whether XlibRGB supports dithering for its chosen visual.</p>
3524 <div class="refsect3">
3525-<a name="id-1.2.20.8.14.5"></a><h4>Returns</h4>
3526+<a name="id-1.2.20.7.14.5"></a><h4>Returns</h4>
3527 <p> TRUE if dithering can be performed for the visual that XlibRGB
3528 is using, FALSE otherwise.</p>
3529 <p></p>
3530@@ -896,7 +890,7 @@
3531 xlib_rgb_set_verbose (<em class="parameter"><code><span class="type">Bool</span> verbose</code></em>);</pre>
3532 <p>Enables/disables debug spew.</p>
3533 <div class="refsect3">
3534-<a name="id-1.2.20.8.15.5"></a><h4>Parameters</h4>
3535+<a name="id-1.2.20.7.15.5"></a><h4>Parameters</h4>
3536 <div class="informaltable"><table width="100%" border="0">
3537 <colgroup>
3538 <col width="150px" class="parameters_name">
3539@@ -918,7 +912,7 @@
3540 xlib_rgb_set_install (<em class="parameter"><code><span class="type">Bool</span> install</code></em>);</pre>
3541 <p>Sets whether we install an RGB colormap.</p>
3542 <div class="refsect3">
3543-<a name="id-1.2.20.8.16.5"></a><h4>Parameters</h4>
3544+<a name="id-1.2.20.7.16.5"></a><h4>Parameters</h4>
3545 <div class="informaltable"><table width="100%" border="0">
3546 <colgroup>
3547 <col width="150px" class="parameters_name">
3548@@ -940,7 +934,7 @@
3549 xlib_rgb_set_min_colors (<em class="parameter"><code><span class="type">int</span> min_colors</code></em>);</pre>
3550 <p>Sets the minimum number of colors in the color cube.</p>
3551 <div class="refsect3">
3552-<a name="id-1.2.20.8.17.5"></a><h4>Parameters</h4>
3553+<a name="id-1.2.20.7.17.5"></a><h4>Parameters</h4>
3554 <div class="informaltable"><table width="100%" border="0">
3555 <colgroup>
3556 <col width="150px" class="parameters_name">
3557@@ -962,7 +956,7 @@
3558 xlib_rgb_get_cmap (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
3559 <p>Queries the X colormap that XlibRGB is using.</p>
3560 <div class="refsect3">
3561-<a name="id-1.2.20.8.18.5"></a><h4>Returns</h4>
3562+<a name="id-1.2.20.7.18.5"></a><h4>Returns</h4>
3563 <p> An X colormap.</p>
3564 <p></p>
3565 </div>
3566@@ -974,7 +968,7 @@
3567 xlib_rgb_get_visual (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
3568 <p>Queries the visual that XlibRGB is using.</p>
3569 <div class="refsect3">
3570-<a name="id-1.2.20.8.19.5"></a><h4>Returns</h4>
3571+<a name="id-1.2.20.7.19.5"></a><h4>Returns</h4>
3572 <p> An X visual.</p>
3573 <p></p>
3574 </div>
3575@@ -986,7 +980,7 @@
3576 xlib_rgb_get_visual_info (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
3577 <p>Queries the visual info structure for the visual that XlibRGB is using.</p>
3578 <div class="refsect3">
3579-<a name="id-1.2.20.8.20.5"></a><h4>Returns</h4>
3580+<a name="id-1.2.20.7.20.5"></a><h4>Returns</h4>
3581 <p> An XVisualInfo structure.</p>
3582 <p></p>
3583 </div>
3584@@ -998,7 +992,7 @@
3585 xlib_rgb_get_depth (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
3586 <p>Queries the depth of the visual that XlibRGB is using.</p>
3587 <div class="refsect3">
3588-<a name="id-1.2.20.8.21.5"></a><h4>Returns</h4>
3589+<a name="id-1.2.20.7.21.5"></a><h4>Returns</h4>
3590 <p> Bit depth.</p>
3591 <p></p>
3592 </div>
3593@@ -1010,7 +1004,7 @@
3594 xlib_rgb_get_display (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
3595 <p>Queries the X display that XlibRGB is using.</p>
3596 <div class="refsect3">
3597-<a name="id-1.2.20.8.22.5"></a><h4>Returns</h4>
3598+<a name="id-1.2.20.7.22.5"></a><h4>Returns</h4>
3599 <p> An X display.</p>
3600 <p></p>
3601 </div>
3602@@ -1022,7 +1016,7 @@
3603 xlib_rgb_get_screen (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
3604 <p>Queries the screen that XlibRGB is using.</p>
3605 <div class="refsect3">
3606-<a name="id-1.2.20.8.23.5"></a><h4>Returns</h4>
3607+<a name="id-1.2.20.7.23.5"></a><h4>Returns</h4>
3608 <p> An X screen.</p>
3609 <p></p>
3610 </div>
3611@@ -1039,7 +1033,7 @@
3612 </pre>
3613 <p>FIXME: Describe this.</p>
3614 <div class="refsect3">
3615-<a name="id-1.2.20.9.2.5"></a><h4>Members</h4>
3616+<a name="id-1.2.20.8.2.5"></a><h4>Members</h4>
3617 <div class="informaltable"><table width="100%" border="0">
3618 <colgroup>
3619 <col width="300px" class="struct_members_name">
3620@@ -1071,10 +1065,10 @@
3621 &lt;symbol&gt;XLIB_RGB_DITHER_NORMAL&lt;/symbol&gt; will provide dithering
3622 only on pseudocolor displays.
3623 &lt;symbol&gt;XLIB_RGB_DITHER_MAX&lt;/symbol&gt; will provide dithering on
3624-pseudocolor and 16-bit truecolor or &amp;ldquo;high color&amp;rdquo;
3625+pseudocolor and 16-bit truecolor or “high color”
3626 displays.</p>
3627 <div class="refsect3">
3628-<a name="id-1.2.20.9.3.4"></a><h4>Members</h4>
3629+<a name="id-1.2.20.8.3.4"></a><h4>Members</h4>
3630 <div class="informaltable"><table width="100%" border="0">
3631 <colgroup>
3632 <col width="300px" class="enum_members_name">
3633@@ -1116,6 +1110,6 @@
3634 </div>
3635 <div class="footer">
3636 <hr>
3637- Generated by GTK-Doc V1.20</div>
3638+ Generated by GTK-Doc V1.20.1</div>
3639 </body>
3640 </html>
3641\ No newline at end of file
3642
3643=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-csource.html'
3644--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-csource.html 2014-04-23 15:46:48 +0000
3645+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-csource.html 2014-08-24 22:11:39 +0000
3646@@ -8,11 +8,11 @@
3647 <link rel="up" href="rn02.html" title="Tools Reference">
3648 <link rel="prev" href="rn02.html" title="Tools Reference">
3649 <link rel="next" href="gdk-pixbuf-query-loaders.html" title="gdk-pixbuf-query-loaders">
3650-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
3651+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
3652 <link rel="stylesheet" href="style.css" type="text/css">
3653 </head>
3654 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
3655-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
3656+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
3657 <td width="100%" align="left" class="shortcuts"></td>
3658 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
3659 <td><a accesskey="u" href="rn02.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
3660@@ -162,6 +162,6 @@
3661 </div>
3662 <div class="footer">
3663 <hr>
3664- Generated by GTK-Doc V1.20</div>
3665+ Generated by GTK-Doc V1.20.1</div>
3666 </body>
3667 </html>
3668\ No newline at end of file
3669
3670=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html'
3671--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html 2014-03-31 17:15:34 +0000
3672+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html 2014-08-24 22:11:39 +0000
3673@@ -8,15 +8,14 @@
3674 <link rel="up" href="rn01.html" title="API Reference">
3675 <link rel="prev" href="gdk-pixbuf-Module-Interface.html" title="Module Interface">
3676 <link rel="next" href="gdk-pixbuf-Xlib-Rendering.html" title="Xlib Rendering">
3677-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
3678+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
3679 <link rel="stylesheet" href="style.css" type="text/css">
3680 </head>
3681 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
3682-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
3683+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
3684 <td width="100%" align="left" class="shortcuts">
3685-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
3686- <a href="#gdk-pixbuf-gdk-pixbuf-Xlib-initialization.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
3687- <a href="#gdk-pixbuf-gdk-pixbuf-Xlib-initialization.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
3688+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
3689+ <a href="#gdk-pixbuf-gdk-pixbuf-Xlib-initialization.description" class="shortcut">Description</a></span>
3690 </td>
3691 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
3692 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
3693@@ -60,11 +59,6 @@
3694 </table></div>
3695 </div>
3696 <div class="refsect1">
3697-<a name="gdk-pixbuf-gdk-pixbuf-Xlib-initialization.object-hierarchy"></a><h2>Object Hierarchy</h2>
3698-<pre class="screen">
3699-</pre>
3700-</div>
3701-<div class="refsect1">
3702 <a name="gdk-pixbuf-gdk-pixbuf-Xlib-initialization.includes"></a><h2>Includes</h2>
3703 <pre class="synopsis">#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;
3704 </pre>
3705@@ -90,7 +84,7 @@
3706 function should be called near the beginning of your program, or before using
3707 any of the gdk-pixbuf-xlib functions.</p>
3708 <div class="refsect3">
3709-<a name="id-1.2.17.7.2.5"></a><h4>Parameters</h4>
3710+<a name="id-1.2.17.6.2.5"></a><h4>Parameters</h4>
3711 <div class="informaltable"><table width="100%" border="0">
3712 <colgroup>
3713 <col width="150px" class="parameters_name">
3714@@ -122,7 +116,7 @@
3715 <p>Similar to <a class="link" href="gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html#gdk-pixbuf-xlib-init" title="gdk_pixbuf_xlib_init ()"><code class="function">gdk_pixbuf_xlib_init()</code></a>, but also lets you specify the preferred
3716 depth for XlibRGB if you do not want it to use the default depth it picks.</p>
3717 <div class="refsect3">
3718-<a name="id-1.2.17.7.3.5"></a><h4>Parameters</h4>
3719+<a name="id-1.2.17.6.3.5"></a><h4>Parameters</h4>
3720 <div class="informaltable"><table width="100%" border="0">
3721 <colgroup>
3722 <col width="150px" class="parameters_name">
3723@@ -160,6 +154,6 @@
3724 </div>
3725 <div class="footer">
3726 <hr>
3727- Generated by GTK-Doc V1.20</div>
3728+ Generated by GTK-Doc V1.20.1</div>
3729 </body>
3730 </html>
3731\ No newline at end of file
3732
3733=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-gdk-pixbuf-from-drawables.html'
3734--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-gdk-pixbuf-from-drawables.html 2014-04-23 15:46:48 +0000
3735+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-gdk-pixbuf-from-drawables.html 2014-08-24 22:11:39 +0000
3736@@ -8,11 +8,11 @@
3737 <link rel="up" href="rn01.html" title="API Reference">
3738 <link rel="prev" href="gdk-pixbuf-gdk-pixbuf-rendering.html" title="Rendering">
3739 <link rel="next" href="gdk-pixbuf-Utilities.html" title="Utilities">
3740-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
3741+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
3742 <link rel="stylesheet" href="style.css" type="text/css">
3743 </head>
3744 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
3745-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
3746+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
3747 <td width="100%" align="left" class="shortcuts"></td>
3748 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
3749 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
3750@@ -40,6 +40,6 @@
3751 </div>
3752 <div class="footer">
3753 <hr>
3754- Generated by GTK-Doc V1.20</div>
3755+ Generated by GTK-Doc V1.20.1</div>
3756 </body>
3757 </html>
3758\ No newline at end of file
3759
3760=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-gdk-pixbuf-rendering.html'
3761--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-gdk-pixbuf-rendering.html 2014-04-23 15:46:48 +0000
3762+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-gdk-pixbuf-rendering.html 2014-08-24 22:11:39 +0000
3763@@ -8,11 +8,11 @@
3764 <link rel="up" href="rn01.html" title="API Reference">
3765 <link rel="prev" href="gdk-pixbuf-Scaling.html" title="Scaling">
3766 <link rel="next" href="gdk-pixbuf-gdk-pixbuf-from-drawables.html" title="Drawables to Pixbufs">
3767-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
3768+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
3769 <link rel="stylesheet" href="style.css" type="text/css">
3770 </head>
3771 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
3772-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
3773+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
3774 <td width="100%" align="left" class="shortcuts"></td>
3775 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
3776 <td><a accesskey="u" href="rn01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
3777@@ -39,6 +39,6 @@
3778 </div>
3779 <div class="footer">
3780 <hr>
3781- Generated by GTK-Doc V1.20</div>
3782+ Generated by GTK-Doc V1.20.1</div>
3783 </body>
3784 </html>
3785\ No newline at end of file
3786
3787=== modified file 'docs/reference/gdk-pixbuf/html/gdk-pixbuf-query-loaders.html'
3788--- docs/reference/gdk-pixbuf/html/gdk-pixbuf-query-loaders.html 2014-04-23 15:46:48 +0000
3789+++ docs/reference/gdk-pixbuf/html/gdk-pixbuf-query-loaders.html 2014-08-24 22:11:39 +0000
3790@@ -8,11 +8,11 @@
3791 <link rel="up" href="rn02.html" title="Tools Reference">
3792 <link rel="prev" href="gdk-pixbuf-csource.html" title="gdk-pixbuf-csource">
3793 <link rel="next" href="api-index-full.html" title="Index of all symbols">
3794-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
3795+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
3796 <link rel="stylesheet" href="style.css" type="text/css">
3797 </head>
3798 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
3799-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
3800+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
3801 <td width="100%" align="left" class="shortcuts"></td>
3802 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
3803 <td><a accesskey="u" href="rn02.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
3804@@ -80,6 +80,6 @@
3805 </div>
3806 <div class="footer">
3807 <hr>
3808- Generated by GTK-Doc V1.20</div>
3809+ Generated by GTK-Doc V1.20.1</div>
3810 </body>
3811 </html>
3812\ No newline at end of file
3813
3814=== modified file 'docs/reference/gdk-pixbuf/html/index.html'
3815--- docs/reference/gdk-pixbuf/html/index.html 2014-04-23 15:46:48 +0000
3816+++ docs/reference/gdk-pixbuf/html/index.html 2014-08-24 22:11:39 +0000
3817@@ -6,7 +6,7 @@
3818 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
3819 <link rel="home" href="index.html" title="GDK-PixBuf Reference Manual">
3820 <link rel="next" href="rn01.html" title="API Reference">
3821-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
3822+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
3823 <link rel="stylesheet" href="style.css" type="text/css">
3824 </head>
3825 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
3826@@ -23,7 +23,7 @@
3827   </p></div></div>
3828 </div></div></div>
3829 <div><p class="releaseinfo">
3830- Version 2.30.7
3831+ Version 2.30.8
3832
3833 The latest version of this documentation can be found on-line at
3834 <a class="ulink" href="http://library.gnome.org/devel/gdk-pixbuf/unstable/" target="_top">http://library.gnome.org/devel/gdk-pixbuf/unstable/</a>.
3835@@ -145,6 +145,6 @@
3836 </div>
3837 <div class="footer">
3838 <hr>
3839- Generated by GTK-Doc V1.20</div>
3840+ Generated by GTK-Doc V1.20.1</div>
3841 </body>
3842 </html>
3843\ No newline at end of file
3844
3845=== modified file 'docs/reference/gdk-pixbuf/html/index.sgml'
3846--- docs/reference/gdk-pixbuf/html/index.sgml 2014-03-31 17:15:34 +0000
3847+++ docs/reference/gdk-pixbuf/html/index.sgml 2014-08-24 22:11:39 +0000
3848@@ -2,7 +2,6 @@
3849 <ANCHOR id="gdk-pixbuf-Versioning" href="gdk-pixbuf/gdk-pixbuf-Versioning.html">
3850 <ANCHOR id="gdk-pixbuf-Versioning.functions" href="gdk-pixbuf/gdk-pixbuf-Versioning.html#gdk-pixbuf-Versioning.functions">
3851 <ANCHOR id="gdk-pixbuf-Versioning.other" href="gdk-pixbuf/gdk-pixbuf-Versioning.html#gdk-pixbuf-Versioning.other">
3852-<ANCHOR id="gdk-pixbuf-Versioning.object-hierarchy" href="gdk-pixbuf/gdk-pixbuf-Versioning.html#gdk-pixbuf-Versioning.object-hierarchy">
3853 <ANCHOR id="gdk-pixbuf-Versioning.includes" href="gdk-pixbuf/gdk-pixbuf-Versioning.html#gdk-pixbuf-Versioning.includes">
3854 <ANCHOR id="gdk-pixbuf-Versioning.description" href="gdk-pixbuf/gdk-pixbuf-Versioning.html#gdk-pixbuf-Versioning.description">
3855 <ANCHOR id="gdk-pixbuf-Versioning.functions_details" href="gdk-pixbuf/gdk-pixbuf-Versioning.html#gdk-pixbuf-Versioning.functions_details">
3856@@ -53,7 +52,6 @@
3857 <ANCHOR id="GdkPixbuf--width" href="gdk-pixbuf/gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf--width">
3858 <ANCHOR id="gdk-pixbuf-Reference-Counting-and-Memory-Mangement" href="gdk-pixbuf/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html">
3859 <ANCHOR id="gdk-pixbuf-Reference-Counting-and-Memory-Mangement.functions" href="gdk-pixbuf/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html#gdk-pixbuf-Reference-Counting-and-Memory-Mangement.functions">
3860-<ANCHOR id="gdk-pixbuf-Reference-Counting-and-Memory-Mangement.object-hierarchy" href="gdk-pixbuf/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html#gdk-pixbuf-Reference-Counting-and-Memory-Mangement.object-hierarchy">
3861 <ANCHOR id="gdk-pixbuf-Reference-Counting-and-Memory-Mangement.includes" href="gdk-pixbuf/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html#gdk-pixbuf-Reference-Counting-and-Memory-Mangement.includes">
3862 <ANCHOR id="gdk-pixbuf-Reference-Counting-and-Memory-Mangement.description" href="gdk-pixbuf/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html#gdk-pixbuf-Reference-Counting-and-Memory-Mangement.description">
3863 <ANCHOR id="gdk-pixbuf-Reference-Counting-and-Memory-Mangement.functions_details" href="gdk-pixbuf/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html#gdk-pixbuf-Reference-Counting-and-Memory-Mangement.functions_details">
3864@@ -64,7 +62,6 @@
3865 <ANCHOR id="gdk-pixbuf-Reference-Counting-and-Memory-Mangement.see-also" href="gdk-pixbuf/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html#gdk-pixbuf-Reference-Counting-and-Memory-Mangement.see-also">
3866 <ANCHOR id="gdk-pixbuf-File-Loading" href="gdk-pixbuf/gdk-pixbuf-File-Loading.html">
3867 <ANCHOR id="gdk-pixbuf-File-Loading.functions" href="gdk-pixbuf/gdk-pixbuf-File-Loading.html#gdk-pixbuf-File-Loading.functions">
3868-<ANCHOR id="gdk-pixbuf-File-Loading.object-hierarchy" href="gdk-pixbuf/gdk-pixbuf-File-Loading.html#gdk-pixbuf-File-Loading.object-hierarchy">
3869 <ANCHOR id="gdk-pixbuf-File-Loading.includes" href="gdk-pixbuf/gdk-pixbuf-File-Loading.html#gdk-pixbuf-File-Loading.includes">
3870 <ANCHOR id="gdk-pixbuf-File-Loading.description" href="gdk-pixbuf/gdk-pixbuf-File-Loading.html#gdk-pixbuf-File-Loading.description">
3871 <ANCHOR id="gdk-pixbuf-File-Loading.functions_details" href="gdk-pixbuf/gdk-pixbuf-File-Loading.html#gdk-pixbuf-File-Loading.functions_details">
3872@@ -83,7 +80,6 @@
3873 <ANCHOR id="gdk-pixbuf-File-Loading.see-also" href="gdk-pixbuf/gdk-pixbuf-File-Loading.html#gdk-pixbuf-File-Loading.see-also">
3874 <ANCHOR id="gdk-pixbuf-File-saving" href="gdk-pixbuf/gdk-pixbuf-File-saving.html">
3875 <ANCHOR id="gdk-pixbuf-File-saving.functions" href="gdk-pixbuf/gdk-pixbuf-File-saving.html#gdk-pixbuf-File-saving.functions">
3876-<ANCHOR id="gdk-pixbuf-File-saving.object-hierarchy" href="gdk-pixbuf/gdk-pixbuf-File-saving.html#gdk-pixbuf-File-saving.object-hierarchy">
3877 <ANCHOR id="gdk-pixbuf-File-saving.includes" href="gdk-pixbuf/gdk-pixbuf-File-saving.html#gdk-pixbuf-File-saving.includes">
3878 <ANCHOR id="gdk-pixbuf-File-saving.description" href="gdk-pixbuf/gdk-pixbuf-File-saving.html#gdk-pixbuf-File-saving.description">
3879 <ANCHOR id="gdk-pixbuf-File-saving.functions_details" href="gdk-pixbuf/gdk-pixbuf-File-saving.html#gdk-pixbuf-File-saving.functions_details">
3880@@ -100,7 +96,6 @@
3881 <ANCHOR id="gdk-pixbuf-File-saving.other_details" href="gdk-pixbuf/gdk-pixbuf-File-saving.html#gdk-pixbuf-File-saving.other_details">
3882 <ANCHOR id="gdk-pixbuf-Image-Data-in-Memory" href="gdk-pixbuf/gdk-pixbuf-Image-Data-in-Memory.html">
3883 <ANCHOR id="gdk-pixbuf-Image-Data-in-Memory.functions" href="gdk-pixbuf/gdk-pixbuf-Image-Data-in-Memory.html#gdk-pixbuf-Image-Data-in-Memory.functions">
3884-<ANCHOR id="gdk-pixbuf-Image-Data-in-Memory.object-hierarchy" href="gdk-pixbuf/gdk-pixbuf-Image-Data-in-Memory.html#gdk-pixbuf-Image-Data-in-Memory.object-hierarchy">
3885 <ANCHOR id="gdk-pixbuf-Image-Data-in-Memory.includes" href="gdk-pixbuf/gdk-pixbuf-Image-Data-in-Memory.html#gdk-pixbuf-Image-Data-in-Memory.includes">
3886 <ANCHOR id="gdk-pixbuf-Image-Data-in-Memory.description" href="gdk-pixbuf/gdk-pixbuf-Image-Data-in-Memory.html#gdk-pixbuf-Image-Data-in-Memory.description">
3887 <ANCHOR id="gdk-pixbuf-Image-Data-in-Memory.functions_details" href="gdk-pixbuf/gdk-pixbuf-Image-Data-in-Memory.html#gdk-pixbuf-Image-Data-in-Memory.functions_details">
3888@@ -115,7 +110,6 @@
3889 <ANCHOR id="gdk-pixbuf-Inline-data" href="gdk-pixbuf/gdk-pixbuf-Inline-data.html">
3890 <ANCHOR id="gdk-pixbuf-Inline-data.functions" href="gdk-pixbuf/gdk-pixbuf-Inline-data.html#gdk-pixbuf-Inline-data.functions">
3891 <ANCHOR id="gdk-pixbuf-Inline-data.other" href="gdk-pixbuf/gdk-pixbuf-Inline-data.html#gdk-pixbuf-Inline-data.other">
3892-<ANCHOR id="gdk-pixbuf-Inline-data.object-hierarchy" href="gdk-pixbuf/gdk-pixbuf-Inline-data.html#gdk-pixbuf-Inline-data.object-hierarchy">
3893 <ANCHOR id="gdk-pixbuf-Inline-data.includes" href="gdk-pixbuf/gdk-pixbuf-Inline-data.html#gdk-pixbuf-Inline-data.includes">
3894 <ANCHOR id="gdk-pixbuf-Inline-data.description" href="gdk-pixbuf/gdk-pixbuf-Inline-data.html#gdk-pixbuf-Inline-data.description">
3895 <ANCHOR id="gdk-pixbuf-Inline-data.functions_details" href="gdk-pixbuf/gdk-pixbuf-Inline-data.html#gdk-pixbuf-Inline-data.functions_details">
3896@@ -133,7 +127,6 @@
3897 <ANCHOR id="gdk-pixbuf-Scaling" href="gdk-pixbuf/gdk-pixbuf-Scaling.html">
3898 <ANCHOR id="gdk-pixbuf-Scaling.functions" href="gdk-pixbuf/gdk-pixbuf-Scaling.html#gdk-pixbuf-Scaling.functions">
3899 <ANCHOR id="gdk-pixbuf-Scaling.other" href="gdk-pixbuf/gdk-pixbuf-Scaling.html#gdk-pixbuf-Scaling.other">
3900-<ANCHOR id="gdk-pixbuf-Scaling.object-hierarchy" href="gdk-pixbuf/gdk-pixbuf-Scaling.html#gdk-pixbuf-Scaling.object-hierarchy">
3901 <ANCHOR id="gdk-pixbuf-Scaling.includes" href="gdk-pixbuf/gdk-pixbuf-Scaling.html#gdk-pixbuf-Scaling.includes">
3902 <ANCHOR id="gdk-pixbuf-Scaling.description" href="gdk-pixbuf/gdk-pixbuf-Scaling.html#gdk-pixbuf-Scaling.description">
3903 <ANCHOR id="gdk-pixbuf-Scaling.functions_details" href="gdk-pixbuf/gdk-pixbuf-Scaling.html#gdk-pixbuf-Scaling.functions_details">
3904@@ -152,7 +145,6 @@
3905 <ANCHOR id="gdk-pixbuf-gdk-pixbuf-from-drawables" href="gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-from-drawables.html">
3906 <ANCHOR id="gdk-pixbuf-Utilities" href="gdk-pixbuf/gdk-pixbuf-Utilities.html">
3907 <ANCHOR id="gdk-pixbuf-Utilities.functions" href="gdk-pixbuf/gdk-pixbuf-Utilities.html#gdk-pixbuf-Utilities.functions">
3908-<ANCHOR id="gdk-pixbuf-Utilities.object-hierarchy" href="gdk-pixbuf/gdk-pixbuf-Utilities.html#gdk-pixbuf-Utilities.object-hierarchy">
3909 <ANCHOR id="gdk-pixbuf-Utilities.includes" href="gdk-pixbuf/gdk-pixbuf-Utilities.html#gdk-pixbuf-Utilities.includes">
3910 <ANCHOR id="gdk-pixbuf-Utilities.description" href="gdk-pixbuf/gdk-pixbuf-Utilities.html#gdk-pixbuf-Utilities.description">
3911 <ANCHOR id="gdk-pixbuf-Utilities.functions_details" href="gdk-pixbuf/gdk-pixbuf-Utilities.html#gdk-pixbuf-Utilities.functions_details">
3912@@ -230,7 +222,6 @@
3913 <ANCHOR id="gdk-pixbuf-Module-Interface" href="gdk-pixbuf/gdk-pixbuf-Module-Interface.html">
3914 <ANCHOR id="gdk-pixbuf-Module-Interface.functions" href="gdk-pixbuf/gdk-pixbuf-Module-Interface.html#gdk-pixbuf-Module-Interface.functions">
3915 <ANCHOR id="gdk-pixbuf-Module-Interface.other" href="gdk-pixbuf/gdk-pixbuf-Module-Interface.html#gdk-pixbuf-Module-Interface.other">
3916-<ANCHOR id="gdk-pixbuf-Module-Interface.object-hierarchy" href="gdk-pixbuf/gdk-pixbuf-Module-Interface.html#gdk-pixbuf-Module-Interface.object-hierarchy">
3917 <ANCHOR id="gdk-pixbuf-Module-Interface.includes" href="gdk-pixbuf/gdk-pixbuf-Module-Interface.html#gdk-pixbuf-Module-Interface.includes">
3918 <ANCHOR id="gdk-pixbuf-Module-Interface.description" href="gdk-pixbuf/gdk-pixbuf-Module-Interface.html#gdk-pixbuf-Module-Interface.description">
3919 <ANCHOR id="gdk-pixbuf-Module-Interface.functions_details" href="gdk-pixbuf/gdk-pixbuf-Module-Interface.html#gdk-pixbuf-Module-Interface.functions_details">
3920@@ -261,7 +252,6 @@
3921 <ANCHOR id="GdkPixbufAnimationIterClass" href="gdk-pixbuf/gdk-pixbuf-Module-Interface.html#GdkPixbufAnimationIterClass">
3922 <ANCHOR id="gdk-pixbuf-gdk-pixbuf-Xlib-initialization" href="gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html">
3923 <ANCHOR id="gdk-pixbuf-gdk-pixbuf-Xlib-initialization.functions" href="gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html#gdk-pixbuf-gdk-pixbuf-Xlib-initialization.functions">
3924-<ANCHOR id="gdk-pixbuf-gdk-pixbuf-Xlib-initialization.object-hierarchy" href="gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html#gdk-pixbuf-gdk-pixbuf-Xlib-initialization.object-hierarchy">
3925 <ANCHOR id="gdk-pixbuf-gdk-pixbuf-Xlib-initialization.includes" href="gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html#gdk-pixbuf-gdk-pixbuf-Xlib-initialization.includes">
3926 <ANCHOR id="gdk-pixbuf-gdk-pixbuf-Xlib-initialization.description" href="gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html#gdk-pixbuf-gdk-pixbuf-Xlib-initialization.description">
3927 <ANCHOR id="gdk-pixbuf-gdk-pixbuf-Xlib-initialization.functions_details" href="gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html#gdk-pixbuf-gdk-pixbuf-Xlib-initialization.functions_details">
3928@@ -271,7 +261,6 @@
3929 <ANCHOR id="gdk-pixbuf-gdk-pixbuf-Xlib-initialization.see-also" href="gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html#gdk-pixbuf-gdk-pixbuf-Xlib-initialization.see-also">
3930 <ANCHOR id="gdk-pixbuf-Xlib-Rendering" href="gdk-pixbuf/gdk-pixbuf-Xlib-Rendering.html">
3931 <ANCHOR id="gdk-pixbuf-Xlib-Rendering.functions" href="gdk-pixbuf/gdk-pixbuf-Xlib-Rendering.html#gdk-pixbuf-Xlib-Rendering.functions">
3932-<ANCHOR id="gdk-pixbuf-Xlib-Rendering.object-hierarchy" href="gdk-pixbuf/gdk-pixbuf-Xlib-Rendering.html#gdk-pixbuf-Xlib-Rendering.object-hierarchy">
3933 <ANCHOR id="gdk-pixbuf-Xlib-Rendering.includes" href="gdk-pixbuf/gdk-pixbuf-Xlib-Rendering.html#gdk-pixbuf-Xlib-Rendering.includes">
3934 <ANCHOR id="gdk-pixbuf-Xlib-Rendering.description" href="gdk-pixbuf/gdk-pixbuf-Xlib-Rendering.html#gdk-pixbuf-Xlib-Rendering.description">
3935 <ANCHOR id="gdk-pixbuf-Xlib-Rendering.functions_details" href="gdk-pixbuf/gdk-pixbuf-Xlib-Rendering.html#gdk-pixbuf-Xlib-Rendering.functions_details">
3936@@ -282,7 +271,6 @@
3937 <ANCHOR id="gdk-pixbuf-Xlib-Rendering.other_details" href="gdk-pixbuf/gdk-pixbuf-Xlib-Rendering.html#gdk-pixbuf-Xlib-Rendering.other_details">
3938 <ANCHOR id="gdk-pixbuf-X-Drawables-to-Pixbufs" href="gdk-pixbuf/gdk-pixbuf-X-Drawables-to-Pixbufs.html">
3939 <ANCHOR id="gdk-pixbuf-X-Drawables-to-Pixbufs.functions" href="gdk-pixbuf/gdk-pixbuf-X-Drawables-to-Pixbufs.html#gdk-pixbuf-X-Drawables-to-Pixbufs.functions">
3940-<ANCHOR id="gdk-pixbuf-X-Drawables-to-Pixbufs.object-hierarchy" href="gdk-pixbuf/gdk-pixbuf-X-Drawables-to-Pixbufs.html#gdk-pixbuf-X-Drawables-to-Pixbufs.object-hierarchy">
3941 <ANCHOR id="gdk-pixbuf-X-Drawables-to-Pixbufs.includes" href="gdk-pixbuf/gdk-pixbuf-X-Drawables-to-Pixbufs.html#gdk-pixbuf-X-Drawables-to-Pixbufs.includes">
3942 <ANCHOR id="gdk-pixbuf-X-Drawables-to-Pixbufs.description" href="gdk-pixbuf/gdk-pixbuf-X-Drawables-to-Pixbufs.html#gdk-pixbuf-X-Drawables-to-Pixbufs.description">
3943 <ANCHOR id="gdk-pixbuf-X-Drawables-to-Pixbufs.functions_details" href="gdk-pixbuf/gdk-pixbuf-X-Drawables-to-Pixbufs.html#gdk-pixbuf-X-Drawables-to-Pixbufs.functions_details">
3944@@ -291,7 +279,6 @@
3945 <ANCHOR id="gdk-pixbuf-XlibRGB" href="gdk-pixbuf/gdk-pixbuf-XlibRGB.html">
3946 <ANCHOR id="gdk-pixbuf-XlibRGB.functions" href="gdk-pixbuf/gdk-pixbuf-XlibRGB.html#gdk-pixbuf-XlibRGB.functions">
3947 <ANCHOR id="gdk-pixbuf-XlibRGB.other" href="gdk-pixbuf/gdk-pixbuf-XlibRGB.html#gdk-pixbuf-XlibRGB.other">
3948-<ANCHOR id="gdk-pixbuf-XlibRGB.object-hierarchy" href="gdk-pixbuf/gdk-pixbuf-XlibRGB.html#gdk-pixbuf-XlibRGB.object-hierarchy">
3949 <ANCHOR id="gdk-pixbuf-XlibRGB.includes" href="gdk-pixbuf/gdk-pixbuf-XlibRGB.html#gdk-pixbuf-XlibRGB.includes">
3950 <ANCHOR id="gdk-pixbuf-XlibRGB.description" href="gdk-pixbuf/gdk-pixbuf-XlibRGB.html#gdk-pixbuf-XlibRGB.description">
3951 <ANCHOR id="gdk-pixbuf-XlibRGB.functions_details" href="gdk-pixbuf/gdk-pixbuf-XlibRGB.html#gdk-pixbuf-XlibRGB.functions_details">
3952
3953=== modified file 'docs/reference/gdk-pixbuf/html/license.html'
3954--- docs/reference/gdk-pixbuf/html/license.html 2014-04-23 15:46:48 +0000
3955+++ docs/reference/gdk-pixbuf/html/license.html 2014-08-24 22:11:39 +0000
3956@@ -8,11 +8,11 @@
3957 <link rel="up" href="index.html" title="GDK-PixBuf Reference Manual">
3958 <link rel="prev" href="api-index-2-30.html" title="Index of new symbols in 2.30">
3959 <link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
3960-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
3961+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
3962 <link rel="stylesheet" href="style.css" type="text/css">
3963 </head>
3964 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
3965-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
3966+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
3967 <td width="100%" align="left" class="shortcuts"></td>
3968 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
3969 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
3970@@ -54,6 +54,6 @@
3971 </div>
3972 <div class="footer">
3973 <hr>
3974- Generated by GTK-Doc V1.20</div>
3975+ Generated by GTK-Doc V1.20.1</div>
3976 </body>
3977 </html>
3978\ No newline at end of file
3979
3980=== modified file 'docs/reference/gdk-pixbuf/html/rn01.html'
3981--- docs/reference/gdk-pixbuf/html/rn01.html 2014-04-23 15:46:48 +0000
3982+++ docs/reference/gdk-pixbuf/html/rn01.html 2014-08-24 22:11:39 +0000
3983@@ -8,11 +8,11 @@
3984 <link rel="up" href="index.html" title="GDK-PixBuf Reference Manual">
3985 <link rel="prev" href="index.html" title="GDK-PixBuf Reference Manual">
3986 <link rel="next" href="gdk-pixbuf-Versioning.html" title="Initialization and Versions">
3987-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
3988+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
3989 <link rel="stylesheet" href="style.css" type="text/css">
3990 </head>
3991 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
3992-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
3993+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
3994 <td width="100%" align="left" class="shortcuts"></td>
3995 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
3996 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
3997@@ -96,6 +96,6 @@
3998 </div>
3999 <div class="footer">
4000 <hr>
4001- Generated by GTK-Doc V1.20</div>
4002+ Generated by GTK-Doc V1.20.1</div>
4003 </body>
4004 </html>
4005\ No newline at end of file
4006
4007=== modified file 'docs/reference/gdk-pixbuf/html/rn02.html'
4008--- docs/reference/gdk-pixbuf/html/rn02.html 2014-04-23 15:46:48 +0000
4009+++ docs/reference/gdk-pixbuf/html/rn02.html 2014-08-24 22:11:39 +0000
4010@@ -8,11 +8,11 @@
4011 <link rel="up" href="index.html" title="GDK-PixBuf Reference Manual">
4012 <link rel="prev" href="gdk-pixbuf-XlibRGB.html" title="XlibRGB">
4013 <link rel="next" href="gdk-pixbuf-csource.html" title="gdk-pixbuf-csource">
4014-<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
4015+<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
4016 <link rel="stylesheet" href="style.css" type="text/css">
4017 </head>
4018 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
4019-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
4020+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
4021 <td width="100%" align="left" class="shortcuts"></td>
4022 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
4023 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
4024@@ -45,6 +45,6 @@
4025 </div>
4026 <div class="footer">
4027 <hr>
4028- Generated by GTK-Doc V1.20</div>
4029+ Generated by GTK-Doc V1.20.1</div>
4030 </body>
4031 </html>
4032\ No newline at end of file
4033
4034=== modified file 'docs/reference/gdk-pixbuf/html/style.css'
4035--- docs/reference/gdk-pixbuf/html/style.css 2014-03-31 17:15:34 +0000
4036+++ docs/reference/gdk-pixbuf/html/style.css 2014-08-24 22:11:39 +0000
4037@@ -30,127 +30,6 @@
4038 vertical-align: top;
4039 }
4040
4041-@media screen {
4042- sup a.footnote
4043- {
4044- position: relative;
4045- top: 0em ! important;
4046- }
4047- /* this is needed so that the local anchors are displayed below the naviagtion */
4048- div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
4049- {
4050- display: inline-block;
4051- position: relative;
4052- top:-5em;
4053- }
4054- /* this seems to be a bug in the xsl style sheets when generating indexes */
4055- div.index div.index
4056- {
4057- top: 0em;
4058- }
4059- /* make space for the fixed navigation bar and add space at the bottom so that
4060- * link targets appear somewhat close to top
4061- */
4062- body
4063- {
4064- padding-top: 5em;
4065- padding-bottom: 500px;
4066- max-width: 60em;
4067- }
4068- p
4069- {
4070- max-width: 60em;
4071- }
4072- /* style and size the navigation bar */
4073- table.navigation#top
4074- {
4075- position: fixed;
4076- background: #e2e2e2;
4077- border-bottom: solid 1px #babdb6;
4078- margin-top: 0;
4079- margin-bottom: 0;
4080- top: 0;
4081- left: 0;
4082- height: 3em;
4083- z-index: 10;
4084- }
4085- .navigation a, .navigation a:visited
4086- {
4087- /* tango:sky blue 3 */
4088- color: #204a87;
4089- }
4090- .navigation a:hover
4091- {
4092- /* tango:sky blue 2 */
4093- color: #3465a4;
4094- }
4095- td.shortcuts
4096- {
4097- /* tango:sky blue 2 */
4098- color: #3465a4;
4099- font-size: 80%;
4100- white-space: nowrap;
4101- }
4102- td.shortcuts .dim
4103- {
4104- color: #babdb6;
4105- }
4106-}
4107-@media screen and (min-width: 60em) {
4108- /* screen larger than 60em */
4109- body { margin: auto; }
4110-}
4111-@media screen and (max-width: 60em) {
4112- /* screen less than 60em */
4113- #nav_hierarchy { display: none; }
4114- #nav_interfaces { display: none; }
4115- #nav_prerequisites { display: none; }
4116- #nav_derived_interfaces { display: none; }
4117- #nav_implementations { display: none; }
4118- #nav_child_properties { display: none; }
4119- #nav_style_properties { display: none; }
4120- #nav_index { display: none; }
4121- #nav_glossary { display: none; }
4122- .gallery_image { display: none; }
4123- .property_flags { display: none; }
4124- .signal_flags { display: none; }
4125- .parameter_annotations { display: none; }
4126- .enum_member_annotations { display: none; }
4127- .struct_member_annotations { display: none; }
4128- .union_member_annotations { display: none; }
4129- /* now that a column is hidden, optimize space */
4130- col.parameters_name { width: auto; }
4131- col.parameters_description { width: auto; }
4132- col.struct_members_name { width: auto; }
4133- col.struct_members_description { width: auto; }
4134- col.enum_members_name { width: auto; }
4135- col.enum_members_description { width: auto; }
4136- col.union_members_name { width: auto; }
4137- col.union_members_description { width: auto; }
4138-}
4139-@media print {
4140- table.navigation {
4141- visibility: collapse;
4142- display: none;
4143- }
4144- div.titlepage table.navigation {
4145- visibility: visible;
4146- display: table;
4147- background: #e2e2e2;
4148- border: solid 1px #babdb6;
4149- margin-top: 0;
4150- margin-bottom: 0;
4151- top: 0;
4152- left: 0;
4153- height: 3em;
4154- }
4155-}
4156-
4157-.navigation .title
4158-{
4159- font-size: 120%;
4160-}
4161-
4162 div.gallery-float
4163 {
4164 float: left;
4165@@ -181,7 +60,7 @@
4166 div.informaltable table
4167 {
4168 border-collapse: separate;
4169- border-spacing: 20px 3px;
4170+ border-spacing: 1em 0.5em;
4171 border: none;
4172 }
4173
4174@@ -239,6 +118,11 @@
4175 color: #729fcf;
4176 }
4177
4178+td p
4179+{
4180+ margin: 0.25em;
4181+}
4182+
4183 div.table table
4184 {
4185 border-collapse: collapse;
4186@@ -404,21 +288,28 @@
4187 font-weight: normal;
4188 }
4189
4190+acronym,abbr
4191+{
4192+ border-bottom: 1px dotted gray;
4193+}
4194+
4195 /* code listings */
4196
4197-.listing_code .programlisting .cbracket { color: #a40000; } /* tango: scarlet red 3 */
4198-.listing_code .programlisting .comment { color: #a1a39d; } /* tango: aluminium 4 */
4199-.listing_code .programlisting .function { color: #000000; font-weight: bold; }
4200-.listing_code .programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */
4201-.listing_code .programlisting .keyword { color: #4e9a06; } /* tango: chameleon 3 */
4202+.listing_code .programlisting .normal,
4203+.listing_code .programlisting .normal a,
4204+.listing_code .programlisting .number,
4205+.listing_code .programlisting .cbracket,
4206+.listing_code .programlisting .symbol { color: #555753; }
4207+.listing_code .programlisting .comment,
4208 .listing_code .programlisting .linenum { color: #babdb6; } /* tango: aluminium 3 */
4209-.listing_code .programlisting .normal { color: #000000; }
4210-.listing_code .programlisting .number { color: #75507b; } /* tango: plum 2 */
4211+.listing_code .programlisting .function,
4212+.listing_code .programlisting .function a,
4213 .listing_code .programlisting .preproc { color: #204a87; } /* tango: sky blue 3 */
4214-.listing_code .programlisting .string { color: #c17d11; } /* tango: chocolate 2 */
4215-.listing_code .programlisting .type { color: #000000; }
4216-.listing_code .programlisting .type a { color: #11326b; } /* tango: sky blue 4 */
4217-.listing_code .programlisting .symbol { color: #ce5c00; } /* tango: orange 3 */
4218+.listing_code .programlisting .string { color: #ad7fa8; } /* tango: plum */
4219+.listing_code .programlisting .keyword,
4220+.listing_code .programlisting .usertype,
4221+.listing_code .programlisting .type,
4222+.listing_code .programlisting .type a { color: #4e9a06; } /* tango: chameleon 3 */
4223
4224 .listing_frame {
4225 /* tango:sky blue 1 */
4226@@ -433,11 +324,6 @@
4227 padding: 0.5em;
4228 }
4229 .listing_lines {
4230- /* this just adds visual clutter and
4231- takes precious room from small screens */
4232- display: none;
4233-}
4234-.listing_lines {
4235 /* tango:sky blue 0.5 */
4236 background: #a6c5e3;
4237 background: rgba(114, 159, 207, 0.2);
4238@@ -459,3 +345,132 @@
4239 margin: 0px;
4240 }
4241
4242+@media screen {
4243+ sup a.footnote
4244+ {
4245+ position: relative;
4246+ top: 0em ! important;
4247+ }
4248+ /* this is needed so that the local anchors are displayed below the naviagtion */
4249+ div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
4250+ {
4251+ display: inline-block;
4252+ position: relative;
4253+ top:-5em;
4254+ }
4255+ /* this seems to be a bug in the xsl style sheets when generating indexes */
4256+ div.index div.index
4257+ {
4258+ top: 0em;
4259+ }
4260+ /* make space for the fixed navigation bar and add space at the bottom so that
4261+ * link targets appear somewhat close to top
4262+ */
4263+ body
4264+ {
4265+ padding-top: 2.5em;
4266+ padding-bottom: 500px;
4267+ max-width: 60em;
4268+ }
4269+ p
4270+ {
4271+ max-width: 60em;
4272+ }
4273+ /* style and size the navigation bar */
4274+ table.navigation#top
4275+ {
4276+ position: fixed;
4277+ background: #e2e2e2;
4278+ border-bottom: solid 1px #babdb6;
4279+ border-spacing: 5px;
4280+ margin-top: 0;
4281+ margin-bottom: 0;
4282+ top: 0;
4283+ left: 0;
4284+ z-index: 10;
4285+ }
4286+ table.navigation#top td
4287+ {
4288+ padding-left: 6px;
4289+ padding-right: 6px;
4290+ }
4291+ .navigation a, .navigation a:visited
4292+ {
4293+ /* tango:sky blue 3 */
4294+ color: #204a87;
4295+ }
4296+ .navigation a:hover
4297+ {
4298+ /* tango:sky blue 2 */
4299+ color: #3465a4;
4300+ }
4301+ td.shortcuts
4302+ {
4303+ /* tango:sky blue 2 */
4304+ color: #3465a4;
4305+ font-size: 80%;
4306+ white-space: nowrap;
4307+ }
4308+ td.shortcuts .dim
4309+ {
4310+ color: #babdb6;
4311+ }
4312+ .navigation .title
4313+ {
4314+ font-size: 80%;
4315+ max-width: none;
4316+ margin: 0px;
4317+ font-weight: normal;
4318+ }
4319+}
4320+@media screen and (min-width: 60em) {
4321+ /* screen larger than 60em */
4322+ body { margin: auto; }
4323+}
4324+@media screen and (max-width: 60em) {
4325+ /* screen less than 60em */
4326+ #nav_hierarchy { display: none; }
4327+ #nav_interfaces { display: none; }
4328+ #nav_prerequisites { display: none; }
4329+ #nav_derived_interfaces { display: none; }
4330+ #nav_implementations { display: none; }
4331+ #nav_child_properties { display: none; }
4332+ #nav_style_properties { display: none; }
4333+ #nav_index { display: none; }
4334+ #nav_glossary { display: none; }
4335+ .gallery_image { display: none; }
4336+ .property_flags { display: none; }
4337+ .signal_flags { display: none; }
4338+ .parameter_annotations { display: none; }
4339+ .enum_member_annotations { display: none; }
4340+ .struct_member_annotations { display: none; }
4341+ .union_member_annotations { display: none; }
4342+ /* now that a column is hidden, optimize space */
4343+ col.parameters_name { width: auto; }
4344+ col.parameters_description { width: auto; }
4345+ col.struct_members_name { width: auto; }
4346+ col.struct_members_description { width: auto; }
4347+ col.enum_members_name { width: auto; }
4348+ col.enum_members_description { width: auto; }
4349+ col.union_members_name { width: auto; }
4350+ col.union_members_description { width: auto; }
4351+ .listing_lines { display: none; }
4352+}
4353+@media print {
4354+ table.navigation {
4355+ visibility: collapse;
4356+ display: none;
4357+ }
4358+ div.titlepage table.navigation {
4359+ visibility: visible;
4360+ display: table;
4361+ background: #e2e2e2;
4362+ border: solid 1px #babdb6;
4363+ margin-top: 0;
4364+ margin-bottom: 0;
4365+ top: 0;
4366+ left: 0;
4367+ height: 3em;
4368+ }
4369+}
4370+
4371
4372=== modified file 'docs/reference/gdk-pixbuf/version.xml'
4373--- docs/reference/gdk-pixbuf/version.xml 2014-04-23 15:46:48 +0000
4374+++ docs/reference/gdk-pixbuf/version.xml 2014-08-24 22:11:39 +0000
4375@@ -1,1 +1,1 @@
4376-2.30.7
4377+2.30.8
4378
4379=== modified file 'gdk-pixbuf/gdk-pixbuf-features.h'
4380--- gdk-pixbuf/gdk-pixbuf-features.h 2014-04-23 15:46:48 +0000
4381+++ gdk-pixbuf/gdk-pixbuf-features.h 2014-08-24 22:11:39 +0000
4382@@ -45,8 +45,8 @@
4383
4384 #define GDK_PIXBUF_MAJOR (2)
4385 #define GDK_PIXBUF_MINOR (30)
4386-#define GDK_PIXBUF_MICRO (7)
4387-#define GDK_PIXBUF_VERSION "2.30.7"
4388+#define GDK_PIXBUF_MICRO (8)
4389+#define GDK_PIXBUF_VERSION "2.30.8"
4390
4391 /* We prefix variable declarations so they can
4392 * properly get exported/imported from Windows DLLs.
4393
4394=== modified file 'gdk-pixbuf/gdk-pixbuf-io.c'
4395--- gdk-pixbuf/gdk-pixbuf-io.c 2014-04-23 15:46:48 +0000
4396+++ gdk-pixbuf/gdk-pixbuf-io.c 2014-08-24 22:11:39 +0000
4397@@ -106,10 +106,10 @@
4398 *
4399 * Installing a module is a two-step process:
4400 * - copy the module file(s) to the loader directory (normally
4401- * `$libdir/gtk-2.0/$version/loaders`, unless overridden by the
4402+ * `$libdir/gdk-pixbuf-2.0/$version/loaders`, unless overridden by the
4403 * environment variable `GDK_PIXBUF_MODULEDIR`)
4404 * - call gdk-pixbuf-query-loaders to update the module file (normally
4405- * `$sysconfdir/gtk-2.0/gdk-pixbuf.loaders`, unless overridden by the
4406+ * `$libdir/gdk-pixbuf-2.0/$version/loaders.cache`, unless overridden by the
4407 * environment variable `GDK_PIXBUF_MODULE_FILE`)
4408 *
4409 * The GdkPixBuf interfaces needed for implementing modules are contained in
4410@@ -334,7 +334,7 @@
4411
4412 /* This is an entry put there by gdk-pixbuf-query-loaders on the
4413 * packager's system. On Windows a prebuilt gdk-pixbuf package can be
4414- * installed in a random location. The gdk-pixbuf.loaders file
4415+ * installed in a random location. The loaders.cache file
4416 * distributed in such a package contains paths from the package
4417 * builder's machine. Replace the build-time prefix with the
4418 * installation prefix on this machine.
4419@@ -1496,11 +1496,16 @@
4420 * the #GDK_PIXBUF_ERROR and %G_IO_ERROR domains.
4421 *
4422 * The image will be scaled to fit in the requested size, optionally
4423- * preserving the image's aspect ratio. When preserving the aspect ratio,
4424- * a @width of -1 will cause the image to be scaled to the exact given
4425- * height, and a @height of -1 will cause the image to be scaled to the
4426- * exact given width. When not preserving aspect ratio, a @width or
4427- * @height of -1 means to not scale the image at all in that dimension.
4428+ * preserving the image's aspect ratio.
4429+ *
4430+ * When preserving the aspect ratio, a @width of -1 will cause the image to be
4431+ * scaled to the exact given height, and a @height of -1 will cause the image
4432+ * to be scaled to the exact given width. If both @width and @height are
4433+ * given, this function will behave as if the smaller of the two values
4434+ * is passed as -1.
4435+ *
4436+ * When not preserving aspect ratio, a @width or @height of -1 means to not
4437+ * scale the image at all in that dimension.
4438 *
4439 * The stream is not closed.
4440 *
4441@@ -1862,14 +1867,16 @@
4442 /**
4443 * gdk_pixbuf_get_file_info:
4444 * @filename: The name of the file to identify.
4445- * @width: (out): Return location for the width of the image, or %NULL
4446- * @height: (out): Return location for the height of the image, or %NULL
4447+ * @width: (optional) (out): Return location for the width of the
4448+ * image, or %NULL
4449+ * @height: (optional) (out): Return location for the height of the
4450+ * image, or %NULL
4451 *
4452 * Parses an image file far enough to determine its format and size.
4453 *
4454- * Returns: (transfer none): A #GdkPixbufFormat describing the image
4455- * format of the file or %NULL if the image format wasn't
4456- * recognized. The return value is owned by GdkPixbuf and should
4457+ * Returns: (nullable) (transfer none): A #GdkPixbufFormat describing
4458+ * the image format of the file or %NULL if the image format wasn't
4459+ * recognized. The return value is owned by #GdkPixbuf and should
4460 * not be freed.
4461 *
4462 * Since: 2.4
4463
4464=== modified file 'gdk-pixbuf/gdk-pixbuf-loader.c'
4465--- gdk-pixbuf/gdk-pixbuf-loader.c 2014-03-09 14:15:14 +0000
4466+++ gdk-pixbuf/gdk-pixbuf-loader.c 2014-08-24 22:11:39 +0000
4467@@ -857,8 +857,9 @@
4468 * Obtains the available information about the format of the
4469 * currently loading image file.
4470 *
4471- * Returns: (transfer none): A #GdkPixbufFormat or %NULL. The return
4472- * value is owned by GdkPixbuf and should not be freed.
4473+ * Returns: (nullable) (transfer none): A #GdkPixbufFormat or
4474+ * %NULL. The return value is owned by GdkPixbuf and should not be
4475+ * freed.
4476 *
4477 * Since: 2.2
4478 */
4479
4480=== modified file 'gdk-pixbuf/gdk-pixbuf-scale.c'
4481--- gdk-pixbuf/gdk-pixbuf-scale.c 2014-03-09 14:15:14 +0000
4482+++ gdk-pixbuf/gdk-pixbuf-scale.c 2014-08-24 22:11:39 +0000
4483@@ -383,8 +383,8 @@
4484 * Rotates a pixbuf by a multiple of 90 degrees, and returns the
4485 * result in a new pixbuf.
4486 *
4487- * Returns: (transfer full): the new #GdkPixbuf, or %NULL if not enough memory could be
4488- * allocated for it.
4489+ * Returns: (nullable) (transfer full): the new #GdkPixbuf, or %NULL
4490+ * if not enough memory could be allocated for it.
4491 *
4492 * Since: 2.6
4493 */
4494@@ -476,8 +476,8 @@
4495 * Flips a pixbuf horizontally or vertically and returns the
4496 * result in a new pixbuf.
4497 *
4498- * Returns: (transfer full): the new #GdkPixbuf, or %NULL if not enough memory could be
4499- * allocated for it.
4500+ * Returns: (nullable) (transfer full): the new #GdkPixbuf, or %NULL
4501+ * if not enough memory could be allocated for it.
4502 *
4503 * Since: 2.6
4504 */
4505
4506=== modified file 'gdk-pixbuf/gdk-pixdata.c'
4507--- gdk-pixbuf/gdk-pixdata.c 2014-03-09 14:15:14 +0000
4508+++ gdk-pixbuf/gdk-pixdata.c 2014-08-24 22:11:39 +0000
4509@@ -319,8 +319,9 @@
4510 * pixel data is run-length encoded into newly-allocated memory and a
4511 * pointer to that memory is returned.
4512 *
4513- * Returns: If @ure_rle is %TRUE, a pointer to the newly-allocated memory
4514- * for the run-length encoded pixel data, otherwise %NULL.
4515+ * Returns: (nullable): If @use_rle is %TRUE, a pointer to the
4516+ * newly-allocated memory for the run-length encoded pixel data,
4517+ * otherwise %NULL.
4518 **/
4519 gpointer
4520 gdk_pixdata_from_pixbuf (GdkPixdata *pixdata,
4521
4522=== modified file 'gdk-pixbuf/gdk_pixbuf.rc'
4523--- gdk-pixbuf/gdk_pixbuf.rc 2014-04-23 15:46:48 +0000
4524+++ gdk-pixbuf/gdk_pixbuf.rc 2014-08-24 22:11:39 +0000
4525@@ -1,8 +1,8 @@
4526 #include <winver.h>
4527
4528 VS_VERSION_INFO VERSIONINFO
4529- FILEVERSION 2,30,7,0
4530- PRODUCTVERSION 2,30,7,0
4531+ FILEVERSION 2,30,8,0
4532+ PRODUCTVERSION 2,30,8,0
4533 FILEFLAGSMASK 0
4534 FILEFLAGS 0
4535 FILEOS VOS__WINDOWS32
4536@@ -15,12 +15,12 @@
4537 BEGIN
4538 VALUE "CompanyName", "The GTK developer community"
4539 VALUE "FileDescription", "GIMP Toolkit"
4540- VALUE "FileVersion", "2.30.7.0"
4541+ VALUE "FileVersion", "2.30.8.0"
4542 VALUE "InternalName", "libgdk_pixbuf-2.0-0"
4543 VALUE "LegalCopyright", "Copyright (C) 1999 The Free Software Foundation. Modified by the GTK+ Team and others 1999-2011."
4544 VALUE "OriginalFilename", "libgdk_pixbuf-2.0-0.dll"
4545 VALUE "ProductName", "GTK+"
4546- VALUE "ProductVersion", "2.30.7"
4547+ VALUE "ProductVersion", "2.30.8"
4548 END
4549 END
4550 BLOCK "VarFileInfo"
4551
4552=== modified file 'po/af.gmo'
4553Binary files po/af.gmo 2014-04-23 15:46:48 +0000 and po/af.gmo 2014-08-24 22:11:39 +0000 differ
4554=== modified file 'po/af.po'
4555--- po/af.po 2014-04-23 15:46:48 +0000
4556+++ po/af.po 2014-08-24 22:11:39 +0000
4557@@ -8,7 +8,7 @@
4558 "Project-Id-Version: gtk+ 2.6-branch\n"
4559 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-"
4560 "pixbuf\n"
4561-"POT-Creation-Date: 2014-03-17 15:21-0400\n"
4562+"POT-Creation-Date: 2014-05-26 20:46-0400\n"
4563 "PO-Revision-Date: 2010-02-26 21:10+0200\n"
4564 "Last-Translator: F Wolff <friedel@translate.org.za>\n"
4565 "Language-Team: translate-discuss-af@lists.sourceforge.net\n"
4566@@ -80,37 +80,37 @@
4567 msgid "Failed to load image '%s': %s"
4568 msgstr "Kon nie beeld '%s' laai nie: %s"
4569
4570-#: gdk-pixbuf/gdk-pixbuf-io.c:2022 gdk-pixbuf/io-gdip-utils.c:835
4571+#: gdk-pixbuf/gdk-pixbuf-io.c:2029 gdk-pixbuf/io-gdip-utils.c:835
4572 #, c-format
4573 msgid "Error writing to image file: %s"
4574 msgstr "Fout met skryf na beeldlêer: %s"
4575
4576-#: gdk-pixbuf/gdk-pixbuf-io.c:2064 gdk-pixbuf/gdk-pixbuf-io.c:2185
4577+#: gdk-pixbuf/gdk-pixbuf-io.c:2071 gdk-pixbuf/gdk-pixbuf-io.c:2192
4578 #, c-format
4579 msgid "This build of gdk-pixbuf does not support saving the image format: %s"
4580 msgstr ""
4581 "Hierdie bou van gdk-pixbuf ondersteun nie die stoor van die beeldformaat %s "
4582 "nie"
4583
4584-#: gdk-pixbuf/gdk-pixbuf-io.c:2095
4585+#: gdk-pixbuf/gdk-pixbuf-io.c:2102
4586 #, fuzzy
4587 msgid "Insufficient memory to save image to callback"
4588 msgstr "Onvoldoende geheue om beeld te stoor na terugbel"
4589
4590-#: gdk-pixbuf/gdk-pixbuf-io.c:2108
4591+#: gdk-pixbuf/gdk-pixbuf-io.c:2115
4592 msgid "Failed to open temporary file"
4593 msgstr "Kon nie tydelike lêer open nie"
4594
4595-#: gdk-pixbuf/gdk-pixbuf-io.c:2131
4596+#: gdk-pixbuf/gdk-pixbuf-io.c:2138
4597 msgid "Failed to read from temporary file"
4598 msgstr "Kon nie vanaf tydelike lêer lees nie"
4599
4600-#: gdk-pixbuf/gdk-pixbuf-io.c:2375
4601+#: gdk-pixbuf/gdk-pixbuf-io.c:2382
4602 #, c-format
4603 msgid "Failed to open '%s' for writing: %s"
4604 msgstr "Kon nie '%s' open vir skryfwerk nie: %s"
4605
4606-#: gdk-pixbuf/gdk-pixbuf-io.c:2401
4607+#: gdk-pixbuf/gdk-pixbuf-io.c:2408
4608 #, c-format
4609 msgid ""
4610 "Failed to close '%s' while writing image, all data may not have been saved: "
4611@@ -119,11 +119,11 @@
4612 "Kon nie '%s' sluit terwyl beeld geskryf is nie, alle data is dalk nie "
4613 "gestoor nie: %s"
4614
4615-#: gdk-pixbuf/gdk-pixbuf-io.c:2622 gdk-pixbuf/gdk-pixbuf-io.c:2674
4616+#: gdk-pixbuf/gdk-pixbuf-io.c:2629 gdk-pixbuf/gdk-pixbuf-io.c:2681
4617 msgid "Insufficient memory to save image into a buffer"
4618 msgstr "Onvoldoende geheue om beeld binne in 'n buffer te stoor"
4619
4620-#: gdk-pixbuf/gdk-pixbuf-io.c:2720
4621+#: gdk-pixbuf/gdk-pixbuf-io.c:2727
4622 msgid "Error writing to image stream"
4623 msgstr "Fout met skryf na beeldstroom"
4624
4625@@ -149,11 +149,11 @@
4626 msgid "Image format unknown"
4627 msgstr "Beeldformaat onbekend"
4628
4629-#: gdk-pixbuf/gdk-pixdata.c:168 gdk-pixbuf/gdk-pixdata.c:500
4630+#: gdk-pixbuf/gdk-pixdata.c:168 gdk-pixbuf/gdk-pixdata.c:501
4631 msgid "Image pixel data corrupt"
4632 msgstr "Beeld-pixeldata korrup"
4633
4634-#: gdk-pixbuf/gdk-pixdata.c:444
4635+#: gdk-pixbuf/gdk-pixdata.c:445
4636 #, c-format
4637 msgid "failed to allocate image buffer of %u byte"
4638 msgid_plural "failed to allocate image buffer of %u bytes"
4639
4640=== modified file 'po/ang.gmo'
4641Binary files po/ang.gmo 2014-04-23 15:46:48 +0000 and po/ang.gmo 2014-08-24 22:11:39 +0000 differ
4642=== modified file 'po/ang.po'
4643--- po/ang.po 2014-04-23 15:46:48 +0000
4644+++ po/ang.po 2014-08-24 22:11:39 +0000
4645@@ -9,7 +9,7 @@
4646 "Project-Id-Version: gtk+2.4\n"
4647 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-"
4648 "pixbuf\n"
4649-"POT-Creation-Date: 2014-03-17 15:21-0400\n"
4650+"POT-Creation-Date: 2014-05-26 20:46-0400\n"
4651 "PO-Revision-Date: 2004-08-08 16:54-0600\n"
4652 "Last-Translator: James Johnson <modean52@comcast.net>\n"
4653 "Language-Team: Old English <modean52@comcast.net>\n"
4654@@ -75,45 +75,45 @@
4655 msgid "Failed to load image '%s': %s"
4656 msgstr "Tósǽlde tó hládenne onlícnesse '%s': %s"
4657
4658-#: gdk-pixbuf/gdk-pixbuf-io.c:2022 gdk-pixbuf/io-gdip-utils.c:835
4659+#: gdk-pixbuf/gdk-pixbuf-io.c:2029 gdk-pixbuf/io-gdip-utils.c:835
4660 #, c-format
4661 msgid "Error writing to image file: %s"
4662 msgstr "Gesweðrung in wrítung þǽm onlícnescranic: %s"
4663
4664-#: gdk-pixbuf/gdk-pixbuf-io.c:2064 gdk-pixbuf/gdk-pixbuf-io.c:2185
4665+#: gdk-pixbuf/gdk-pixbuf-io.c:2071 gdk-pixbuf/gdk-pixbuf-io.c:2192
4666 #, c-format
4667 msgid "This build of gdk-pixbuf does not support saving the image format: %s"
4668 msgstr ""
4669
4670-#: gdk-pixbuf/gdk-pixbuf-io.c:2095
4671+#: gdk-pixbuf/gdk-pixbuf-io.c:2102
4672 msgid "Insufficient memory to save image to callback"
4673 msgstr ""
4674
4675-#: gdk-pixbuf/gdk-pixbuf-io.c:2108
4676+#: gdk-pixbuf/gdk-pixbuf-io.c:2115
4677 msgid "Failed to open temporary file"
4678 msgstr "Tósǽlde tó openienne hwílwendne cranic"
4679
4680-#: gdk-pixbuf/gdk-pixbuf-io.c:2131
4681+#: gdk-pixbuf/gdk-pixbuf-io.c:2138
4682 msgid "Failed to read from temporary file"
4683 msgstr "Tósǽlde tó rǽdenne fram hwílwendne cranic"
4684
4685-#: gdk-pixbuf/gdk-pixbuf-io.c:2375
4686+#: gdk-pixbuf/gdk-pixbuf-io.c:2382
4687 #, c-format
4688 msgid "Failed to open '%s' for writing: %s"
4689 msgstr "Tósǽlde tó openienne '%s' for wrítunge: %s"
4690
4691-#: gdk-pixbuf/gdk-pixbuf-io.c:2401
4692+#: gdk-pixbuf/gdk-pixbuf-io.c:2408
4693 #, c-format
4694 msgid ""
4695 "Failed to close '%s' while writing image, all data may not have been saved: "
4696 "%s"
4697 msgstr ""
4698
4699-#: gdk-pixbuf/gdk-pixbuf-io.c:2622 gdk-pixbuf/gdk-pixbuf-io.c:2674
4700+#: gdk-pixbuf/gdk-pixbuf-io.c:2629 gdk-pixbuf/gdk-pixbuf-io.c:2681
4701 msgid "Insufficient memory to save image into a buffer"
4702 msgstr ""
4703
4704-#: gdk-pixbuf/gdk-pixbuf-io.c:2720
4705+#: gdk-pixbuf/gdk-pixbuf-io.c:2727
4706 #, fuzzy
4707 msgid "Error writing to image stream"
4708 msgstr "Gesweðrung in wrítung þǽm onlícnescranic: %s"
4709@@ -138,11 +138,11 @@
4710 msgid "Image format unknown"
4711 msgstr "Onlícnesgesceap ungecnáwen"
4712
4713-#: gdk-pixbuf/gdk-pixdata.c:168 gdk-pixbuf/gdk-pixdata.c:500
4714+#: gdk-pixbuf/gdk-pixdata.c:168 gdk-pixbuf/gdk-pixdata.c:501
4715 msgid "Image pixel data corrupt"
4716 msgstr ""
4717
4718-#: gdk-pixbuf/gdk-pixdata.c:444
4719+#: gdk-pixbuf/gdk-pixdata.c:445
4720 #, c-format
4721 msgid "failed to allocate image buffer of %u byte"
4722 msgid_plural "failed to allocate image buffer of %u bytes"
4723
4724=== modified file 'po/ar.gmo'
4725Binary files po/ar.gmo 2014-04-23 15:46:48 +0000 and po/ar.gmo 2014-08-24 22:11:39 +0000 differ
4726=== modified file 'po/ar.po'
4727--- po/ar.po 2014-04-23 15:46:48 +0000
4728+++ po/ar.po 2014-08-24 22:11:39 +0000
4729@@ -13,7 +13,7 @@
4730 "Project-Id-Version: gtk+.HEAD\n"
4731 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-"
4732 "pixbuf\n"
4733-"POT-Creation-Date: 2014-03-17 15:21-0400\n"
4734+"POT-Creation-Date: 2014-05-26 20:46-0400\n"
4735 "PO-Revision-Date: 2010-05-24 22:57+0300\n"
4736 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
4737 "Language-Team: Arabic <doc@arabeyes.org>\n"
4738@@ -84,45 +84,45 @@
4739 msgid "Failed to load image '%s': %s"
4740 msgstr "فشل تحميل الصورة '%s': %s"
4741
4742-#: gdk-pixbuf/gdk-pixbuf-io.c:2022 gdk-pixbuf/io-gdip-utils.c:835
4743+#: gdk-pixbuf/gdk-pixbuf-io.c:2029 gdk-pixbuf/io-gdip-utils.c:835
4744 #, c-format
4745 msgid "Error writing to image file: %s"
4746 msgstr "فشلت الكتابة في ملف الصورة: %s"
4747
4748-#: gdk-pixbuf/gdk-pixbuf-io.c:2064 gdk-pixbuf/gdk-pixbuf-io.c:2185
4749+#: gdk-pixbuf/gdk-pixbuf-io.c:2071 gdk-pixbuf/gdk-pixbuf-io.c:2192
4750 #, c-format
4751 msgid "This build of gdk-pixbuf does not support saving the image format: %s"
4752 msgstr "بناء gdk-pixbuf هذا لا يدعم الحفظ بصيغة الصور: %s"
4753
4754-#: gdk-pixbuf/gdk-pixbuf-io.c:2095
4755+#: gdk-pixbuf/gdk-pixbuf-io.c:2102
4756 msgid "Insufficient memory to save image to callback"
4757 msgstr "ذاكرة غير كافية لحفظ الصورة إلى إعادة النداء (callback)"
4758
4759-#: gdk-pixbuf/gdk-pixbuf-io.c:2108
4760+#: gdk-pixbuf/gdk-pixbuf-io.c:2115
4761 msgid "Failed to open temporary file"
4762 msgstr "فشل فتح الملف المؤقّت"
4763
4764-#: gdk-pixbuf/gdk-pixbuf-io.c:2131
4765+#: gdk-pixbuf/gdk-pixbuf-io.c:2138
4766 msgid "Failed to read from temporary file"
4767 msgstr "فشلت القراءة من الملف المؤقّت"
4768
4769-#: gdk-pixbuf/gdk-pixbuf-io.c:2375
4770+#: gdk-pixbuf/gdk-pixbuf-io.c:2382
4771 #, c-format
4772 msgid "Failed to open '%s' for writing: %s"
4773 msgstr "فشل فتح '%s' لكتابة: %s"
4774
4775-#: gdk-pixbuf/gdk-pixbuf-io.c:2401
4776+#: gdk-pixbuf/gdk-pixbuf-io.c:2408
4777 #, c-format
4778 msgid ""
4779 "Failed to close '%s' while writing image, all data may not have been saved: "
4780 "%s"
4781 msgstr "فشل غلق '%s' أثناء كتابة الصورة، ربما لم تُحفظ كل البيانات: %s"
4782
4783-#: gdk-pixbuf/gdk-pixbuf-io.c:2622 gdk-pixbuf/gdk-pixbuf-io.c:2674
4784+#: gdk-pixbuf/gdk-pixbuf-io.c:2629 gdk-pixbuf/gdk-pixbuf-io.c:2681
4785 msgid "Insufficient memory to save image into a buffer"
4786 msgstr "ذاكرة غير كافية لحفظ الصورة في براح"
4787
4788-#: gdk-pixbuf/gdk-pixbuf-io.c:2720
4789+#: gdk-pixbuf/gdk-pixbuf-io.c:2727
4790 msgid "Error writing to image stream"
4791 msgstr "فشلت الكتابة في دفق الصور"
4792
4793@@ -148,11 +148,11 @@
4794 msgid "Image format unknown"
4795 msgstr "صيغة الصورة مجهولة"
4796
4797-#: gdk-pixbuf/gdk-pixdata.c:168 gdk-pixbuf/gdk-pixdata.c:500
4798+#: gdk-pixbuf/gdk-pixdata.c:168 gdk-pixbuf/gdk-pixdata.c:501
4799 msgid "Image pixel data corrupt"
4800 msgstr "البيانات البكسلية للصورة تالفة"
4801
4802-#: gdk-pixbuf/gdk-pixdata.c:444
4803+#: gdk-pixbuf/gdk-pixdata.c:445
4804 #, c-format
4805 msgid "failed to allocate image buffer of %u byte"
4806 msgid_plural "failed to allocate image buffer of %u bytes"
4807
4808=== modified file 'po/as.gmo'
4809Binary files po/as.gmo 2014-04-23 15:46:48 +0000 and po/as.gmo 2014-08-24 22:11:39 +0000 differ
4810=== modified file 'po/as.po'
4811--- po/as.po 2014-04-23 15:46:48 +0000
4812+++ po/as.po 2014-08-24 22:11:39 +0000
4813@@ -12,7 +12,7 @@
4814 "Project-Id-Version: as\n"
4815 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-"
4816 "pixbuf\n"
4817-"POT-Creation-Date: 2014-03-17 15:21-0400\n"
4818+"POT-Creation-Date: 2014-05-26 20:46-0400\n"
4819 "PO-Revision-Date: 2013-09-13 18:15+0530\n"
4820 "Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
4821 "Language-Team: Assamese <kde-i18n-doc@kde.org>\n"
4822@@ -82,45 +82,45 @@
4823 msgid "Failed to load image '%s': %s"
4824 msgstr "'%s' ছবি ল'ড কৰিবলে অক্ষম: %s"
4825
4826-#: gdk-pixbuf/gdk-pixbuf-io.c:2022 gdk-pixbuf/io-gdip-utils.c:835
4827+#: gdk-pixbuf/gdk-pixbuf-io.c:2029 gdk-pixbuf/io-gdip-utils.c:835
4828 #, c-format
4829 msgid "Error writing to image file: %s"
4830 msgstr "ছবি ফাইললৈ লিখোঁতে ভুল: %s"
4831
4832-#: gdk-pixbuf/gdk-pixbuf-io.c:2064 gdk-pixbuf/gdk-pixbuf-io.c:2185
4833+#: gdk-pixbuf/gdk-pixbuf-io.c:2071 gdk-pixbuf/gdk-pixbuf-io.c:2192
4834 #, c-format
4835 msgid "This build of gdk-pixbuf does not support saving the image format: %s"
4836 msgstr "gdk-pixbuf ৰ এই নিৰ্মাণে ছবিৰ বিন্যাস সংৰক্ষণ কৰাৰ সমৰ্থন নিদিয়ে: %s"
4837
4838-#: gdk-pixbuf/gdk-pixbuf-io.c:2095
4839+#: gdk-pixbuf/gdk-pixbuf-io.c:2102
4840 msgid "Insufficient memory to save image to callback"
4841 msgstr "পুনৰাহ্বানৰ বাবে ছবি সংৰক্ষণ কৰিব'লৈ অপৰ্য্যাপ্ত মেমৰি"
4842
4843-#: gdk-pixbuf/gdk-pixbuf-io.c:2108
4844+#: gdk-pixbuf/gdk-pixbuf-io.c:2115
4845 msgid "Failed to open temporary file"
4846 msgstr "অস্থায়ী ফাইল খোলাত অক্ষম"
4847
4848-#: gdk-pixbuf/gdk-pixbuf-io.c:2131
4849+#: gdk-pixbuf/gdk-pixbuf-io.c:2138
4850 msgid "Failed to read from temporary file"
4851 msgstr "অস্থায়ী ফাইলৰ পৰা পঢ়াত অক্ষম"
4852
4853-#: gdk-pixbuf/gdk-pixbuf-io.c:2375
4854+#: gdk-pixbuf/gdk-pixbuf-io.c:2382
4855 #, c-format
4856 msgid "Failed to open '%s' for writing: %s"
4857 msgstr "লিখিবৰ বাবে '%s' খুলিব নোৱাৰিলো: %s"
4858
4859-#: gdk-pixbuf/gdk-pixbuf-io.c:2401
4860+#: gdk-pixbuf/gdk-pixbuf-io.c:2408
4861 #, c-format
4862 msgid ""
4863 "Failed to close '%s' while writing image, all data may not have been saved: "
4864 "%s"
4865 msgstr "ছবি লিখোঁতে '%s' বন্ধ কৰাত অক্ষম, সকলো তথ্য সংৰক্ষণ কৰা ন'হ'বও পাৰে: %s"
4866
4867-#: gdk-pixbuf/gdk-pixbuf-io.c:2622 gdk-pixbuf/gdk-pixbuf-io.c:2674
4868+#: gdk-pixbuf/gdk-pixbuf-io.c:2629 gdk-pixbuf/gdk-pixbuf-io.c:2681
4869 msgid "Insufficient memory to save image into a buffer"
4870 msgstr "উপশমকত ছবি সংৰক্ষণ কৰিব'লৈ অপৰ্য্যাপ্ত মেমৰি"
4871
4872-#: gdk-pixbuf/gdk-pixbuf-io.c:2720
4873+#: gdk-pixbuf/gdk-pixbuf-io.c:2727
4874 msgid "Error writing to image stream"
4875 msgstr "ছবি ধাৰালৈ লিখোঁতে ভুল"
4876
4877@@ -146,11 +146,11 @@
4878 msgid "Image format unknown"
4879 msgstr "ছবি বিন্যাস অজ্ঞাত"
4880
4881-#: gdk-pixbuf/gdk-pixdata.c:168 gdk-pixbuf/gdk-pixdata.c:500
4882+#: gdk-pixbuf/gdk-pixdata.c:168 gdk-pixbuf/gdk-pixdata.c:501
4883 msgid "Image pixel data corrupt"
4884 msgstr "ছবিৰ পিক্সেল তথ্য ক্ষতিগ্ৰস্থ"
4885
4886-#: gdk-pixbuf/gdk-pixdata.c:444
4887+#: gdk-pixbuf/gdk-pixdata.c:445
4888 #, c-format
4889 msgid "failed to allocate image buffer of %u byte"
4890 msgid_plural "failed to allocate image buffer of %u bytes"
4891
4892=== modified file 'po/ast.gmo'
4893Binary files po/ast.gmo 2014-04-23 15:46:48 +0000 and po/ast.gmo 2014-08-24 22:11:39 +0000 differ
4894=== modified file 'po/ast.po'
4895--- po/ast.po 2014-04-23 15:46:48 +0000
4896+++ po/ast.po 2014-08-24 22:11:39 +0000
4897@@ -10,7 +10,7 @@
4898 "Project-Id-Version: ast\n"
4899 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-"
4900 "pixbuf\n"
4901-"POT-Creation-Date: 2014-03-17 15:21-0400\n"
4902+"POT-Creation-Date: 2014-05-26 20:46-0400\n"
4903 "PO-Revision-Date: 2011-02-15 18:33+0200\n"
4904 "Last-Translator: Xandru Armesto <xandru@softastur.org>\n"
4905 "Language-Team: Softastur alministradores@softastur.org\n"
4906@@ -85,34 +85,34 @@
4907 msgid "Failed to load image '%s': %s"
4908 msgstr "Falló al cargar la imaxe '%s': %s"
4909
4910-#: gdk-pixbuf/gdk-pixbuf-io.c:2022 gdk-pixbuf/io-gdip-utils.c:835
4911+#: gdk-pixbuf/gdk-pixbuf-io.c:2029 gdk-pixbuf/io-gdip-utils.c:835
4912 #, c-format
4913 msgid "Error writing to image file: %s"
4914 msgstr "Error al escribir al ficheru d'imaxe: %s"
4915
4916-#: gdk-pixbuf/gdk-pixbuf-io.c:2064 gdk-pixbuf/gdk-pixbuf-io.c:2185
4917+#: gdk-pixbuf/gdk-pixbuf-io.c:2071 gdk-pixbuf/gdk-pixbuf-io.c:2192
4918 #, c-format
4919 msgid "This build of gdk-pixbuf does not support saving the image format: %s"
4920 msgstr "Esti bloque de gdk-pixbuf nun soporta guardar el formatu d'imaxe: %s"
4921
4922-#: gdk-pixbuf/gdk-pixbuf-io.c:2095
4923+#: gdk-pixbuf/gdk-pixbuf-io.c:2102
4924 msgid "Insufficient memory to save image to callback"
4925 msgstr "Memoria insuficiente pa guardar imaxe pa rellamada"
4926
4927-#: gdk-pixbuf/gdk-pixbuf-io.c:2108
4928+#: gdk-pixbuf/gdk-pixbuf-io.c:2115
4929 msgid "Failed to open temporary file"
4930 msgstr "Falló l'apertura del ficheru temporal"
4931
4932-#: gdk-pixbuf/gdk-pixbuf-io.c:2131
4933+#: gdk-pixbuf/gdk-pixbuf-io.c:2138
4934 msgid "Failed to read from temporary file"
4935 msgstr "Falló la llectura del ficheru temporal"
4936
4937-#: gdk-pixbuf/gdk-pixbuf-io.c:2375
4938+#: gdk-pixbuf/gdk-pixbuf-io.c:2382
4939 #, c-format
4940 msgid "Failed to open '%s' for writing: %s"
4941 msgstr "Falló l'apertura de '%s' pa escribir: %s"
4942
4943-#: gdk-pixbuf/gdk-pixbuf-io.c:2401
4944+#: gdk-pixbuf/gdk-pixbuf-io.c:2408
4945 #, c-format
4946 msgid ""
4947 "Failed to close '%s' while writing image, all data may not have been saved: "
4948@@ -121,11 +121,11 @@
4949 "Falló al zarrar '%s' mentanto s'escribía la imaxe, pue que nun se guardaren "
4950 "tolos datos: %s"
4951
4952-#: gdk-pixbuf/gdk-pixbuf-io.c:2622 gdk-pixbuf/gdk-pixbuf-io.c:2674
4953+#: gdk-pixbuf/gdk-pixbuf-io.c:2629 gdk-pixbuf/gdk-pixbuf-io.c:2681
4954 msgid "Insufficient memory to save image into a buffer"
4955 msgstr "Memoria insuficiente pa guardar la imaxe nun búfer"
4956
4957-#: gdk-pixbuf/gdk-pixbuf-io.c:2720
4958+#: gdk-pixbuf/gdk-pixbuf-io.c:2727
4959 msgid "Error writing to image stream"
4960 msgstr "Error al escribir nel fluxu d'imaxe"
4961
4962@@ -151,11 +151,11 @@
4963 msgid "Image format unknown"
4964 msgstr "Formatu d'imaxe desconocíu"
4965
4966-#: gdk-pixbuf/gdk-pixdata.c:168 gdk-pixbuf/gdk-pixdata.c:500
4967+#: gdk-pixbuf/gdk-pixdata.c:168 gdk-pixbuf/gdk-pixdata.c:501
4968 msgid "Image pixel data corrupt"
4969 msgstr "Datos de pixels d'imaxe corruptos"
4970
4971-#: gdk-pixbuf/gdk-pixdata.c:444
4972+#: gdk-pixbuf/gdk-pixdata.c:445
4973 #, c-format
4974 msgid "failed to allocate image buffer of %u byte"
4975 msgid_plural "failed to allocate image buffer of %u bytes"
4976
4977=== modified file 'po/az.gmo'
4978Binary files po/az.gmo 2014-04-23 15:46:48 +0000 and po/az.gmo 2014-08-24 22:11:39 +0000 differ
4979=== modified file 'po/az.po'
4980--- po/az.po 2014-04-23 15:46:48 +0000
4981+++ po/az.po 2014-08-24 22:11:39 +0000
4982@@ -8,7 +8,7 @@
4983 "Project-Id-Version: gtk+.HEAD\n"
4984 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-"
4985 "pixbuf\n"
4986-"POT-Creation-Date: 2014-03-17 15:21-0400\n"
4987+"POT-Creation-Date: 2014-05-26 20:46-0400\n"
4988 "PO-Revision-Date: 2004-04-17 22:41+0300\n"
4989 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
4990 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
4991@@ -79,36 +79,36 @@
4992 msgid "Failed to load image '%s': %s"
4993 msgstr "'%s' rəsmi yüklənə bilmədi: %s"
4994
4995-#: gdk-pixbuf/gdk-pixbuf-io.c:2022 gdk-pixbuf/io-gdip-utils.c:835
4996+#: gdk-pixbuf/gdk-pixbuf-io.c:2029 gdk-pixbuf/io-gdip-utils.c:835
4997 #, c-format
4998 msgid "Error writing to image file: %s"
4999 msgstr "Rəsm faylına yazma xətası: %s"
5000
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: