libxrender: Changes to 'debian-unstable'
COPYING | 2
ChangeLog | 99 +++++++++++++++++++++++++++++++++++++++
Makefile.am | 6 +-
configure.ac | 96 ++++++++++++++++++-------------------
debian/changelog | 9 +++
debian/control | 3 -
debian/rules | 3 -
doc/libXrender.txt | 6 +-
include/X11/extensions/Xrender.h | 6 +-
src/Color.c | 12 ++--
src/Composite.c | 2
src/Cursor.c | 6 +-
src/FillRect.c | 8 +--
src/FillRects.c | 10 +--
src/Filter.c | 12 ++--
src/Glyph.c | 92 ++++++++++++++++++------------------
src/Makefile.am | 4 -
src/Picture.c | 20 +++----
src/Poly.c | 14 ++---
src/Xrender.c | 64 ++++++++++++-------------
src/Xrenderint.h | 4 -
21 files changed, 290 insertions(+), 188 deletions(-)
New commits:
commit c5cf7ffac100d0e1ac863a1b30209e8ee0b02e4d
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 21 11:44:38 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 63767d0..15e2482 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libxrender (1:0.9.7-1) UNRELEASED; urgency=low
+libxrender (1:0.9.7-1) unstable; urgency=low
* New upstream release.
* Don't require (fake)root for debian/rules clean.
* Add Multi-Arch: same for libxrender-dev.
* Bump xutils-dev build-dep for newer macros.
- -- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2012 11:38:23 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2012 11:44:34 +0200
libxrender (1:0.9.6-2) unstable; urgency=low
commit 872335bd7d237f10992b658608fb7cdb49efe30a
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 21 11:44:29 2012 +0200
Bump xutils-dev build-dep for newer macros.
diff --git a/debian/changelog b/debian/changelog
index 6fbeb7f..63767d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxrender (1:0.9.7-1) UNRELEASED; urgency=low
* New upstream release.
* Don't require (fake)root for debian/rules clean.
* Add Multi-Arch: same for libxrender-dev.
+ * Bump xutils-dev build-dep for newer macros.
-- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2012 11:38:23 +0200
diff --git a/debian/control b/debian/control
index c4122ca..e289b92 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
x11proto-core-dev,
automake,
libtool,
- xutils-dev (>= 1:7.5~1)
+ xutils-dev (>= 1:7.5+4),
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxrender
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxrender.git
commit 25b54f515f23a16324aa4f3d8ca3325d62026ec8
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 21 11:40:41 2012 +0200
Add Multi-Arch: same for libxrender-dev.
diff --git a/debian/changelog b/debian/changelog
index fdb5ef4..6fbeb7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxrender (1:0.9.7-1) UNRELEASED; urgency=low
* New upstream release.
* Don't require (fake)root for debian/rules clean.
+ * Add Multi-Arch: same for libxrender-dev.
-- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2012 11:38:23 +0200
diff --git a/debian/control b/debian/control
index 363b17a..c4122ca 100644
--- a/debian/control
+++ b/debian/control
@@ -81,6 +81,7 @@ Description: X Rendering Extension client library (unstripped)
Package: libxrender-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends:
libxrender1 (= ${binary:Version}),
libx11-dev (>= 2:1.0.0),
commit 6a5ca09e50ea5f7bb1e91fe4d58bdb1fa1be6f92
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 21 11:39:00 2012 +0200
Don't require (fake)root for debian/rules clean.
diff --git a/debian/changelog b/debian/changelog
index 8a01660..fdb5ef4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxrender (1:0.9.7-1) UNRELEASED; urgency=low
* New upstream release.
+ * Don't require (fake)root for debian/rules clean.
-- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2012 11:38:23 +0200
diff --git a/debian/rules b/debian/rules
index b5a456f..e2ae592 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,9 +53,7 @@ build-stamp:
clean:
dh_testdir
- dh_testroot
rm -f build-stamp
-
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
@@ -64,7 +62,6 @@ clean:
rm -f aclocal.m4 config.guess config.h.in config.sub configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
find -name Makefile.in -delete
-
dh_clean
install: build
commit 73d60e170dbbe49320926ae4ad1799b50ff8011d
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 21 11:38:37 2012 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 4e62228..e8d7f8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,102 @@
+commit bf1aa4e05997ab97be4413ccdb6d0d1eb45aeefe
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Mar 7 20:46:50 2012 -0800
+
+ libXrender 0.9.7
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit bb6568cbec24ae2c84bb5d9fe418f0021291a0af
+Author: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
+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 <jeremyhu@apple.com>
+
+commit b3cfeecf2bddbbb120a9c796a4c9fb8fd08e15fc
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+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 <alan.coopersmith@oracle.com>
+
+commit eaae07c9c9690228e16ab8dc537a8a0c2ae175bf
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+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 <alan.coopersmith@oracle.com>
+
+commit 1025ca2d9a00bc60639689fba177d186dace5483
+Author: Gaetan Nadon <memsize@videotron.ca>
+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 <memsize@videotron.ca>
+Date: Fri Jan 28 19:41:37 2011 -0500
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit ba0036d984787dc2da74ef3d8ffb9b81ca13c19c
+Author: Gaetan Nadon <memsize@videotron.ca>
+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 <memsize@videotron.ca>
+
+commit 5fb74888fd77843c81de038365791f29c799bbec
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Thu Nov 4 09:13:49 2010 -0700
+
+ Fix some minor typos
+
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+
+commit b1c60edb6b6a965e58fed3b613c266364a5ec0ce
+Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
+Date: Thu Jul 1 07:02:41 2010 -0300
+
+ Purge macros NEED_EVENTS and NEED_REPLIES
+
+ Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit d3d20437ceee1c225cd189fdeb6378552e206337
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jun 8 19:23:04 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 779a806..8a01660 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxrender (1:0.9.7-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2012 11:38:23 +0200
+
libxrender (1:0.9.6-2) unstable; urgency=low
* Team upload.
commit bf1aa4e05997ab97be4413ccdb6d0d1eb45aeefe
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Mar 7 20:46:50 2012 -0800
libXrender 0.9.7
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 780ec99..bf7fe60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_PREREQ([2.60])
# 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.6],
+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])
commit bb6568cbec24ae2c84bb5d9fe418f0021291a0af
Author: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
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 <jeremyhu@apple.com>
diff --git a/src/Color.c b/src/Color.c
index 9c76e58..23ef800 100644
--- a/src/Color.c
+++ b/src/Color.c
@@ -85,8 +85,8 @@ XRenderParseColor(Display *dpy, char *spec, XRenderColor *def)
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;
}
commit b3cfeecf2bddbbb120a9c796a4c9fb8fd08e15fc
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
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 <alan.coopersmith@oracle.com>
diff --git a/COPYING b/COPYING
index 0d548e5..7316ea6 100644
--- a/COPYING
+++ b/COPYING
@@ -35,5 +35,5 @@ SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
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 --git a/Makefile.am b/Makefile.am
index 01ef172..1c902dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 --git a/include/X11/extensions/Xrender.h b/include/X11/extensions/Xrender.h
index 5248e99..1d1cd08 100644
--- a/include/X11/extensions/Xrender.h
+++ b/include/X11/extensions/Xrender.h
@@ -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 @@ XRenderFindFormat (Display *dpy,
unsigned long mask,
_Xconst XRenderPictFormat *templ,
int count);
-
+
#define PictStandardARGB32 0
#define PictStandardRGB24 1
#define PictStandardA8 2
@@ -468,7 +468,7 @@ XRenderCompositeDoublePoly (Display *dpy,
int npoints,
int winding);
Status
-XRenderParseColor(Display *dpy,
+XRenderParseColor(Display *dpy,
char *spec,
XRenderColor *def);
diff --git a/src/Color.c b/src/Color.c
index 4f934f0..9c76e58 100644
--- a/src/Color.c
+++ b/src/Color.c
@@ -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 @@ XRenderParseColor(Display *dpy, char *spec, XRenderColor *def)
{
XColor coreColor;
Colormap colormap;
-
+
colormap = DefaultColormap (dpy, DefaultScreen (dpy));
if (!XParseColor (dpy, colormap, spec, &coreColor))
return 0;
diff --git a/src/Composite.c b/src/Composite.c
index 07151de..b529088 100644
--- a/src/Composite.c
+++ b/src/Composite.c
@@ -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 --git a/src/Cursor.c b/src/Cursor.c
index 2679a9e..1d44c80 100644
--- a/src/Cursor.c
+++ b/src/Cursor.c
@@ -45,7 +45,7 @@ XRenderCreateCursor (Display *dpy,
req->src = source;
req->x = x;
req->y = y;
-
+
UnlockDisplay(dpy);
SyncHandle();
return cid;
@@ -67,12 +67,12 @@ XRenderCreateAnimCursor (Display *dpy,
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 --git a/src/FillRect.c b/src/FillRect.c
index 319c35d..04757fe 100644
--- a/src/FillRect.c
+++ b/src/FillRect.c
@@ -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 @@ XRenderFillRectangle (Display *dpy,
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 @@ XRenderFillRectangle (Display *dpy,
req->color.green = color->green;
req->color.blue = color->blue;
req->color.alpha = color->alpha;
-
+
#ifdef MUSTCOPY
dpy->bufptr -= SIZEOF(xRectangle);
#else
diff --git a/src/FillRects.c b/src/FillRects.c
index 517eeb0..ec88f4b 100644
--- a/src/FillRects.c
+++ b/src/FillRects.c
@@ -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 @@ XRenderFillRectangles (Display *dpy,
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 @@ XRenderFillRectangles (Display *dpy,
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 --git a/src/Filter.c b/src/Filter.c
index 3ac660a..5fe9df9 100644
--- a/src/Filter.c
+++ b/src/Filter.c
@@ -25,7 +25,7 @@
#include <config.h>
#endif
#include "Xrenderint.h"
-
+
XFilters *
XRenderQueryFilters (Display *dpy, Drawable drawable)
{
@@ -38,7 +38,7 @@ XRenderQueryFilters (Display *dpy, Drawable drawable)
char len;
int i;
long nbytes, nbytesAlias, nbytesName;
-
+
if (!RenderHasExtension (info))
return NULL;
@@ -48,7 +48,7 @@ XRenderQueryFilters (Display *dpy, Drawable drawable)
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 @@ XRenderQueryFilters (Display *dpy, Drawable drawable)
if (rep.numAliases & 1)
nbytesAlias += 2;
nbytesName = nbytes - nbytesAlias;
-
+
/*
* Allocate one giant block for the whole data structure
*/
@@ -92,7 +92,7 @@ XRenderQueryFilters (Display *dpy, Drawable drawable)
* numAliases short alias values
* nbytesName char strings
*/
-
+
filters->nfilter = rep.numFilters;
filters->nalias = rep.numAliases;
filters->filter = (char **) (filters + 1);
@@ -121,7 +121,7 @@ XRenderQueryFilters (Display *dpy, Drawable drawable)
if (i & 3)
_XEatData (dpy, 4 - (i & 3));
-
+
UnlockDisplay (dpy);
SyncHandle ();
return filters;
diff --git a/src/Glyph.c b/src/Glyph.c
index 894bb77..dbeb77e 100644
--- a/src/Glyph.c
+++ b/src/Glyph.c
@@ -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 @@ XRenderFreeGlyphs (Display *dpy,
UnlockDisplay(dpy);
SyncHandle();
}
-
+
void
XRenderCompositeString8 (Display *dpy,
int op,
@@ -158,7 +158,7 @@ XRenderCompositeString8 (Display *dpy,
if (!nchar)
return;
-
+
RenderSimpleCheckExtension (dpy, info);
LockDisplay(dpy);
@@ -171,21 +171,21 @@ XRenderCompositeString8 (Display *dpy,
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 @@ XRenderCompositeString8 (Display *dpy,
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 @@ XRenderCompositeString16 (Display *dpy,
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 @@ XRenderCompositeString16 (Display *dpy,
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 @@ XRenderCompositeString16 (Display *dpy,
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 @@ XRenderCompositeString32 (Display *dpy,
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 @@ XRenderCompositeString32 (Display *dpy,
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 @@ XRenderCompositeString32 (Display *dpy,
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 @@ XRenderCompositeText8 (Display *dpy,
if (!nelt)
return;
-
+
RenderSimpleCheckExtension (dpy, info);
LockDisplay(dpy);
@@ -419,13 +419,13 @@ XRenderCompositeText8 (Display *dpy,
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 @@ XRenderCompositeText8 (Display *dpy,
elen = SIZEOF(xGlyphElt) * ((nchars + MAX_8-1) / MAX_8) + nchars;
len += (elen + 3) >> 2;
}
-
+
req->length += len;
/*
@@ -489,7 +489,7 @@ XRenderCompositeText8 (Display *dpy,
}
}
#undef MAX_8
-
+
UnlockDisplay(dpy);
SyncHandle();
}
@@ -519,7 +519,7 @@ XRenderCompositeText16 (Display *dpy,
if (!nelt)
return;
-
+
RenderSimpleCheckExtension (dpy, info);
LockDisplay(dpy);
@@ -532,13 +532,13 @@ XRenderCompositeText16 (Display *dpy,
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 @@ XRenderCompositeText16 (Display *dpy,
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 @@ XRenderCompositeText16 (Display *dpy,
{
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 @@ XRenderCompositeText16 (Display *dpy,
}
}
#undef MAX_16
-
+
UnlockDisplay(dpy);
SyncHandle();
}
@@ -630,11 +630,11 @@ XRenderCompositeText32 (Display *dpy,
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 @@ XRenderCompositeText32 (Display *dpy,
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 @@ XRenderCompositeText32 (Display *dpy,
len = 0;
#define MAX_32 254
-
+
glyphset = elts[0].glyphset;
for (i = 0; i < nelt; i++)
{
@@ -668,7 +668,7 @@ XRenderCompositeText32 (Display *dpy,
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 @@ XRenderCompositeText32 (Display *dpy,
}
}
#undef MAX_32
-
+
UnlockDisplay(dpy);
SyncHandle();
}
diff --git a/src/Makefile.am b/src/Makefile.am
index 7474b43..c453056 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@ libXrender_la_SOURCES = AddTrap.c \
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 --git a/src/Picture.c b/src/Picture.c
index 509a835..d9d6913 100644
--- a/src/Picture.c
+++ b/src/Picture.c
@@ -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 @@ _XRenderProcessPictureAttributes (Display *dpy,
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 @@ XRenderChangePicture (Display *dpy,
{
XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy);
xRenderChangePictureReq *req;
-
+
RenderSimpleCheckExtension (dpy, info);
LockDisplay(dpy);
GetReq(RenderChangePicture, req);
@@ -157,10 +157,10 @@ XRenderSetPictureClipRectangles (Display *dpy,
int n)
{
XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy);
-
+
RenderSimpleCheckExtension (dpy, info);
LockDisplay(dpy);
- _XRenderSetPictureClipRectangles (dpy, info, picture,
+ _XRenderSetPictureClipRectangles (dpy, info, picture,
xOrigin, yOrigin, rects, n);
Reply to: