Hello community, here is the log from the commit of package libXrender for openSUSE:Factory checked in at 2012-05-08 11:58:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXrender (Old) and /work/SRC/openSUSE:Factory/.libXrender.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libXrender", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libXrender/libXrender.changes 2012-02-17 12:04:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libXrender.new/libXrender.changes 2012-05-08 11:59:17.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Apr 11 15:13:29 UTC 2012 - [email protected] + +- Update to version 0.9.7: + + Fix alpha premultiplication in XRenderParseColor + + Compiler warning fixes + + Documentation typo fixes + + Build configuration fixes + +------------------------------------------------------------------- Old: ---- libXrender-0.9.6.tar.bz2 New: ---- libXrender-0.9.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXrender.spec ++++++ --- /var/tmp/diff_new_pack.n4TUcL/_old 2012-05-08 11:59:19.000000000 +0200 +++ /var/tmp/diff_new_pack.n4TUcL/_new 2012-05-08 11:59:19.000000000 +0200 @@ -14,9 +14,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: libXrender %define lname libXrender1 -Version: 0.9.6 +Version: 0.9.7 Release: 0 Summary: X Rendering Extension library License: MIT @@ -24,11 +26,13 @@ Url: http://cgit.freedesktop.org/xorg/lib/libXrender/ #Git-Clone: git://anongit.freedesktop.org/xorg/lib/libXrender -Source: %name-%version.tar.bz2 -BuildRoot: %_tmppath/%name-%version-build +Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.60, automake, libtool -BuildRequires: pkgconfig, pkgconfig(xorg-macros) >= 1.3, pkgconfig(x11) +BuildRequires: pkgconfig BuildRequires: pkgconfig(renderproto) >= 0.9 +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xorg-macros) >= 1.8 %description The Xrender library is designed as a lightweight library interface to ++++++ libXrender-0.9.6.tar.bz2 -> libXrender-0.9.7.tar.bz2 ++++++ ++++ 47377 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrender-0.9.6/COPYING new/libXrender-0.9.7/COPYING --- old/libXrender-0.9.6/COPYING 2010-01-30 08:39:43.000000000 +0100 +++ new/libXrender-0.9.7/COPYING 2012-03-08 05:47:00.000000000 +0100 @@ -35,5 +35,5 @@ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION -OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrender-0.9.6/ChangeLog new/libXrender-0.9.7/ChangeLog --- old/libXrender-0.9.6/ChangeLog 2010-06-09 04:24:41.000000000 +0200 +++ new/libXrender-0.9.7/ChangeLog 2012-03-08 05:49:17.000000000 +0100 @@ -1,3 +1,102 @@ +commit bf1aa4e05997ab97be4413ccdb6d0d1eb45aeefe +Author: Alan Coopersmith <[email protected]> +Date: Wed Mar 7 20:46:50 2012 -0800 + + libXrender 0.9.7 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit bb6568cbec24ae2c84bb5d9fe418f0021291a0af +Author: Emanuele Giaquinta <[email protected]> +Date: Mon Jan 2 19:58:15 2012 +0000 + + Fix alpha premultiplication in XRenderParseColor. + + Due to C arithmetic conversion rules we must use an unsigned constant (or a + cast) to perform the multiplication using unsigned arithmetic. + + Reviewed-by: Jeremy Huddleston <[email protected]> + +commit b3cfeecf2bddbbb120a9c796a4c9fb8fd08e15fc +Author: Alan Coopersmith <[email protected]> +Date: Fri Sep 16 22:51:39 2011 -0700 + + Strip trailing whitespace + + Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}' + git diff -w & git diff -b show no diffs from this change + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit eaae07c9c9690228e16ab8dc537a8a0c2ae175bf +Author: Alan Coopersmith <[email protected]> +Date: Sun May 22 12:47:10 2011 -0700 + + Make DEPTH_MASK generate unsigned ints + + Clears Sun compiler warning: + "Xrender.c", line 127: warning: integer overflow detected: op "<<" + since 1 << 31 overflows a signed 32-bit int. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 1025ca2d9a00bc60639689fba177d186dace5483 +Author: Gaetan Nadon <[email protected]> +Date: Wed Feb 2 11:43:44 2011 -0500 + + config: comment, minor upgrade, quote and layout configure.ac + + Group statements per section as per Autoconf standard layout + Quote statements where appropriate. + Autoconf recommends not using dnl instead of # for comments + + Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters. + Add AC_CONFIG_SRCDIR([Makefile.am]) + Remove redundant AC_SUBST(*_CFLAGS) and/or *_LIBS + Update minimum version of util-macros to at least 1.8. + No functional configuration changes + + This helps automated maintenance and release activities. + Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines + +commit d3258bb910de98836f01be320ff59bb841eef825 +Author: Gaetan Nadon <[email protected]> +Date: Fri Jan 28 19:41:37 2011 -0500 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit ba0036d984787dc2da74ef3d8ffb9b81ca13c19c +Author: Gaetan Nadon <[email protected]> +Date: Thu Jan 27 18:50:15 2011 -0500 + + config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 + + XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls + AC_PROG_C_C99. This sets gcc with -std=gnu99. + If AC_PROG_CC macro is called afterwards, it resets CC to gcc. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 5fb74888fd77843c81de038365791f29c799bbec +Author: Aaron Plattner <[email protected]> +Date: Thu Nov 4 09:13:49 2010 -0700 + + Fix some minor typos + + Signed-off-by: Aaron Plattner <[email protected]> + +commit b1c60edb6b6a965e58fed3b613c266364a5ec0ce +Author: Fernando Carrijo <[email protected]> +Date: Thu Jul 1 07:02:41 2010 -0300 + + Purge macros NEED_EVENTS and NEED_REPLIES + + Signed-off-by: Fernando Carrijo <[email protected]> + Acked-by: Tiago Vignatti <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + commit d3d20437ceee1c225cd189fdeb6378552e206337 Author: Alan Coopersmith <[email protected]> Date: Tue Jun 8 19:23:04 2010 -0700 @@ -183,7 +282,7 @@ Replace static ChangeLog with dist-hook to generate from git log commit e10d5cbe4c5ed98ae1856e20a0e9d31321330d53 -Merge: 497dda5... 9d3f9fd... +Merge: 497dda5 9d3f9fd Author: Eric Anholt <[email protected]> Date: Wed Sep 5 08:25:12 2007 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrender-0.9.6/Makefile.am new/libXrender-0.9.7/Makefile.am --- old/libXrender-0.9.6/Makefile.am 2010-04-10 02:46:41.000000000 +0200 +++ new/libXrender-0.9.7/Makefile.am 2012-03-08 05:47:00.000000000 +0100 @@ -1,6 +1,6 @@ -# +# # Copyright © 2003 Keith Packard, Noah Levitt -# +# # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ # specific, written prior permission. Keith Packard makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrender-0.9.6/configure.ac new/libXrender-0.9.7/configure.ac --- old/libXrender-0.9.6/configure.ac 2010-06-09 04:21:49.000000000 +0200 +++ new/libXrender-0.9.7/configure.ac 2012-03-08 05:47:00.000000000 +0100 @@ -1,67 +1,65 @@ -dnl -dnl Copyright © 2003 Keith Packard, Noah Levitt -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation, and that the name of Keith Packard not be used in -dnl advertising or publicity pertaining to distribution of the software without -dnl specific, written prior permission. Keith Packard makes no -dnl representations about the suitability of this software for any purpose. It -dnl is provided "as is" without express or implied warranty. -dnl -dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -dnl PERFORMANCE OF THIS SOFTWARE. -dnl -dnl Process this file with autoconf to create configure. +# +# Copyright © 2003 Keith Packard, Noah Levitt +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of Keith Packard not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Keith Packard makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Initialize Autoconf AC_PREREQ([2.60]) +# +# Version should match the current Render version. XRenderQueryVersion +# returns the version from render.h, NOT the version we set here. But we +# try to keep these the same. Note that the library has an extra +# digit in the version number to track changes which don't affect the +# protocol, so Xrender version l.n.m corresponds to protocol version l.n +# +AC_INIT(libXrender, [0.9.7], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXrender]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) -dnl -dnl Version should match the current Render version. XRenderQueryVersion -dnl returns the version from render.h, NOT the version we set here. But we -dnl try to keep these the same. Note that the library has an extra -dnl digit in the version number to track changes which don't affect the -dnl protocol, so Xrender version l.n.m corresponds to protocol version l.n -dnl -AC_INIT(libXrender, - 0.9.6, - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - libXrender) +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Initialize libtool +AC_PROG_LIBTOOL + +# Require X.Org macros 1.8 or later for AC_PROG_INSTALL m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -AM_CONFIG_HEADER(config.h) - -# Check for progs -AC_PROG_CC -AC_PROG_LIBTOOL +XORG_CHECK_MALLOC_ZERO # Check render configuration, strip extra digits from package version to # find the required protocol version - if test "$VERSION" = "" ; then VERSION=$PACKAGE_VERSION; fi RENDER_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] AC_SUBST(RENDER_VERSION) -PKG_CHECK_MODULES(RENDER, x11 renderproto >= $RENDER_VERSION) -AC_SUBST(RENDER_CFLAGS) -XORG_CHECK_MALLOC_ZERO - -AC_OUTPUT([Makefile - src/Makefile - xrender.pc]) +# Obtain compiler/linker options for depedencies +PKG_CHECK_MODULES(RENDER, x11 renderproto >= $RENDER_VERSION) +AC_CONFIG_FILES([Makefile + src/Makefile + xrender.pc]) +AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrender-0.9.6/doc/libXrender.txt new/libXrender-0.9.7/doc/libXrender.txt --- old/libXrender-0.9.6/doc/libXrender.txt 2009-10-16 23:26:58.000000000 +0200 +++ new/libXrender-0.9.7/doc/libXrender.txt 2012-03-08 05:47:00.000000000 +0100 @@ -273,7 +273,7 @@ #define PictStandardA1 4 #define PictStandardNUM 5 -As a convenience, this function locates PictFormats that coorespond to +As a convenience, this function locates PictFormats that correspond to commonly used formats. ARGB32 depth 32, bits 31-24 A, 23-16 R, 15-8 G, 7-0 B @@ -282,7 +282,7 @@ A4 depth 4, bits 3-0 A A1 depth 1, bits 0 A -Any server supporting Render must have a PictFormat cooresponding to each of +Any server supporting Render must have a PictFormat corresponding to each of these standard formats. 3.4 Index type PictFormat color values @@ -330,7 +330,7 @@ #define CPPolyMode (1 << 10) #define CPDither (1 << 11) #define CPComponentAlpha (1 << 12) - #define CPLastBit 11 + #define CPLastBit 12 Creates a picture for drawable in the specified format. Any values specified in 'attributes' and 'valuemask' are used in place of the default diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrender-0.9.6/include/X11/extensions/Xrender.h new/libXrender-0.9.7/include/X11/extensions/Xrender.h --- old/libXrender-0.9.6/include/X11/extensions/Xrender.h 2009-10-16 23:26:58.000000000 +0200 +++ new/libXrender-0.9.7/include/X11/extensions/Xrender.h 2012-03-08 05:47:00.000000000 +0100 @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. @@ -220,7 +220,7 @@ unsigned long mask, _Xconst XRenderPictFormat *templ, int count); - + #define PictStandardARGB32 0 #define PictStandardRGB24 1 #define PictStandardA8 2 @@ -468,7 +468,7 @@ int npoints, int winding); Status -XRenderParseColor(Display *dpy, +XRenderParseColor(Display *dpy, char *spec, XRenderColor *def); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrender-0.9.6/src/Color.c new/libXrender-0.9.7/src/Color.c --- old/libXrender-0.9.6/src/Color.c 2009-10-16 23:26:58.000000000 +0200 +++ new/libXrender-0.9.7/src/Color.c 2012-03-08 05:47:00.000000000 +0100 @@ -29,14 +29,14 @@ Status XRenderParseColor(Display *dpy, char *spec, XRenderColor *def) { - + if (!strncmp (spec, "rgba:", 5)) { unsigned short elements[4]; unsigned short *pShort; int i, n; char c; - + spec += 5; /* * Attempt to parse the value portion. @@ -76,7 +76,7 @@ { XColor coreColor; Colormap colormap; - + colormap = DefaultColormap (dpy, DefaultScreen (dpy)); if (!XParseColor (dpy, colormap, spec, &coreColor)) return 0; @@ -85,8 +85,8 @@ def->blue = coreColor.blue; def->alpha = 0xffff; } - def->red = (def->red * def->alpha) / 65535; - def->green = (def->green * def->alpha) / 65535; - def->blue = (def->blue * def->alpha) / 65535; + def->red = (def->red * def->alpha) / 0xffffU; + def->green = (def->green * def->alpha) / 0xffffU; + def->blue = (def->blue * def->alpha) / 0xffffU; return 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrender-0.9.6/src/Composite.c new/libXrender-0.9.7/src/Composite.c --- old/libXrender-0.9.6/src/Composite.c 2009-10-16 23:26:58.000000000 +0200 +++ new/libXrender-0.9.7/src/Composite.c 2012-03-08 05:47:00.000000000 +0100 @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrender-0.9.6/src/Cursor.c new/libXrender-0.9.7/src/Cursor.c --- old/libXrender-0.9.6/src/Cursor.c 2009-10-16 23:26:58.000000000 +0200 +++ new/libXrender-0.9.7/src/Cursor.c 2012-03-08 05:47:00.000000000 +0100 @@ -45,7 +45,7 @@ req->src = source; req->x = x; req->y = y; - + UnlockDisplay(dpy); SyncHandle(); return cid; @@ -67,12 +67,12 @@ req->reqType = info->codes->major_opcode; req->renderReqType = X_RenderCreateAnimCursor; req->cid = cid = XAllocID (dpy); - + len = (long) ncursor * SIZEOF (xAnimCursorElt) >> 2; SetReqLen (req, len, len); len <<= 2; Data32 (dpy, (long *) cursors, len); - + UnlockDisplay(dpy); SyncHandle(); return cid; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrender-0.9.6/src/FillRect.c new/libXrender-0.9.7/src/FillRect.c --- old/libXrender-0.9.6/src/FillRect.c 2009-10-16 23:26:58.000000000 +0200 +++ new/libXrender-0.9.7/src/FillRect.c 2012-03-08 05:47:00.000000000 +0100 @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. @@ -73,10 +73,10 @@ dpy->bufptr += SIZEOF(xRectangle); #endif /* not MUSTCOPY */ } - else + else { GetReqExtra(RenderFillRectangles, SIZEOF(xRectangle), req); - + req->reqType = info->codes->major_opcode; req->renderReqType = X_RenderFillRectangles; req->op = op; @@ -85,7 +85,7 @@ req->color.green = color->green; req->color.blue = color->blue; req->color.alpha = color->alpha; - + #ifdef MUSTCOPY dpy->bufptr -= SIZEOF(xRectangle); #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrender-0.9.6/src/FillRects.c new/libXrender-0.9.7/src/FillRects.c --- old/libXrender-0.9.6/src/FillRects.c 2009-10-16 23:26:58.000000000 +0200 +++ new/libXrender-0.9.7/src/FillRects.c 2012-03-08 05:47:00.000000000 +0100 @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. @@ -47,10 +47,10 @@ RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); - while (n_rects) + while (n_rects) { GetReq(RenderFillRectangles, req); - + req->reqType = info->codes->major_opcode; req->renderReqType = X_RenderFillRectangles; req->op = op; @@ -59,10 +59,10 @@ req->color.green = color->green; req->color.blue = color->blue; req->color.alpha = color->alpha; - + n = n_rects; len = ((long)n) << 1; - if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) + if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) { n = (dpy->max_request_size - req->length) >> 1; len = ((long)n) << 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrender-0.9.6/src/Filter.c new/libXrender-0.9.7/src/Filter.c --- old/libXrender-0.9.6/src/Filter.c 2010-04-10 02:46:41.000000000 +0200 +++ new/libXrender-0.9.7/src/Filter.c 2012-03-08 05:47:00.000000000 +0100 @@ -25,7 +25,7 @@ #include <config.h> #endif #include "Xrenderint.h" - + XFilters * XRenderQueryFilters (Display *dpy, Drawable drawable) { @@ -38,7 +38,7 @@ char len; int i; long nbytes, nbytesAlias, nbytesName; - + if (!RenderHasExtension (info)) return NULL; @@ -48,7 +48,7 @@ xri = info->info; if (xri->minor_version < 6) return NULL; - + LockDisplay (dpy); GetReq (RenderQueryFilters, req); req->reqType = info->codes->major_opcode; @@ -68,7 +68,7 @@ if (rep.numAliases & 1) nbytesAlias += 2; nbytesName = nbytes - nbytesAlias; - + /* * Allocate one giant block for the whole data structure */ @@ -92,7 +92,7 @@ * numAliases short alias values * nbytesName char strings */ - + filters->nfilter = rep.numFilters; filters->nalias = rep.numAliases; filters->filter = (char **) (filters + 1); @@ -121,7 +121,7 @@ if (i & 3) _XEatData (dpy, 4 - (i & 3)); - + UnlockDisplay (dpy); SyncHandle (); return filters; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrender-0.9.6/src/Glyph.c new/libXrender-0.9.7/src/Glyph.c --- old/libXrender-0.9.6/src/Glyph.c 2009-10-16 23:26:58.000000000 +0200 +++ new/libXrender-0.9.7/src/Glyph.c 2012-03-08 05:47:00.000000000 +0100 @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. @@ -135,7 +135,7 @@ UnlockDisplay(dpy); SyncHandle(); } - + void XRenderCompositeString8 (Display *dpy, int op, @@ -158,7 +158,7 @@ if (!nchar) return; - + RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); @@ -171,21 +171,21 @@ req->maskFormat = maskFormat ? maskFormat->id : None; req->glyphset = glyphset; req->xSrc = xSrc; - req->ySrc = ySrc; + req->ySrc = ySrc; /* * xGlyphElt must be aligned on a 32-bit boundary; this is * easily done by filling no more than 252 glyphs in each * bucket */ - + #define MAX_8 252 len = SIZEOF(xGlyphElt) * ((nchar + MAX_8-1) / MAX_8) + nchar; - + req->length += (len + 3)>>2; /* convert to number of 32-bit words */ - - /* + + /* * If the entire request does not fit into the remaining space in the * buffer, flush the buffer first. */ @@ -206,18 +206,18 @@ nchar = nchar - MAX_8; string += MAX_8; } - + if (nchar) { nbytes = (nchar + SIZEOF(xGlyphElt) + 3) & ~3; - BufAlloc (xGlyphElt *, elt, nbytes); + BufAlloc (xGlyphElt *, elt, nbytes); elt->len = nchar; elt->deltax = xDst; elt->deltay = yDst; memcpy ((char *) (elt + 1), string, nchar); } #undef MAX_8 - + UnlockDisplay(dpy); SyncHandle(); } @@ -243,10 +243,10 @@ if (!nchar) return; - + RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); - + GetReq(RenderCompositeGlyphs16, req); req->reqType = info->codes->major_opcode; req->renderReqType = X_RenderCompositeGlyphs16; @@ -256,15 +256,15 @@ req->maskFormat = maskFormat ? maskFormat->id : None; req->glyphset = glyphset; req->xSrc = xSrc; - req->ySrc = ySrc; + req->ySrc = ySrc; #define MAX_16 254 len = SIZEOF(xGlyphElt) * ((nchar + MAX_16-1) / MAX_16) + nchar * 2; - + req->length += (len + 3)>>2; /* convert to number of 32-bit words */ - - /* + + /* * If the entire request does not fit into the remaining space in the * buffer, flush the buffer first. */ @@ -285,18 +285,18 @@ nchar = nchar - MAX_16; string += MAX_16; } - + if (nchar) { nbytes = (nchar * 2 + SIZEOF(xGlyphElt) + 3) & ~3; - BufAlloc (xGlyphElt *, elt, nbytes); + BufAlloc (xGlyphElt *, elt, nbytes); elt->len = nchar; elt->deltax = xDst; elt->deltay = yDst; memcpy ((char *) (elt + 1), (char *) string, nchar * 2); } #undef MAX_16 - + UnlockDisplay(dpy); SyncHandle(); } @@ -323,10 +323,10 @@ if (!nchar) return; - + RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); - + GetReq(RenderCompositeGlyphs32, req); req->reqType = info->codes->major_opcode; req->renderReqType = X_RenderCompositeGlyphs32; @@ -336,15 +336,15 @@ req->maskFormat = maskFormat ? maskFormat->id : None; req->glyphset = glyphset; req->xSrc = xSrc; - req->ySrc = ySrc; + req->ySrc = ySrc; #define MAX_32 254 len = SIZEOF(xGlyphElt) * ((nchar + MAX_32-1) / MAX_32) + nchar * 4; - + req->length += (len + 3)>>2; /* convert to number of 32-bit words */ - - /* + + /* * If the entire request does not fit into the remaining space in the * buffer, flush the buffer first. */ @@ -365,18 +365,18 @@ nchar = nchar - MAX_32; string += MAX_32; } - + if (nchar) { nbytes = nchar * 4 + SIZEOF(xGlyphElt); - BufAlloc (xGlyphElt *, elt, nbytes); + BufAlloc (xGlyphElt *, elt, nbytes); elt->len = nchar; elt->deltax = xDst; elt->deltay = yDst; memcpy ((char *) (elt + 1), (char *) string, nchar * 4); } #undef MAX_32 - + UnlockDisplay(dpy); SyncHandle(); } @@ -406,7 +406,7 @@ if (!nelt) return; - + RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); @@ -419,13 +419,13 @@ req->maskFormat = maskFormat ? maskFormat->id : None; req->glyphset = elts[0].glyphset; req->xSrc = xSrc; - req->ySrc = ySrc; + req->ySrc = ySrc; /* * Compute the space necessary */ len = 0; - + #define MAX_8 252 glyphset = elts[0].glyphset; @@ -448,7 +448,7 @@ elen = SIZEOF(xGlyphElt) * ((nchars + MAX_8-1) / MAX_8) + nchars; len += (elen + 3) >> 2; } - + req->length += len; /* @@ -489,7 +489,7 @@ } } #undef MAX_8 - + UnlockDisplay(dpy); SyncHandle(); } @@ -519,7 +519,7 @@ if (!nelt) return; - + RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); @@ -532,13 +532,13 @@ req->maskFormat = maskFormat ? maskFormat->id : None; req->glyphset = elts[0].glyphset; req->xSrc = xSrc; - req->ySrc = ySrc; + req->ySrc = ySrc; /* * Compute the space necessary */ len = 0; - + #define MAX_16 254 glyphset = elts[0].glyphset; @@ -561,7 +561,7 @@ elen = SIZEOF(xGlyphElt) * ((nchars + MAX_16-1) / MAX_16) + nchars * 2; len += (elen + 3) >> 2; } - + req->length += len; glyphset = elts[0].glyphset; @@ -587,7 +587,7 @@ { int this_chars = nchars > MAX_16 ? MAX_16 : nchars; int this_bytes = this_chars * 2; - + BufAlloc (xGlyphElt *, elt, SIZEOF(xGlyphElt)) elt->len = this_chars; elt->deltax = xDst; @@ -600,7 +600,7 @@ } } #undef MAX_16 - + UnlockDisplay(dpy); SyncHandle(); } @@ -630,11 +630,11 @@ if (!nelt) return; - + RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); - + GetReq(RenderCompositeGlyphs32, req); req->reqType = info->codes->major_opcode; req->renderReqType = X_RenderCompositeGlyphs32; @@ -644,7 +644,7 @@ req->maskFormat = maskFormat ? maskFormat->id : None; req->glyphset = elts[0].glyphset; req->xSrc = xSrc; - req->ySrc = ySrc; + req->ySrc = ySrc; /* * Compute the space necessary @@ -652,7 +652,7 @@ len = 0; #define MAX_32 254 - + glyphset = elts[0].glyphset; for (i = 0; i < nelt; i++) { @@ -668,7 +668,7 @@ elen = SIZEOF(xGlyphElt) * ((nchars + MAX_32) / MAX_32) + nchars *4; len += (elen + 3) >> 2; } - + req->length += len; glyphset = elts[0].glyphset; @@ -706,7 +706,7 @@ } } #undef MAX_32 - + UnlockDisplay(dpy); SyncHandle(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrender-0.9.6/src/Makefile.am new/libXrender-0.9.7/src/Makefile.am --- old/libXrender-0.9.6/src/Makefile.am 2009-10-16 23:26:58.000000000 +0200 +++ new/libXrender-0.9.7/src/Makefile.am 2012-03-08 05:47:00.000000000 +0100 @@ -21,7 +21,7 @@ libXrender_la_LIBADD = $(RENDER_LIBS) # -version-number requires libtool >= 1.5 -libXrender_la_LDFLAGS = -version-number 1:3:0 -no-undefined +libXrender_la_LDFLAGS = -version-number 1:3:0 -no-undefined libXrenderincludedir = $(includedir)/X11/extensions -libXrenderinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xrender.h +libXrenderinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xrender.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrender-0.9.6/src/Picture.c new/libXrender-0.9.7/src/Picture.c --- old/libXrender-0.9.6/src/Picture.c 2009-10-16 23:26:58.000000000 +0200 +++ new/libXrender-0.9.7/src/Picture.c 2012-03-08 05:47:00.000000000 +0100 @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. @@ -37,7 +37,7 @@ unsigned long values[32]; register unsigned long *value = values; unsigned int nvalues; - + if (valuemask & CPRepeat) *value++ = attributes->repeat; if (valuemask & CPAlphaMap) @@ -108,7 +108,7 @@ { XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderChangePictureReq *req; - + RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); GetReq(RenderChangePicture, req); @@ -157,10 +157,10 @@ int n) { XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); - + RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); - _XRenderSetPictureClipRectangles (dpy, info, picture, + _XRenderSetPictureClipRectangles (dpy, info, picture, xOrigin, yOrigin, rects, n); UnlockDisplay (dpy); SyncHandle (); @@ -176,7 +176,7 @@ XRectangle *xr, *pr; BOX *pb; unsigned long total; - + RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); total = r->numRects * sizeof (XRectangle); @@ -189,13 +189,13 @@ } } if (xr || !r->numRects) - _XRenderSetPictureClipRectangles (dpy, info, picture, 0, 0, + _XRenderSetPictureClipRectangles (dpy, info, picture, 0, 0, xr, r->numRects); if (xr) _XFreeTemp(dpy, (char *)xr, total); UnlockDisplay(dpy); SyncHandle(); -} +} void XRenderSetPictureTransform (Display *dpy, @@ -204,7 +204,7 @@ { XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderSetPictureTransformReq *req; - + RenderSimpleCheckExtension (dpy, info); LockDisplay (dpy); GetReq(RenderSetPictureTransform, req); @@ -222,7 +222,7 @@ req->transform.matrix33 = transform->matrix[2][2]; UnlockDisplay(dpy); SyncHandle(); - + } void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrender-0.9.6/src/Poly.c new/libXrender-0.9.7/src/Poly.c --- old/libXrender-0.9.6/src/Poly.c 2009-10-16 23:26:58.000000000 +0200 +++ new/libXrender-0.9.7/src/Poly.c 2012-03-08 05:47:00.000000000 +0100 @@ -56,7 +56,7 @@ static double XRenderComputeInverseSlope (XLineFixed *l) { - return (XFixedToDouble (l->p2.x - l->p1.x) / + return (XFixedToDouble (l->p2.x - l->p1.x) / XFixedToDouble (l->p2.y - l->p1.y)); } @@ -95,9 +95,9 @@ Edge *active; Edge *e, *en, *next; XFixed y, next_y, intersect; - + qsort (edges, nedges, sizeof (Edge), CompareEdge); - + y = edges[0].edge.p1.y; active = NULL; inactive = 0; @@ -120,7 +120,7 @@ /* compute x coordinates along this group */ for (e = active; e; e = e->next) e->current_x = XRenderComputeX (&e->edge, y); - + /* sort active list */ for (e = active; e; e = next) { @@ -177,7 +177,7 @@ next_y = e->edge.p2.y; en = e->next; /* check intersect */ - if (en && e->edge.p2.x > en->edge.p2.x) + if (en && e->edge.p2.x > en->edge.p2.x) { intersect = XRenderComputeIntersect (&e->edge, &e->next->edge); /* make sure this point is below the actual intersection */ @@ -189,7 +189,7 @@ /* check next inactive point */ if (inactive < nedges && edges[inactive].edge.p1.y < next_y) next_y = edges[inactive].edge.p1.y; - + /* walk the list generating trapezoids */ for (e = active; e && (en = e->next); e = en->next) { @@ -202,7 +202,7 @@ } y = next_y; - + /* delete inactive edges from list */ for (e = active; e; e = next) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrender-0.9.6/src/Xrender.c new/libXrender-0.9.7/src/Xrender.c --- old/libXrender-0.9.6/src/Xrender.c 2009-10-16 23:26:58.000000000 +0200 +++ new/libXrender-0.9.7/src/Xrender.c 2012-03-08 05:47:00.000000000 +0100 @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. @@ -38,7 +38,7 @@ * XextFindDisplay.) */ static XRenderExtDisplayInfo * -XRenderExtFindDisplay (XRenderExtInfo *extinfo, +XRenderExtFindDisplay (XRenderExtInfo *extinfo, Display *dpy) { XRenderExtDisplayInfo *dpyinfo; @@ -46,7 +46,7 @@ /* * see if this was the most recently accessed display */ - if ((dpyinfo = extinfo->cur) && dpyinfo->display == dpy) + if ((dpyinfo = extinfo->cur) && dpyinfo->display == dpy) return dpyinfo; /* @@ -70,8 +70,8 @@ * any screen, tell the application that Render is not present. */ -#define DEPTH_MASK(d) (1 << ((d) - 1)) - +#define DEPTH_MASK(d) (1U << ((d) - 1)) + /* * Render requires support for depth 1, 4, 8, 24 and 32 pixmaps */ @@ -81,7 +81,7 @@ DEPTH_MASK(8) | \ DEPTH_MASK(24) | \ DEPTH_MASK(32)) - + typedef struct _DepthCheckRec { struct _DepthCheckRec *next; Display *dpy; @@ -204,11 +204,11 @@ dpyinfo->codes = NULL; /* - * if the server has the extension, then we can initialize the + * if the server has the extension, then we can initialize the * appropriate function vectors */ if (dpyinfo->codes) { - XESetCloseDisplay (dpy, dpyinfo->codes->extension, + XESetCloseDisplay (dpy, dpyinfo->codes->extension, XRenderCloseDisplay); } else { /* The server doesn't have this extension. @@ -241,7 +241,7 @@ * XRenderExtRemoveDisplay - remove the indicated display from the * extension object. (Replaces XextRemoveDisplay.) */ -static int +static int XRenderExtRemoveDisplay (XRenderExtInfo *extinfo, Display *dpy) { XRenderExtDisplayInfo *dpyinfo, *prev; @@ -285,7 +285,7 @@ dpyinfo = XRenderExtFindDisplay (&XRenderExtensionInfo, dpy); if (!dpyinfo) - dpyinfo = XRenderExtAddDisplay (&XRenderExtensionInfo, dpy, + dpyinfo = XRenderExtAddDisplay (&XRenderExtensionInfo, dpy, XRenderExtensionName); return dpyinfo; } @@ -295,10 +295,10 @@ { XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); if (info && info->info) XFree (info->info); - + return XRenderExtRemoveDisplay (&XRenderExtensionInfo, dpy); } - + /**************************************************************************** * * * Render public interfaces * @@ -331,8 +331,8 @@ if (!XRenderQueryFormats (dpy)) return 0; - - xri = info->info; + + xri = info->info; *major_versionp = xri->major_version; *minor_versionp = xri->minor_version; return 1; @@ -342,7 +342,7 @@ _XRenderFindFormat (XRenderInfo *xri, PictFormat format) { int nf; - + for (nf = 0; nf < xri->nformat; nf++) if (xri->format[nf].id == format) return &xri->format[nf]; @@ -360,7 +360,7 @@ Bool error; int major_version; int minor_version; - + } _XrenderVersionState; static Bool @@ -413,7 +413,7 @@ int nf, ns, nd, nv; int rlength; int nbytes; - + RenderCheckExtension (dpy, info, 0); LockDisplay (dpy); if (info->info) @@ -426,19 +426,19 @@ vreq->renderReqType = X_RenderQueryVersion; vreq->majorVersion = RENDER_MAJOR; vreq->minorVersion = RENDER_MINOR; - + async_state.version_seq = dpy->request; async_state.error = False; async.next = dpy->async_handlers; async.handler = _XRenderVersionHandler; async.data = (XPointer) &async_state; dpy->async_handlers = &async; - + GetReq (RenderQueryPictFormats, req); req->reqType = info->codes->major_opcode; req->renderReqType = X_RenderQueryPictFormats; - - if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) + + if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) { DeqAsyncHandler (dpy, &async); UnlockDisplay (dpy); @@ -457,7 +457,7 @@ */ if (async_state.major_version == 0 && async_state.minor_version < 6) rep.numSubpixel = 0; - + xri = (XRenderInfo *) Xmalloc (sizeof (XRenderInfo) + rep.numFormats * sizeof (XRenderPictFormat) + rep.numScreens * sizeof (XRenderScreen) + @@ -470,7 +470,7 @@ rep.numSubpixel * 4); xData = (void *) Xmalloc (rlength); nbytes = (int) rep.length << 2; - + if (!xri || !xData || nbytes < rlength) { if (xri) Xfree (xri); @@ -538,7 +538,7 @@ xDepth = (xPictDepth *) xVisual; } screen++; - xScreen = (xPictScreen *) xDepth; + xScreen = (xPictScreen *) xDepth; } xSubpixel = (CARD32 *) xScreen; screen = xri->screen; @@ -554,7 +554,7 @@ */ if (nbytes > rlength) _XEatData (dpy, (unsigned long) (nbytes - rlength)); - + UnlockDisplay (dpy); SyncHandle (); Xfree (xData); @@ -696,7 +696,7 @@ }, 0, /* colormap */ }, - PictFormatType | + PictFormatType | PictFormatDepth | PictFormatRed | PictFormatRedMask | @@ -725,7 +725,7 @@ }, 0, /* colormap */ }, - PictFormatType | + PictFormatType | PictFormatDepth | PictFormatRed | PictFormatRedMask | @@ -753,7 +753,7 @@ }, 0, /* colormap */ }, - PictFormatType | + PictFormatType | PictFormatDepth | PictFormatRedMask | PictFormatGreenMask | @@ -779,7 +779,7 @@ }, 0, /* colormap */ }, - PictFormatType | + PictFormatType | PictFormatDepth | PictFormatRedMask | PictFormatGreenMask | @@ -805,7 +805,7 @@ }, 0, /* colormap */ }, - PictFormatType | + PictFormatType | PictFormatDepth | PictFormatRedMask | PictFormatGreenMask | @@ -816,7 +816,7 @@ }; if (0 <= format && format < PictStandardNUM) - return XRenderFindFormat (dpy, + return XRenderFindFormat (dpy, standardFormats[format].mask, &standardFormats[format].templ, 0); @@ -870,7 +870,7 @@ for(i = 0; i < rep.numIndexValues; i++) { xIndexValue value; - + _XRead (dpy, (char *) &value, SIZEOF (xIndexValue)); values[i].pixel = value.pixel; values[i].red = value.red; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrender-0.9.6/src/Xrenderint.h new/libXrender-0.9.7/src/Xrenderint.h --- old/libXrender-0.9.6/src/Xrenderint.h 2009-10-16 23:26:58.000000000 +0200 +++ new/libXrender-0.9.7/src/Xrenderint.h 2012-03-08 05:47:00.000000000 +0100 @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. @@ -26,8 +26,6 @@ #define _XRENDERINT_H_ #include "config.h" -#define NEED_EVENTS -#define NEED_REPLIES #include <X11/Xlibint.h> #include <X11/Xutil.h> #include <X11/extensions/renderproto.h> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
