Hello community,
here is the log from the commit of package gdk-pixbuf for openSUSE:Factory checked in at 2017-01-23 11:19:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gdk-pixbuf (Old)
and /work/SRC/openSUSE:Factory/.gdk-pixbuf.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdk-pixbuf"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gdk-pixbuf/gdk-pixbuf.changes 2017-01-10 10:40:04.552154817 +0100
+++ /work/SRC/openSUSE:Factory/.gdk-pixbuf.new/gdk-pixbuf.changes 2017-01-23 11:19:48.667462493 +0100
@@ -1,0 +2,9 @@
+Mon Jan 16 20:35:07 UTC 2017 - zaitor@opensuse.org
+
+- Update to version 2.36.4:
+ + Add a fastpath for no-op scales.
+ + Documentation improvements (bgo#442452).
+ + Fix some coverity warnings (bgo#776945, bgo#768062).
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
gdk-pixbuf-2.36.3.tar.xz
New:
----
gdk-pixbuf-2.36.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gdk-pixbuf.spec ++++++
--- /var/tmp/diff_new_pack.2kB3e9/_old 2017-01-23 11:19:49.307371652 +0100
+++ /var/tmp/diff_new_pack.2kB3e9/_new 2017-01-23 11:19:49.311371085 +0100
@@ -20,7 +20,7 @@
%define gdk_pixbuf_binary_version 2.10.0
Name: gdk-pixbuf
-Version: 2.36.3
+Version: 2.36.4
Release: 0
Summary: An image loading library
License: LGPL-2.1+
++++++ gdk-pixbuf-2.36.3.tar.xz -> gdk-pixbuf-2.36.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/NEWS new/gdk-pixbuf-2.36.4/NEWS
--- old/gdk-pixbuf-2.36.3/NEWS 2017-01-04 19:11:59.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/NEWS 2017-01-16 19:31:07.000000000 +0100
@@ -1,3 +1,11 @@
+2.36.4
+======
+
+* Add a fastpath for no-op scales
+* Documentation improvements (#442452)
+* Fix some coverity warnings (#776945, #768062)
+* Translation updates
+
2.36.3
======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/build/win32/vs10/gdk-pixbuf-version-paths.props new/gdk-pixbuf-2.36.4/build/win32/vs10/gdk-pixbuf-version-paths.props
--- old/gdk-pixbuf-2.36.3/build/win32/vs10/gdk-pixbuf-version-paths.props 2017-01-04 19:13:43.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/build/win32/vs10/gdk-pixbuf-version-paths.props 2017-01-16 19:32:28.000000000 +0100
@@ -4,7 +4,7 @@
<VSVer>10</VSVer>
<GdkPixbufMajorVersion>2</GdkPixbufMajorVersion>
<GdkPixbufMinorVersion>36</GdkPixbufMinorVersion>
- <GdkPixbufMicroVersion>3</GdkPixbufMicroVersion>
+ <GdkPixbufMicroVersion>4</GdkPixbufMicroVersion>
<ApiVersion>2.0</ApiVersion>
<GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/build/win32/vs11/gdk-pixbuf-version-paths.props new/gdk-pixbuf-2.36.4/build/win32/vs11/gdk-pixbuf-version-paths.props
--- old/gdk-pixbuf-2.36.3/build/win32/vs11/gdk-pixbuf-version-paths.props 2017-01-04 19:23:12.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/build/win32/vs11/gdk-pixbuf-version-paths.props 2017-01-16 19:55:41.000000000 +0100
@@ -4,7 +4,7 @@
<VSVer>11</VSVer>
<GdkPixbufMajorVersion>2</GdkPixbufMajorVersion>
<GdkPixbufMinorVersion>36</GdkPixbufMinorVersion>
- <GdkPixbufMicroVersion>3</GdkPixbufMicroVersion>
+ <GdkPixbufMicroVersion>4</GdkPixbufMicroVersion>
<ApiVersion>2.0</ApiVersion>
<GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/build/win32/vs12/gdk-pixbuf-version-paths.props new/gdk-pixbuf-2.36.4/build/win32/vs12/gdk-pixbuf-version-paths.props
--- old/gdk-pixbuf-2.36.3/build/win32/vs12/gdk-pixbuf-version-paths.props 2017-01-04 19:23:12.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/build/win32/vs12/gdk-pixbuf-version-paths.props 2017-01-16 19:55:41.000000000 +0100
@@ -4,7 +4,7 @@
<VSVer>12</VSVer>
<GdkPixbufMajorVersion>2</GdkPixbufMajorVersion>
<GdkPixbufMinorVersion>36</GdkPixbufMinorVersion>
- <GdkPixbufMicroVersion>3</GdkPixbufMicroVersion>
+ <GdkPixbufMicroVersion>4</GdkPixbufMicroVersion>
<ApiVersion>2.0</ApiVersion>
<GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/build/win32/vs14/gdk-pixbuf-version-paths.props new/gdk-pixbuf-2.36.4/build/win32/vs14/gdk-pixbuf-version-paths.props
--- old/gdk-pixbuf-2.36.3/build/win32/vs14/gdk-pixbuf-version-paths.props 2017-01-04 19:23:13.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/build/win32/vs14/gdk-pixbuf-version-paths.props 2017-01-16 19:55:41.000000000 +0100
@@ -4,7 +4,7 @@
<VSVer>14</VSVer>
<GdkPixbufMajorVersion>2</GdkPixbufMajorVersion>
<GdkPixbufMinorVersion>36</GdkPixbufMinorVersion>
- <GdkPixbufMicroVersion>3</GdkPixbufMicroVersion>
+ <GdkPixbufMicroVersion>4</GdkPixbufMicroVersion>
<ApiVersion>2.0</ApiVersion>
<GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/build/win32/vs9/gdk-pixbuf-version-paths.vsprops new/gdk-pixbuf-2.36.4/build/win32/vs9/gdk-pixbuf-version-paths.vsprops
--- old/gdk-pixbuf-2.36.3/build/win32/vs9/gdk-pixbuf-version-paths.vsprops 2017-01-04 19:13:43.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/build/win32/vs9/gdk-pixbuf-version-paths.vsprops 2017-01-16 19:32:28.000000000 +0100
@@ -18,7 +18,7 @@
/>
http://www.gtk.org/"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.36.3"
+#define PACKAGE_VERSION "2.36.4"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/configure new/gdk-pixbuf-2.36.4/configure
--- old/gdk-pixbuf-2.36.3/configure 2017-01-04 19:13:38.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/configure 2017-01-16 19:32:23.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gdk-pixbuf 2.36.3.
+# Generated by GNU Autoconf 2.69 for gdk-pixbuf 2.36.4.
#
# Report bugs to http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-pixbuf.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='gdk-pixbuf'
PACKAGE_TARNAME='gdk-pixbuf'
-PACKAGE_VERSION='2.36.3'
-PACKAGE_STRING='gdk-pixbuf 2.36.3'
+PACKAGE_VERSION='2.36.4'
+PACKAGE_STRING='gdk-pixbuf 2.36.4'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-pixbuf'
PACKAGE_URL=''
@@ -1537,7 +1537,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gdk-pixbuf 2.36.3 to adapt to many kinds of systems.
+\`configure' configures gdk-pixbuf 2.36.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1607,7 +1607,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gdk-pixbuf 2.36.3:";;
+ short | recursive ) echo "Configuration of gdk-pixbuf 2.36.4:";;
esac
cat <<\_ACEOF
@@ -1780,7 +1780,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gdk-pixbuf configure 2.36.3
+gdk-pixbuf configure 2.36.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2149,7 +2149,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gdk-pixbuf $as_me 2.36.3, which was
+It was created by gdk-pixbuf $as_me 2.36.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3022,7 +3022,7 @@
# Define the identity of the package.
PACKAGE='gdk-pixbuf'
- VERSION='2.36.3'
+ VERSION='2.36.4'
# Some tools Automake needs.
@@ -3301,8 +3301,8 @@
GDK_PIXBUF_MAJOR=2
GDK_PIXBUF_MINOR=36
-GDK_PIXBUF_MICRO=3
-GDK_PIXBUF_VERSION=2.36.3
+GDK_PIXBUF_MICRO=4
+GDK_PIXBUF_VERSION=2.36.4
GDK_PIXBUF_API_VERSION=2.0
GDK_PIXBUF_BINARY_VERSION=2.10.0
@@ -3322,7 +3322,7 @@
-LT_VERSION_INFO="3600:3:3600"
+LT_VERSION_INFO="3600:4:3600"
LT_CURRENT_MINUS_AGE=0
@@ -13786,7 +13786,7 @@
Report bugs to ."
lt_cl_version="\
-gdk-pixbuf config.lt 2.36.3
+gdk-pixbuf config.lt 2.36.4
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -21418,7 +21418,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gdk-pixbuf $as_me 2.36.3, which was
+This file was extended by gdk-pixbuf $as_me 2.36.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21484,7 +21484,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gdk-pixbuf config.status 2.36.3
+gdk-pixbuf config.status 2.36.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/configure.ac new/gdk-pixbuf-2.36.4/configure.ac
--- old/gdk-pixbuf-2.36.3/configure.ac 2017-01-04 19:12:13.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/configure.ac 2017-01-16 19:31:33.000000000 +0100
@@ -15,8 +15,8 @@
m4_define([gdk_pixbuf_major_version], [2])
m4_define([gdk_pixbuf_minor_version], [36])
-m4_define([gdk_pixbuf_micro_version], [3])
-m4_define([gdk_pixbuf_interface_age], [3])
+m4_define([gdk_pixbuf_micro_version], [4])
+m4_define([gdk_pixbuf_interface_age], [4])
m4_define([gdk_pixbuf_binary_age],
[m4_eval(100 * gdk_pixbuf_minor_version + gdk_pixbuf_micro_version)])
m4_define([gdk_pixbuf_version],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.1 new/gdk-pixbuf-2.36.4/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.1
--- old/gdk-pixbuf-2.36.3/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.1 2017-01-04 19:20:50.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.1 2017-01-16 19:53:23.000000000 +0100
@@ -2,7 +2,7 @@
.\" Title: gdk-pixbuf-csource
.\" Author: Tim Janik
.\" Generator: DocBook XSL Stylesheets v1.79.1 http://docbook.sf.net/
-.\" Date: 01/04/2017
+.\" Date: 01/16/2017
.\" Manual: User Commands
.\" Source: gdk-pixbuf
.\" Language: English
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.1 new/gdk-pixbuf-2.36.4/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.1
--- old/gdk-pixbuf-2.36.3/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.1 2017-01-04 19:20:50.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.1 2017-01-16 19:53:24.000000000 +0100
@@ -2,7 +2,7 @@
.\" Title: gdk-pixbuf-query-loaders
.\" Author: Owen Taylor
.\" Generator: DocBook XSL Stylesheets v1.79.1 http://docbook.sf.net/
-.\" Date: 01/04/2017
+.\" Date: 01/16/2017
.\" Manual: User Commands
.\" Source: gdk-pixbuf
.\" Language: English
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/docs/reference/gdk-pixbuf/html/gdk-pixbuf-Scaling.html new/gdk-pixbuf-2.36.4/docs/reference/gdk-pixbuf/html/gdk-pixbuf-Scaling.html
--- old/gdk-pixbuf-2.36.3/docs/reference/gdk-pixbuf/html/gdk-pixbuf-Scaling.html 2017-01-04 19:23:12.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/docs/reference/gdk-pixbuf/html/gdk-pixbuf-Scaling.html 2017-01-16 19:55:40.000000000 +0100
@@ -27,7 +27,7 @@
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
<h2><span class="refentrytitle"><a name="gdk-pixbuf-Scaling.top_of_page"></a>Scaling</span></h2>
-<p>Scaling — Scaling pixbufs and scaling and compositing pixbufs</p>
+<p>Scaling — Scaling pixbufs and scaling and alpha blending pixbufs</p>
</td>
<td class="gallery_image" valign="top" align="right"></td>
</tr></table></div>
@@ -125,10 +125,12 @@
<div class="refsect1">
<a name="gdk-pixbuf-Scaling.description"></a><h2>Description</h2>
<p>The GdkPixBuf contains functions to scale pixbufs, to scale
-pixbufs and composite against an existing image, and to scale
-pixbufs and composite against a solid color or checkerboard.
-Compositing a checkerboard is a common way to show an image with
+pixbufs and alpha blend against an existing image, and to scale
+pixbufs and alpha blend against a solid color or checkerboard.
+Alpha blending a checkerboard is a common way to show an image with
an alpha channel in image-viewing and editing software.</p>
+<p>Note that in these functions, the terms ‘alpha blending’ and ‘compositing’
+are used synonymously.</p>
<p>Since the full-featured functions (<a class="link" href="gdk-pixbuf-Scaling.html#gdk-pixbuf-scale" title="gdk_pixbuf_scale ()"><code class="function">gdk_pixbuf_scale()</code></a>,
<a class="link" href="gdk-pixbuf-Scaling.html#gdk-pixbuf-composite" title="gdk_pixbuf_composite ()"><code class="function">gdk_pixbuf_composite()</code></a>, and <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>) are
rather complex to use and have many arguments, two simple
@@ -138,12 +140,27 @@
new pixbuf.</p>
<p>If the destination pixbuf was created from a readonly source, these
operations will force a copy into a mutable buffer.</p>
-<p>Scaling and compositing functions take advantage of MMX hardware
+<p>Scaling and alpha blending functions take advantage of MMX hardware
acceleration on systems where MMX is supported. If gdk-pixbuf is built
with the Sun mediaLib library, these functions are instead accelerated
using mediaLib, which provides hardware acceleration on Intel, AMD,
and Sparc chipsets. If desired, mediaLib support can be turned off by
setting the <code class="literal">GDK_DISABLE_MEDIALIB</code> environment variable. </p>
+<p>The alpha blending function used is:</p>
+<div class="informalexample">
+ <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
+ <tbody>
+ <tr>
+ <td class="listing_lines" align="right"><pre>1</pre></td>
+ <td class="listing_code"><pre class="programlisting">Cd <span class="gtkdoc opt">=</span> Cs·As <span class="gtkdoc opt">+</span> <span class="function">Cd</span><span class="gtkdoc opt">(</span><span class="number">1</span><span class="gtkdoc opt">-</span>As<span class="gtkdoc opt">)</span></pre></td>
+ </tr>
+ </tbody>
+ </table>
+</div>
+
+<p>
+where <code class="literal">Cd</code> is the destination pixel color, <code class="literal">Cs</code> is the source pixel color,
+and <code class="literal">As</code> is the source pixel alpha.</p>
<p>The following example demonstrates handling an expose event by
rendering the appropriate area of a source image (which is scaled
to fit the widget) onto the widget's window. The source image is
@@ -153,7 +170,7 @@
<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
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>
<div class="refsect3">
-<a name="id-1.2.10.6.7"></a><h4>Handling an expose event</h4>
+<a name="id-1.2.10.6.11"></a><h4>Handling an expose event</h4>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -239,7 +256,13 @@
by creating a sub-pixbuf
pointing into <em class="parameter"><code>src</code></em>
; see <a class="link" href="gdk-pixbuf-Image-Data-in-Memory.html#gdk-pixbuf-new-subpixbuf" title="gdk_pixbuf_new_subpixbuf ()"><code class="function">gdk_pixbuf_new_subpixbuf()</code></a>.</p>
-<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>
+<p>If <em class="parameter"><code>dest_width</code></em>
+ and <em class="parameter"><code>dest_height</code></em>
+ are equal to the <em class="parameter"><code>src</code></em>
+ width and height, a
+copy of <em class="parameter"><code>src</code></em>
+ is returned, avoiding any scaling.</p>
+<p>For more complicated scaling/alpha blending see <a class="link" href="gdk-pixbuf-Scaling.html#gdk-pixbuf-scale" title="gdk_pixbuf_scale ()"><code class="function">gdk_pixbuf_scale()</code></a>
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>
<div class="refsect3">
<a name="gdk-pixbuf-scale-simple.parameters"></a><h4>Parameters</h4>
@@ -399,7 +422,7 @@
to <em class="parameter"><code>dest_width</code></em>
x
<em class="parameter"><code>dest_height</code></em>
- and compositing the result with a checkboard of colors
+ and alpha blending the result with a checkboard of colors
<em class="parameter"><code>color1</code></em>
and <em class="parameter"><code>color2</code></em>
.</p>
@@ -491,7 +514,7 @@
, <em class="parameter"><code>dest_width</code></em>
, <em class="parameter"><code>dest_height</code></em>
)
-is then composited onto the corresponding rectangle of the
+is then alpha blended onto the corresponding rectangle of the
original destination image.</p>
<p>When the destination rectangle contains parts not in the source
image, the data at the edges of the source image is replicated
@@ -598,7 +621,7 @@
then translating by <em class="parameter"><code>offset_x</code></em>
and <em class="parameter"><code>offset_y</code></em>
,
-then composites the rectangle (<em class="parameter"><code>dest_x</code></em>
+then alpha blends the rectangle (<em class="parameter"><code>dest_x</code></em>
,<em class="parameter"><code>dest_y</code></em>
, <em class="parameter"><code>dest_width</code></em>
,
@@ -608,6 +631,9 @@
and <em class="parameter"><code>color2</code></em>
and renders it onto the destination
image.</p>
+<p>If the source image has no alpha channel, and <em class="parameter"><code>overall_alpha</code></em>
+ is 255, a fast
+path is used which omits the alpha blending and just performs the scaling.</p>
<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
function suitable for many tasks.</p>
<div class="refsect3">
@@ -718,6 +744,9 @@
<em class="parameter"><code><a class="link" href="gdk-pixbuf-Scaling.html#GdkPixbufRotation" title="enum GdkPixbufRotation"><span class="type">GdkPixbufRotation</span></a> angle</code></em>);</pre>
<p>Rotates a pixbuf by a multiple of 90 degrees, and returns the
result in a new pixbuf.</p>
+<p>If <em class="parameter"><code>angle</code></em>
+ is 0, a copy of <em class="parameter"><code>src</code></em>
+ is returned, avoiding any rotation.</p>
<div class="refsect3">
<a name="gdk-pixbuf-rotate-simple.parameters"></a><h4>Parameters</h4>
<div class="informaltable"><table class="informaltable" width="100%" border="0">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/docs/reference/gdk-pixbuf/html/gdk-pixbuf-The-GdkPixbuf-Structure.html new/gdk-pixbuf-2.36.4/docs/reference/gdk-pixbuf/html/gdk-pixbuf-The-GdkPixbuf-Structure.html
--- old/gdk-pixbuf-2.36.3/docs/reference/gdk-pixbuf/html/gdk-pixbuf-The-GdkPixbuf-Structure.html 2017-01-04 19:23:12.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/docs/reference/gdk-pixbuf/html/gdk-pixbuf-The-GdkPixbuf-Structure.html 2017-01-16 19:55:40.000000000 +0100
@@ -990,7 +990,7 @@
<div class="refsect2">
<a name="GdkPixbufAlphaMode"></a><h3>enum GdkPixbufAlphaMode</h3>
<p>These values can be passed to
-<code class="function">gdk_pixbuf_render_to_drawable_alpha()</code> to control how the alpha
+<a class="link" href="gdk-pixbuf-Xlib-Rendering.html#gdk-pixbuf-xlib-render-to-drawable-alpha" title="gdk_pixbuf_xlib_render_to_drawable_alpha ()"><code class="function">gdk_pixbuf_xlib_render_to_drawable_alpha()</code></a> to control how the alpha
channel of an image should be handled. This function can create a
bilevel clipping mask (black and white) and use it while painting
the image. In the future, when the X Window System gets an alpha
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/docs/reference/gdk-pixbuf/html/gdk-pixbuf-Versioning.html new/gdk-pixbuf-2.36.4/docs/reference/gdk-pixbuf/html/gdk-pixbuf-Versioning.html
--- old/gdk-pixbuf-2.36.3/docs/reference/gdk-pixbuf/html/gdk-pixbuf-Versioning.html 2017-01-04 19:23:12.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/docs/reference/gdk-pixbuf/html/gdk-pixbuf-Versioning.html 2017-01-16 19:55:40.000000000 +0100
@@ -220,7 +220,7 @@
<hr>
<div class="refsect2">
<a name="GDK-PIXBUF-VERSION:CAPS"></a><h3>GDK_PIXBUF_VERSION</h3>
-<pre class="programlisting">#define GDK_PIXBUF_VERSION "2.36.3"
+<pre class="programlisting">#define GDK_PIXBUF_VERSION "2.36.4"
</pre>
<p>Contains the full version of the gdk-pixbuf header as a string.
This is the version being compiled against; contrast with
@@ -245,7 +245,7 @@
<hr>
<div class="refsect2">
<a name="GDK-PIXBUF-MICRO:CAPS"></a><h3>GDK_PIXBUF_MICRO</h3>
-<pre class="programlisting">#define GDK_PIXBUF_MICRO (3)
+<pre class="programlisting">#define GDK_PIXBUF_MICRO (4)
</pre>
<p>Micro version of gdk-pixbuf library, that is the "2" in
"0.8.2" for example.</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/docs/reference/gdk-pixbuf/html/index.html new/gdk-pixbuf-2.36.4/docs/reference/gdk-pixbuf/html/index.html
--- old/gdk-pixbuf-2.36.3/docs/reference/gdk-pixbuf/html/index.html 2017-01-04 19:23:12.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/docs/reference/gdk-pixbuf/html/index.html 2017-01-16 19:55:40.000000000 +0100
@@ -23,7 +23,7 @@
</p></div></div>
</div></div></div>
<div><p class="releaseinfo">
- Version 2.36.3
+ Version 2.36.4
The latest version of this documentation can be found on-line at
<a class="ulink" href="http://library.gnome.org/devel/gdk-pixbuf/unstable/" target="_top">http://library.gnome.org/devel/gdk-pixbuf/unstable/</a>.
@@ -86,7 +86,7 @@
<span class="refentrytitle"><a href="gdk-pixbuf-Inline-data.html">Inline data</a></span><span class="refpurpose"> — Functions for inlined pixbuf handling.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gdk-pixbuf-Scaling.html">Scaling</a></span><span class="refpurpose"> — Scaling pixbufs and scaling and compositing pixbufs</span>
+<span class="refentrytitle"><a href="gdk-pixbuf-Scaling.html">Scaling</a></span><span class="refpurpose"> — Scaling pixbufs and scaling and alpha blending pixbufs</span>
</dt>
<dt>
<span class="refentrytitle"><a href="gdk-pixbuf-gdk-pixbuf-rendering.html">Rendering</a></span><span class="refpurpose"> — Rendering a pixbuf to a GDK drawable.</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/docs/reference/gdk-pixbuf/html/rn01.html new/gdk-pixbuf-2.36.4/docs/reference/gdk-pixbuf/html/rn01.html
--- old/gdk-pixbuf-2.36.3/docs/reference/gdk-pixbuf/html/rn01.html 2017-01-04 19:23:12.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/docs/reference/gdk-pixbuf/html/rn01.html 2017-01-16 19:55:40.000000000 +0100
@@ -58,7 +58,7 @@
<span class="refentrytitle"><a href="gdk-pixbuf-Inline-data.html">Inline data</a></span><span class="refpurpose"> — Functions for inlined pixbuf handling.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gdk-pixbuf-Scaling.html">Scaling</a></span><span class="refpurpose"> — Scaling pixbufs and scaling and compositing pixbufs</span>
+<span class="refentrytitle"><a href="gdk-pixbuf-Scaling.html">Scaling</a></span><span class="refpurpose"> — Scaling pixbufs and scaling and alpha blending pixbufs</span>
</dt>
<dt>
<span class="refentrytitle"><a href="gdk-pixbuf-gdk-pixbuf-rendering.html">Rendering</a></span><span class="refpurpose"> — Rendering a pixbuf to a GDK drawable.</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/docs/reference/gdk-pixbuf/version.xml new/gdk-pixbuf-2.36.4/docs/reference/gdk-pixbuf/version.xml
--- old/gdk-pixbuf-2.36.3/docs/reference/gdk-pixbuf/version.xml 2017-01-04 19:13:43.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/docs/reference/gdk-pixbuf/version.xml 2017-01-16 19:32:28.000000000 +0100
@@ -1 +1 @@
-2.36.3
+2.36.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/gdk-pixbuf/gdk-pixbuf-core.h new/gdk-pixbuf-2.36.4/gdk-pixbuf/gdk-pixbuf-core.h
--- old/gdk-pixbuf-2.36.3/gdk-pixbuf/gdk-pixbuf-core.h 2016-11-07 16:38:41.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/gdk-pixbuf/gdk-pixbuf-core.h 2017-01-16 19:16:51.000000000 +0100
@@ -115,7 +115,7 @@
* In the future it will do full alpha compositing.
*
* These values can be passed to
- * gdk_pixbuf_render_to_drawable_alpha() to control how the alpha
+ * gdk_pixbuf_xlib_render_to_drawable_alpha() to control how the alpha
* channel of an image should be handled. This function can create a
* bilevel clipping mask (black and white) and use it while painting
* the image. In the future, when the X Window System gets an alpha
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/gdk-pixbuf/gdk-pixbuf-features.h new/gdk-pixbuf-2.36.4/gdk-pixbuf/gdk-pixbuf-features.h
--- old/gdk-pixbuf-2.36.3/gdk-pixbuf/gdk-pixbuf-features.h 2017-01-04 19:13:43.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/gdk-pixbuf/gdk-pixbuf-features.h 2017-01-16 19:32:28.000000000 +0100
@@ -45,8 +45,8 @@
#define GDK_PIXBUF_MAJOR (2)
#define GDK_PIXBUF_MINOR (36)
-#define GDK_PIXBUF_MICRO (3)
-#define GDK_PIXBUF_VERSION "2.36.3"
+#define GDK_PIXBUF_MICRO (4)
+#define GDK_PIXBUF_VERSION "2.36.4"
#ifndef _GDK_PIXBUF_EXTERN
#define _GDK_PIXBUF_EXTERN extern
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/gdk-pixbuf/gdk-pixbuf-scale.c new/gdk-pixbuf-2.36.4/gdk-pixbuf/gdk-pixbuf-scale.c
--- old/gdk-pixbuf-2.36.3/gdk-pixbuf/gdk-pixbuf-scale.c 2016-12-20 14:43:26.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/gdk-pixbuf/gdk-pixbuf-scale.c 2017-01-16 19:16:51.000000000 +0100
@@ -27,16 +27,18 @@
/**
* SECTION:scaling
- * @Short_description: Scaling pixbufs and scaling and compositing pixbufs
+ * @Short_description: Scaling pixbufs and scaling and alpha blending pixbufs
* @Title: Scaling
* @See_also: <link linkend="gdk-GdkRGB">GdkRGB</link>.
*
* The GdkPixBuf contains functions to scale pixbufs, to scale
- * pixbufs and composite against an existing image, and to scale
- * pixbufs and composite against a solid color or checkerboard.
- * Compositing a checkerboard is a common way to show an image with
+ * pixbufs and alpha blend against an existing image, and to scale
+ * pixbufs and alpha blend against a solid color or checkerboard.
+ * Alpha blending a checkerboard is a common way to show an image with
* an alpha channel in image-viewing and editing software.
*
+ * Note that in these functions, the terms ‘alpha blending’ and ‘compositing’
+ * are used synonymously.
*
* Since the full-featured functions (gdk_pixbuf_scale(),
* gdk_pixbuf_composite(), and gdk_pixbuf_composite_color()) are
@@ -49,13 +51,19 @@
* If the destination pixbuf was created from a readonly source, these
* operations will force a copy into a mutable buffer.
*
- * Scaling and compositing functions take advantage of MMX hardware
+ * Scaling and alpha blending functions take advantage of MMX hardware
* acceleration on systems where MMX is supported. If gdk-pixbuf is built
* with the Sun mediaLib library, these functions are instead accelerated
* using mediaLib, which provides hardware acceleration on Intel, AMD,
* and Sparc chipsets. If desired, mediaLib support can be turned off by
* setting the `GDK_DISABLE_MEDIALIB` environment variable.
*
+ * The alpha blending function used is:
+ * |[
+ * Cd = Cs·As + Cd(1-As)
+ * ]|
+ * where `Cd` is the destination pixel color, `Cs` is the source pixel color,
+ * and `As` is the source pixel alpha.
*
* The following example demonstrates handling an expose event by
* rendering the appropriate area of a source image (which is scaled
@@ -179,7 +187,7 @@
* @scale_x and @scale_y then translating by @offset_x and @offset_y.
* This gives an image in the coordinates of the destination pixbuf.
* The rectangle (@dest_x, @dest_y, @dest_width, @dest_height)
- * is then composited onto the corresponding rectangle of the
+ * is then alpha blended onto the corresponding rectangle of the
* original destination image.
*
* When the destination rectangle contains parts not in the source
@@ -248,11 +256,14 @@
*
* Creates a transformation of the source image @src by scaling by
* @scale_x and @scale_y then translating by @offset_x and @offset_y,
- * then composites the rectangle (@dest_x ,@dest_y, @dest_width,
+ * then alpha blends the rectangle (@dest_x ,@dest_y, @dest_width,
* @dest_height) of the resulting image with a checkboard of the
* colors @color1 and @color2 and renders it onto the destination
* image.
*
+ * If the source image has no alpha channel, and @overall_alpha is 255, a fast
+ * path is used which omits the alpha blending and just performs the scaling.
+ *
* See gdk_pixbuf_composite_color_simple() for a simpler variant of this
* function suitable for many tasks.
*
@@ -319,7 +330,10 @@
* You can scale a sub-portion of @src by creating a sub-pixbuf
* pointing into @src; see gdk_pixbuf_new_subpixbuf().
*
- * For more complicated scaling/compositing see gdk_pixbuf_scale()
+ * If @dest_width and @dest_height are equal to the @src width and height, a
+ * copy of @src is returned, avoiding any scaling.
+ *
+ * For more complicated scaling/alpha blending see gdk_pixbuf_scale()
* and gdk_pixbuf_composite().
*
* Return value: (transfer full): the new #GdkPixbuf, or %NULL if not enough memory could be
@@ -337,6 +351,10 @@
g_return_val_if_fail (dest_width > 0, NULL);
g_return_val_if_fail (dest_height > 0, NULL);
+ /* Fast path. */
+ if (dest_width == src->width && dest_height == src->height)
+ return gdk_pixbuf_copy (src);
+
dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, src->has_alpha, 8, dest_width, dest_height);
if (!dest)
return NULL;
@@ -359,9 +377,9 @@
* @check_size: the size of checks in the checkboard (must be a power of two)
* @color1: the color of check at upper left
* @color2: the color of the other check
- *
+ *
* Creates a new #GdkPixbuf by scaling @src to @dest_width x
- * @dest_height and compositing the result with a checkboard of colors
+ * @dest_height and alpha blending the result with a checkboard of colors
* @color1 and @color2.
*
* Return value: (transfer full): the new #GdkPixbuf, or %NULL if not enough memory could be
@@ -406,6 +424,8 @@
* Rotates a pixbuf by a multiple of 90 degrees, and returns the
* result in a new pixbuf.
*
+ * If @angle is 0, a copy of @src is returned, avoiding any rotation.
+ *
* Returns: (nullable) (transfer full): the new #GdkPixbuf, or %NULL
* if not enough memory could be allocated for it.
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/gdk-pixbuf/gdk_pixbuf.rc new/gdk-pixbuf-2.36.4/gdk-pixbuf/gdk_pixbuf.rc
--- old/gdk-pixbuf-2.36.3/gdk-pixbuf/gdk_pixbuf.rc 2017-01-04 19:13:43.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/gdk-pixbuf/gdk_pixbuf.rc 2017-01-16 19:32:28.000000000 +0100
@@ -1,8 +1,8 @@
#include
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,36,3,0
- PRODUCTVERSION 2,36,3,0
+ FILEVERSION 2,36,4,0
+ PRODUCTVERSION 2,36,4,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@
BEGIN
VALUE "CompanyName", "The GTK developer community"
VALUE "FileDescription", "GIMP Toolkit"
- VALUE "FileVersion", "2.36.3.0"
+ VALUE "FileVersion", "2.36.4.0"
VALUE "InternalName", "libgdk_pixbuf-2.0-0"
VALUE "LegalCopyright", "Copyright (C) 1999 The Free Software Foundation. Modified by the GTK+ Team and others 1999-2011."
VALUE "OriginalFilename", "libgdk_pixbuf-2.0-0.dll"
VALUE "ProductName", "GTK+"
- VALUE "ProductVersion", "2.36.3"
+ VALUE "ProductVersion", "2.36.4"
END
END
BLOCK "VarFileInfo"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/po/gdk-pixbuf.pot new/gdk-pixbuf-2.36.4/po/gdk-pixbuf.pot
--- old/gdk-pixbuf-2.36.3/po/gdk-pixbuf.pot 2017-01-04 19:20:48.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/po/gdk-pixbuf.pot 2017-01-16 19:53:22.000000000 +0100
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: gdk-pixbuf 2.36.3\n"
+"Project-Id-Version: gdk-pixbuf 2.36.4\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-"
"pixbuf\n"
-"POT-Creation-Date: 2017-01-04 13:20-0500\n"
+"POT-Creation-Date: 2017-01-16 13:53-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Binary files old/gdk-pixbuf-2.36.3/po/lt.gmo and new/gdk-pixbuf-2.36.4/po/lt.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/po/lt.po new/gdk-pixbuf-2.36.4/po/lt.po
--- old/gdk-pixbuf-2.36.3/po/lt.po 2016-11-07 16:37:35.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/po/lt.po 2017-01-16 19:16:51.000000000 +0100
@@ -7,15 +7,15 @@
# Gintautas Miliauskas , 2007.
# Rimas Kudelis , 2008, 2010.
# Gintautas Miliauskas , 2009.
-# Aurimas Černius , 2013, 2014, 2015, 2016.
+# Aurimas Černius , 2013, 2014, 2015, 2016, 2017.
#
msgid ""
msgstr ""
"Project-Id-Version: lt\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk"
-"%2b&keywords=I18N+L10N&component=gdk\n"
-"POT-Creation-Date: 2016-08-03 16:48+0000\n"
-"PO-Revision-Date: 2016-08-03 21:59+0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-"
+"pixbuf&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-12-13 17:12+0000\n"
+"PO-Revision-Date: 2017-01-07 15:14+0200\n"
"Last-Translator: Aurimas Černius \n"
"Language-Team: Lietuvių \n"
"Language: lt\n"
@@ -26,13 +26,13 @@
"%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: gdk-pixbuf/gdk-pixbuf-animation.c:156 gdk-pixbuf/gdk-pixbuf-io.c:1076
-#: gdk-pixbuf/gdk-pixbuf-io.c:1332
+#: gdk-pixbuf/gdk-pixbuf-animation.c:156 gdk-pixbuf/gdk-pixbuf-io.c:1070
+#: gdk-pixbuf/gdk-pixbuf-io.c:1330
#, c-format
msgid "Failed to open file '%s': %s"
msgstr "Nepavyko atverti failo „%s“: %s"
-#: gdk-pixbuf/gdk-pixbuf-animation.c:169 gdk-pixbuf/gdk-pixbuf-io.c:961
+#: gdk-pixbuf/gdk-pixbuf-animation.c:169 gdk-pixbuf/gdk-pixbuf-io.c:955
#, c-format
msgid "Image file '%s' contains no data"
msgstr "Paveikslėlio faile „%s“ nėra duomenų"
@@ -46,8 +46,8 @@
"Nepavyko įkelti animacijos „%s“: nežinoma priežastis, tikriausiai sugadintas "
"failas"
-#: gdk-pixbuf/gdk-pixbuf-animation.c:275 gdk-pixbuf/gdk-pixbuf-io.c:1112
-#: gdk-pixbuf/gdk-pixbuf-io.c:1384
+#: gdk-pixbuf/gdk-pixbuf-animation.c:275 gdk-pixbuf/gdk-pixbuf-io.c:1106
+#: gdk-pixbuf/gdk-pixbuf-io.c:1382
#, c-format
msgid ""
"Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -128,12 +128,12 @@
msgid "Readonly pixel data"
msgstr "Pikselių duomenys tik skaitymui"
-#: gdk-pixbuf/gdk-pixbuf-io.c:781
+#: gdk-pixbuf/gdk-pixbuf-io.c:775
#, c-format
msgid "Unable to load image-loading module: %s: %s"
msgstr "Nepavyko įkelti paveikslėlių kelties modulio: %s: %s"
-#: gdk-pixbuf/gdk-pixbuf-io.c:796
+#: gdk-pixbuf/gdk-pixbuf-io.c:790
#, c-format
msgid ""
"Image-loading module %s does not export the proper interface; perhaps it's "
@@ -142,21 +142,21 @@
"Paveikslėlių kelties modulis „%s“ neeksportuoja teisingos sąsajos; galbūt "
"jis yra iš kitos „gdk-pixbuf“ versijos?"
-#: gdk-pixbuf/gdk-pixbuf-io.c:805 gdk-pixbuf/gdk-pixbuf-io.c:848
+#: gdk-pixbuf/gdk-pixbuf-io.c:799 gdk-pixbuf/gdk-pixbuf-io.c:842
#, c-format
msgid "Image type '%s' is not supported"
msgstr "Paveikslėlio tipas „%s“ nepalaikomas"
-#: gdk-pixbuf/gdk-pixbuf-io.c:933
+#: gdk-pixbuf/gdk-pixbuf-io.c:927
#, c-format
msgid "Couldn't recognize the image file format for file '%s'"
msgstr "Nepavyko atpažinti paveikslėlio failo „%s“ formato"
-#: gdk-pixbuf/gdk-pixbuf-io.c:941
+#: gdk-pixbuf/gdk-pixbuf-io.c:935
msgid "Unrecognized image file format"
msgstr "Neatpažintas paveikslėlio failo formatas"
-#: gdk-pixbuf/gdk-pixbuf-io.c:1123
+#: gdk-pixbuf/gdk-pixbuf-io.c:1117
#, c-format
msgid "Failed to load image '%s': %s"
msgstr "Nepavyko įkelti paveikslėlio „%s“: %s"
@@ -185,12 +185,12 @@
msgid "Failed to read from temporary file"
msgstr "Nepavyko perskaityti laikino failo"
-#: gdk-pixbuf/gdk-pixbuf-io.c:2512
+#: gdk-pixbuf/gdk-pixbuf-io.c:2468
#, c-format
msgid "Failed to open '%s' for writing: %s"
msgstr "Nepavyko atverti „%s“ įrašymui: %s"
-#: gdk-pixbuf/gdk-pixbuf-io.c:2538
+#: gdk-pixbuf/gdk-pixbuf-io.c:2494
#, c-format
msgid ""
"Failed to close '%s' while writing image, all data may not have been saved: "
@@ -199,11 +199,11 @@
"Saugant paveikslėlį nepavyko uždaryti „%s“, duomenys gali būti neišsaugoti: "
"%s"
-#: gdk-pixbuf/gdk-pixbuf-io.c:2759 gdk-pixbuf/gdk-pixbuf-io.c:2811
+#: gdk-pixbuf/gdk-pixbuf-io.c:2712 gdk-pixbuf/gdk-pixbuf-io.c:2764
msgid "Insufficient memory to save image into a buffer"
msgstr "Nepakanka atminties įšsaugoti paveikslėlį į buferį"
-#: gdk-pixbuf/gdk-pixbuf-io.c:2857
+#: gdk-pixbuf/gdk-pixbuf-io.c:2810
msgid "Error writing to image stream"
msgstr "Klaida rašant į paveikslėlio srautą"
@@ -238,11 +238,12 @@
msgid "Image format unknown"
msgstr "Paveikslėlio formatas nežinomas"
-#: gdk-pixbuf/gdk-pixdata.c:175 gdk-pixbuf/gdk-pixdata.c:513
+#: gdk-pixbuf/gdk-pixdata.c:175 gdk-pixbuf/gdk-pixdata.c:517
+#: gdk-pixbuf/gdk-pixdata.c:532
msgid "Image pixel data corrupt"
msgstr "Paveikslėlio taškiniai duomenys apgadinti"
-#: gdk-pixbuf/gdk-pixdata.c:457
+#: gdk-pixbuf/gdk-pixdata.c:461
#, c-format
msgid "failed to allocate image buffer of %u byte"
msgid_plural "failed to allocate image buffer of %u bytes"
@@ -306,7 +307,7 @@
msgid "BMP image width too large"
msgstr "BMP paveikslėlis yra per platus"
-#: gdk-pixbuf/io-bmp.c:732 gdk-pixbuf/io-png.c:531 gdk-pixbuf/io-pnm.c:705
+#: gdk-pixbuf/io-bmp.c:732 gdk-pixbuf/io-png.c:531 gdk-pixbuf/io-pnm.c:721
msgid "Premature end-of-file encountered"
msgstr "Per anksti aptiktas failo pabaigos simbolis"
@@ -343,7 +344,7 @@
msgid "Windows icon"
msgstr "Windows piktograma"
-#: gdk-pixbuf/io-gdip-jpeg.c:54 gdk-pixbuf/io-jpeg.c:1297
+#: gdk-pixbuf/io-gdip-jpeg.c:54 gdk-pixbuf/io-jpeg.c:1312
#, c-format
msgid ""
"JPEG quality must be a value between 0 and 100; value '%s' could not be "
@@ -352,14 +353,14 @@
"JPEG kokybės reikšmė turi būti tarp 0 ir 100, reikšmės „%s“ nepavyko "
"apdoroti."
-#: gdk-pixbuf/io-gdip-jpeg.c:69 gdk-pixbuf/io-jpeg.c:1313
+#: gdk-pixbuf/io-gdip-jpeg.c:69 gdk-pixbuf/io-jpeg.c:1328
#, c-format
msgid ""
"JPEG quality must be a value between 0 and 100; value '%d' is not allowed."
msgstr ""
"JPEG kokybės reikšmė turi būti tarp 0 ir 100; reikšmė „%d“ yra neleistina."
-#: gdk-pixbuf/io-gdip-jpeg.c:147 gdk-pixbuf/io-jpeg.c:1586
+#: gdk-pixbuf/io-gdip-jpeg.c:147 gdk-pixbuf/io-jpeg.c:1601
msgctxt "image format"
msgid "JPEG"
msgstr "JPEG"
@@ -501,7 +502,6 @@
#: gdk-pixbuf/io-ico.c:230 gdk-pixbuf/io-ico.c:244 gdk-pixbuf/io-ico.c:317
#: gdk-pixbuf/io-ico.c:328 gdk-pixbuf/io-ico.c:403 gdk-pixbuf/io-ico.c:428
#, c-format
-#| msgid "Invalid header in icon"
msgid "Invalid header in icon (%s)"
msgstr "Netinkama antraštė piktogramoje (%s)"
@@ -573,7 +573,7 @@
msgid "Error interpreting JPEG image file (%s)"
msgstr "Klaida interpretuojant JPEG paveikslėlio failą (%s)"
-#: gdk-pixbuf/io-jpeg.c:600
+#: gdk-pixbuf/io-jpeg.c:615
msgid ""
"Insufficient memory to load image, try exiting some applications to free "
"memory"
@@ -581,46 +581,37 @@
"Nepakanka atminties pakrauti paveikslėlį, uždarykite dalį programų, kad "
"atlaisvinti atmintį"
-#: gdk-pixbuf/io-jpeg.c:669 gdk-pixbuf/io-jpeg.c:882
+#: gdk-pixbuf/io-jpeg.c:684 gdk-pixbuf/io-jpeg.c:897
#, c-format
msgid "Unsupported JPEG color space (%s)"
msgstr "Nepalaikoma JPEG spalvų gama (%s)"
-#: gdk-pixbuf/io-jpeg.c:781 gdk-pixbuf/io-jpeg.c:1062 gdk-pixbuf/io-jpeg.c:1398
-#: gdk-pixbuf/io-jpeg.c:1408
+#: gdk-pixbuf/io-jpeg.c:796 gdk-pixbuf/io-jpeg.c:1077 gdk-pixbuf/io-jpeg.c:1413
+#: gdk-pixbuf/io-jpeg.c:1423
msgid "Couldn't allocate memory for loading JPEG file"
msgstr "Nepakako atminties įkelti JPEG failą"
-#: gdk-pixbuf/io-jpeg.c:1036
+#: gdk-pixbuf/io-jpeg.c:1051
msgid "Transformed JPEG has zero width or height."
msgstr "Pakeistas JPEG turi nulinį plotį arba aukštį."
-#: gdk-pixbuf/io-jpeg.c:1334
+#: gdk-pixbuf/io-jpeg.c:1349
#, c-format
msgid ""
"JPEG x-dpi must be a value between 1 and 65535; value '%s' is not allowed."
msgstr "JPEG x-dpi turi būti nuo 1 iki 65535; vertė „%s“ neleidžiama."
-#: gdk-pixbuf/io-jpeg.c:1355
+#: gdk-pixbuf/io-jpeg.c:1370
#, c-format
msgid ""
"JPEG y-dpi must be a value between 1 and 65535; value '%s' is not allowed."
msgstr "JPEG y-dpi turi būti nuo 1 iki 65535; vertė „%s“ neleidžiama."
-#: gdk-pixbuf/io-jpeg.c:1369
+#: gdk-pixbuf/io-jpeg.c:1384
#, c-format
msgid "Color profile has invalid length '%u'."
msgstr "Spalvų profilio ilgis „%u“ netinkamas."
-#: gdk-pixbuf/io-pixdata.c:150
-msgid "Transformed pixbuf has zero width or height."
-msgstr "Transformuotas pikselių žemėlapis turi nulinį plotį arba aukštį."
-
-#: gdk-pixbuf/io-pixdata.c:189
-msgctxt "image format"
-msgid "GdkPixdata"
-msgstr "GdkPixdata"
-
#: gdk-pixbuf/io-png.c:54
msgid "Bits per channel of PNG image is invalid."
msgstr "Netinkamas PNG paveikslėlio bitų skaičius kanalui."
@@ -733,52 +724,62 @@
msgstr "PNM failas naudoja neatpažįstamą PNM antrinį formatą"
#: gdk-pixbuf/io-pnm.c:333
+#| msgid "PNM file has an image width of 0"
+msgid "PNM file has an invalid width"
+msgstr "PNM failas yra netinkamo pločio"
+
+#: gdk-pixbuf/io-pnm.c:341
msgid "PNM file has an image width of 0"
msgstr "PNM faile yra paveikslėlis, kurio plotis lygus nuliui"
-#: gdk-pixbuf/io-pnm.c:354
+#: gdk-pixbuf/io-pnm.c:362
+#| msgid "PNM file has an image height of 0"
+msgid "PNM file has an invalid height"
+msgstr "PNM failas yra netinkamo aukščio"
+
+#: gdk-pixbuf/io-pnm.c:370
msgid "PNM file has an image height of 0"
msgstr "PNM faile yra paveikslėlis, kurio aukštis lygus nuliui"
-#: gdk-pixbuf/io-pnm.c:377
+#: gdk-pixbuf/io-pnm.c:393
msgid "Maximum color value in PNM file is 0"
msgstr "Didžiausia PNM spalvos reikšmė yra 0"
-#: gdk-pixbuf/io-pnm.c:385
+#: gdk-pixbuf/io-pnm.c:401
msgid "Maximum color value in PNM file is too large"
msgstr "Didžiausia spalvos reikšmė PNM faile yra per didelė"
-#: gdk-pixbuf/io-pnm.c:425 gdk-pixbuf/io-pnm.c:455 gdk-pixbuf/io-pnm.c:500
+#: gdk-pixbuf/io-pnm.c:441 gdk-pixbuf/io-pnm.c:471 gdk-pixbuf/io-pnm.c:516
msgid "Raw PNM image type is invalid"
msgstr "Netinkamas neapdoroto PNM paveikslėlio tipas"
-#: gdk-pixbuf/io-pnm.c:650
+#: gdk-pixbuf/io-pnm.c:666
msgid "PNM image loader does not support this PNM subformat"
msgstr "PNM apdorojimo posistemė nepalaiko šio PNM antrinio formato"
-#: gdk-pixbuf/io-pnm.c:737 gdk-pixbuf/io-pnm.c:964
+#: gdk-pixbuf/io-pnm.c:753 gdk-pixbuf/io-pnm.c:980
msgid "Raw PNM formats require exactly one whitespace before sample data"
msgstr ""
"Neapdorotuose PNM formato paveikslėliose turi būti lygiai vienas tarpas "
"prieš pavyzdžio duomenis"
-#: gdk-pixbuf/io-pnm.c:764
+#: gdk-pixbuf/io-pnm.c:780
msgid "Cannot allocate memory for loading PNM image"
msgstr "Nepavyko rezervuoti atminties kiekio būtino PNM failo atvaizdavimui"
-#: gdk-pixbuf/io-pnm.c:814
+#: gdk-pixbuf/io-pnm.c:830
msgid "Insufficient memory to load PNM context struct"
msgstr "Nepakanka atminties apdoroti PNM struktūrą"
-#: gdk-pixbuf/io-pnm.c:865
+#: gdk-pixbuf/io-pnm.c:881
msgid "Unexpected end of PNM image data"
msgstr "Netikėta PNM paveikslėlio duomenų pabaiga"
-#: gdk-pixbuf/io-pnm.c:993
+#: gdk-pixbuf/io-pnm.c:1009
msgid "Insufficient memory to load PNM file"
msgstr "Nepakanka atminties apdoroti PNM failą"
-#: gdk-pixbuf/io-pnm.c:1077
+#: gdk-pixbuf/io-pnm.c:1093
msgctxt "image format"
msgid "PNM/PBM/PGM/PPM"
msgstr "PNM/PBM/PGM/PPM"
@@ -998,6 +999,13 @@
msgid "XPM"
msgstr "XPM"
+#~ msgid "Transformed pixbuf has zero width or height."
+#~ msgstr "Transformuotas pikselių žemėlapis turi nulinį plotį arba aukštį."
+
+#~ msgctxt "image format"
+#~ msgid "GdkPixdata"
+#~ msgstr "GdkPixdata"
+
#~ msgid "Cannot allocate memory for IOBuffer struct"
#~ msgstr "Nepavyko rezervuoti atminties IOBuffer struktūrai"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/tests/pixbuf-scale.c new/gdk-pixbuf-2.36.4/tests/pixbuf-scale.c
--- old/gdk-pixbuf-2.36.3/tests/pixbuf-scale.c 2016-12-20 14:43:26.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/tests/pixbuf-scale.c 2017-01-16 19:16:51.000000000 +0100
@@ -237,6 +237,7 @@
GdkInterpType interp_type = *(GdkInterpType *) data;
const GdkPixbuf *source; /* Source image */
gint width = 256, height = 256; /* Size of source image */
+ gint scaled_width, scaled_height; /* Size of scaled image */
GdkPixbuf *scaled; /* Scaled version */
guchar *row; /* Pointer to start of row of pixels within the image */
guchar *pixel; /* Pointer to current pixel data in row */
@@ -248,14 +249,18 @@
source = make_checkerboard (width, height);
scaled = gdk_pixbuf_scale_simple (source, width / 2, height / 2, interp_type);
+ scaled_width = gdk_pixbuf_get_width (scaled);
+ scaled_height = gdk_pixbuf_get_height (scaled);
+ g_assert_cmpint (scaled_width, >, 0);
+ g_assert_cmpint (scaled_height, >, 0);
/* Check that the result is all gray (or all white in the case of NEAREST) */
for (y = 0, row = gdk_pixbuf_get_pixels (scaled);
- y < gdk_pixbuf_get_height (scaled);
+ y < (guint) scaled_height;
y++, row += gdk_pixbuf_get_rowstride (scaled))
{
for (x = 0, pixel = row;
- x < gdk_pixbuf_get_width (scaled);
+ x < (guint) scaled_width;
x++, pixel += gdk_pixbuf_get_n_channels (scaled))
{
if (!(pixel[0] == expected && pixel[1] == expected && pixel[2] == expected))
@@ -263,8 +268,8 @@
/* Expected failure: HYPER has a different opinion about the color
* of the corner pixels: (126,126,126) and (130,130,130) */
if (interp_type == GDK_INTERP_HYPER &&
- (x == 0 || x == gdk_pixbuf_get_width (scaled) - 1) &&
- (y == 0 || y == gdk_pixbuf_get_height (scaled) - 1))
+ (x == 0 || x == scaled_width - 1) &&
+ (y == 0 || y == scaled_height - 1))
{
continue;
}
@@ -288,9 +293,10 @@
GdkInterpType interp_type)
{
GdkPixbuf *cropped, *scaled;
- guchar *crow, *srow; /* Pointer to current row in image data */
- guchar *cpixel, *spixel; /* Pointer to current pixel in row */
+ guchar *crow, *srow; /* Pointer to current row in image data */
+ guchar *cpixel, *spixel; /* Pointer to current pixel in row */
guint x, y;
+ gint scaled_width, scaled_height; /* Size of scaled image */
cropped = gdk_pixbuf_new_subpixbuf ((GdkPixbuf *)source, offset_x, offset_y, width, height);
g_assert_nonnull (cropped);
@@ -304,14 +310,19 @@
1.0, 1.0, /* scale_[xy] */
interp_type);
+ scaled_width = gdk_pixbuf_get_width (scaled);
+ scaled_height = gdk_pixbuf_get_height (scaled);
+ g_assert_cmpint (scaled_width, >, 0);
+ g_assert_cmpint (scaled_height, >, 0);
+
for (y = 0, crow = gdk_pixbuf_get_pixels (cropped),
srow = gdk_pixbuf_get_pixels (scaled);
- y < gdk_pixbuf_get_height (scaled);
+ y < scaled_height;
y++, crow += gdk_pixbuf_get_rowstride (cropped),
srow += gdk_pixbuf_get_rowstride (scaled))
{
for (x = 0, cpixel = crow, spixel = srow;
- x < gdk_pixbuf_get_width (scaled);
+ x < scaled_width;
x++, cpixel += gdk_pixbuf_get_n_channels (cropped),
spixel += gdk_pixbuf_get_n_channels (scaled))
{
@@ -322,8 +333,8 @@
/* Expected failure: HYPER has a different opinion about the
* colors of the edge pixels */
if (interp_type == GDK_INTERP_HYPER &&
- ((x == 0 || x == gdk_pixbuf_get_width (scaled) - 1) ||
- (y == 0 || y == gdk_pixbuf_get_height (scaled) - 1)))
+ ((x == 0 || x == scaled_width - 1) ||
+ (y == 0 || y == scaled_height - 1)))
{
continue;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdk-pixbuf-2.36.3/thumbnailer/gdk-pixbuf-thumbnailer.c new/gdk-pixbuf-2.36.4/thumbnailer/gdk-pixbuf-thumbnailer.c
--- old/gdk-pixbuf-2.36.3/thumbnailer/gdk-pixbuf-thumbnailer.c 2016-12-20 14:43:26.000000000 +0100
+++ new/gdk-pixbuf-2.36.4/thumbnailer/gdk-pixbuf-thumbnailer.c 2017-01-16 19:16:51.000000000 +0100
@@ -46,31 +46,14 @@
info->input_height = height;
if (width < info->size && height < info->size) return;
+ if (info->size <= 0) return;
- if ((info->size > 0 || info->size > 0)) {
- if (info->size < 0)
- {
- width = width * (double)info->size/(double)height;
- height = info->size;
- }
- else if (info->size < 0)
- {
- height = height * (double)info->size/(double)width;
- width = info->size;
- }
- else if ((double)height * (double)info->size >
- (double)width * (double)info->size) {
- width = 0.5 + (double)width * (double)info->size / (double)height;
- height = info->size;
- } else {
- height = 0.5 + (double)height * (double)info->size / (double)width;
- width = info->size;
- }
+ if (height > width) {
+ width = 0.5 + (double)width * (double)info->size / (double)height;
+ height = info->size;
} else {
- if (info->size > 0)
- width = info->size;
- if (info->size > 0)
- height = info->size;
+ height = 0.5 + (double)height * (double)info->size / (double)width;
+ width = info->size;
}
gdk_pixbuf_loader_set_size (loader, width, height);