[cairo-commit] 6 commits - src/cairo-gl-composite.c src/cairo-gl-surface.c test/clear-source.c test/clip-fill-no-op.c test/clip-stroke-no-op.c test/pthread-same-source.c test/pthread-similar.c test/xcomposite-projection.c test/zero-mask.c
Benjamin Otte
company at kemper.freedesktop.org
Tue Jun 8 13:23:41 PDT 2010
src/cairo-gl-composite.c | 1 +
src/cairo-gl-surface.c | 32 +++++++++++++++++++-------------
test/clear-source.c | 35 ++++++++++++++++++-----------------
test/clip-fill-no-op.c | 35 ++++++++++++++++++-----------------
test/clip-stroke-no-op.c | 35 ++++++++++++++++++-----------------
test/pthread-same-source.c | 35 ++++++++++++++++++-----------------
test/pthread-similar.c | 35 ++++++++++++++++++-----------------
test/xcomposite-projection.c | 35 ++++++++++++++++++-----------------
test/zero-mask.c | 35 ++++++++++++++++++-----------------
9 files changed, 146 insertions(+), 132 deletions(-)
New commits:
commit a946d39555136adc4eff3b68a62ba37f6d9a6299
Author: Benjamin Otte <otte at redhat.com>
Date: Tue Jun 8 21:09:51 2010 +0200
gl: Add support for clip regions to the span renderer
Clip surface support is still missing, but i suppose that'd need a tiny
bit more code...
diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c
index 36e2025..b896e0b 100644
--- a/src/cairo-gl-surface.c
+++ b/src/cairo-gl-surface.c
@@ -1332,9 +1332,19 @@ _cairo_gl_surface_polygon (cairo_gl_surface_t *dst,
cairo_clip_t *clip)
{
cairo_status_t status;
+ cairo_region_t *clip_region = NULL;
+
+ if (clip != NULL) {
+ status = _cairo_clip_get_region (clip, &clip_region);
+ if (unlikely (status == CAIRO_INT_STATUS_NOTHING_TO_DO))
+ return CAIRO_STATUS_SUCCESS;
+ if (unlikely (_cairo_status_is_error (status)))
+ return status;
+
+ if (status == CAIRO_INT_STATUS_UNSUPPORTED)
+ return UNSUPPORTED ("a clip surface would be required");
+ }
- if (clip)
- return UNSUPPORTED ("a clip!");
if (! _cairo_surface_check_span_renderer (op, src, &dst->base, antialias))
return UNSUPPORTED ("no span renderer");
@@ -1352,7 +1362,7 @@ _cairo_gl_surface_polygon (cairo_gl_surface_t *dst,
antialias,
extents,
polygon,
- NULL);
+ clip_region);
return status;
}
commit f61b3f25aff454800a9d6013012d41633139d896
Author: Benjamin Otte <otte at redhat.com>
Date: Tue Jun 8 12:03:36 2010 +0200
gl: Add an assertion that we always have a texture
When painting, the sources must be textures and not windows, and we did
that wrong previously. This assertion makes sure that never happens
again.
diff --git a/src/cairo-gl-composite.c b/src/cairo-gl-composite.c
index ca96b6b..ddb06d6 100644
--- a/src/cairo-gl-composite.c
+++ b/src/cairo-gl-composite.c
@@ -100,6 +100,7 @@ _cairo_gl_pattern_texture_setup (cairo_gl_operand_t *operand,
}
assert (surface->base.backend == &_cairo_gl_surface_backend);
+ assert (_cairo_gl_surface_is_texture (surface));
operand->type = CAIRO_GL_OPERAND_TEXTURE;
operand->texture.surface = surface;
commit c6c9a24a1df1826cab78bd8ef1c5a1074bafa0d7
Author: Benjamin Otte <otte at redhat.com>
Date: Tue Jun 8 04:11:33 2010 +0200
gl: Use CAIRO_COLOR_BLACK
... instead of creating black on our own - and wrong, too.
diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c
index 9dd55ae..36e2025 100644
--- a/src/cairo-gl-surface.c
+++ b/src/cairo-gl-surface.c
@@ -543,23 +543,17 @@ _cairo_gl_surface_draw_image (cairo_gl_surface_t *dst,
*/
if (!has_alpha) {
cairo_rectangle_int_t rect;
- cairo_color_t color;
rect.x = dst_x;
rect.y = dst_y;
rect.width = width;
rect.height = height;
- color.red = 0.0;
- color.green = 0.0;
- color.blue = 0.0;
- color.alpha = 1.0;
-
_cairo_gl_composite_flush (ctx);
glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_TRUE);
_cairo_gl_surface_fill_rectangles (dst,
CAIRO_OPERATOR_SOURCE,
- &color,
+ CAIRO_COLOR_BLACK,
&rect, 1);
_cairo_gl_composite_flush (ctx);
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
commit 19bc6793d1d9b209d5a03a727288504b1e71f7c4
Author: Benjamin Otte <otte at redhat.com>
Date: Tue Jun 8 04:00:02 2010 +0200
gl: Only clone texture surfaces
Using non-texture surfaces as source or mask will fail, so we need to
fallback.
Caught by the subsurface-modify-child test.
diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c
index 57ee84f..9dd55ae 100644
--- a/src/cairo-gl-surface.c
+++ b/src/cairo-gl-surface.c
@@ -777,7 +777,9 @@ _cairo_gl_surface_clone_similar (void *abstract_surface,
{
cairo_gl_surface_t *surface = abstract_surface;
- if (src->device == surface->base.device) {
+ /* XXX: Use GLCopyTexImage2D to clone non-texture-surfaces */
+ if (src->device == surface->base.device &&
+ _cairo_gl_surface_is_texture ((cairo_gl_surface_t *) src)) {
*clone_offset_x = 0;
*clone_offset_y = 0;
*clone_out = cairo_surface_reference (src);
commit 44483d843e4fe1f5db5cf213f76913d683265bb4
Author: Benjamin Otte <otte at redhat.com>
Date: Tue Jun 8 03:59:10 2010 +0200
gl: Fix argument order
oops...
diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c
index 8a2379f..57ee84f 100644
--- a/src/cairo-gl-surface.c
+++ b/src/cairo-gl-surface.c
@@ -577,8 +577,8 @@ _cairo_gl_surface_draw_image (cairo_gl_surface_t *dst,
status = _cairo_gl_surface_draw_image ((cairo_gl_surface_t *) tmp,
src,
src_x, src_y,
- 0, 0,
- width, height);
+ width, height,
+ 0, 0);
if (status == CAIRO_STATUS_SUCCESS) {
cairo_surface_pattern_t tmp_pattern;
commit 72bf1a536775138d79787729994ec9cfe2193be7
Author: Benjamin Otte <otte at redhat.com>
Date: Tue Jun 8 01:50:12 2010 +0200
Update my copyright notices to preferred version
No more copyright headers containing my name.
diff --git a/test/clear-source.c b/test/clear-source.c
index cf9867c..4583bfb 100644
--- a/test/clear-source.c
+++ b/test/clear-source.c
@@ -1,24 +1,25 @@
/*
* Copyright 2009 Benjamin Otte
*
- * 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
- * Benjamin Otte not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. Benjamin Otte makes no representations about the
- * suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
*
- * BENJAMIN OTTE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL BENJAMIN OTTE 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.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
*
* Author: Benjamin Otte <otte at gnome.org>
*/
diff --git a/test/clip-fill-no-op.c b/test/clip-fill-no-op.c
index dfc378f..b686b6e 100644
--- a/test/clip-fill-no-op.c
+++ b/test/clip-fill-no-op.c
@@ -1,24 +1,25 @@
/*
* Copyright 2009 Benjamin Otte
*
- * 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
- * Benjamin Otte not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. Benjamin Otte makes no representations about the
- * suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
*
- * BENJAMIN OTTE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL BENJAMIN OTTE 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.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
*
* Author: Benjamin Otte <otte at gnome.org>
*/
diff --git a/test/clip-stroke-no-op.c b/test/clip-stroke-no-op.c
index e727fc4..8eb9171 100644
--- a/test/clip-stroke-no-op.c
+++ b/test/clip-stroke-no-op.c
@@ -1,24 +1,25 @@
/*
* Copyright 2009 Benjamin Otte
*
- * 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
- * Benjamin Otte not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. Benjamin Otte makes no representations about the
- * suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
*
- * BENJAMIN OTTE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL BENJAMIN OTTE 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.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
*
* Author: Benjamin Otte <otte at gnome.org>
*/
diff --git a/test/pthread-same-source.c b/test/pthread-same-source.c
index d55debc..d0eda4a 100644
--- a/test/pthread-same-source.c
+++ b/test/pthread-same-source.c
@@ -1,24 +1,25 @@
/*
* Copyright 2009 Benjamin Otte
*
- * 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
- * Benjamin Otte not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. Benjamin Otte makes no representations about the
- * suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
*
- * BENJAMIN OTTE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL BENJAMIN OTTE 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.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
*
* Author: Benjamin Otte <otte at gnome.org>
*/
diff --git a/test/pthread-similar.c b/test/pthread-similar.c
index ce801ff..a5f5e3b 100644
--- a/test/pthread-similar.c
+++ b/test/pthread-similar.c
@@ -1,24 +1,25 @@
/*
* Copyright 2009 Benjamin Otte
*
- * 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
- * Benjamin Otte not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. Benjamin Otte makes no representations about the
- * suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
*
- * BENJAMIN OTTE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL BENJAMIN OTTE 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.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
*
* Author: Benjamin Otte <otte at gnome.org>
*/
diff --git a/test/xcomposite-projection.c b/test/xcomposite-projection.c
index cca60f5..39686cf 100644
--- a/test/xcomposite-projection.c
+++ b/test/xcomposite-projection.c
@@ -1,24 +1,25 @@
/*
* Copyright 2009 Benjamin Otte
*
- * 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
- * Benjamin Otte not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. Benjamin Otte makes no representations about the
- * suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
*
- * BENJAMIN OTTE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL KAI_UWE BEHRMANN 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.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
*
* Author: Benjamin Otte <otte at gnome.org>
*/
diff --git a/test/zero-mask.c b/test/zero-mask.c
index bed348f..5ea0709 100644
--- a/test/zero-mask.c
+++ b/test/zero-mask.c
@@ -1,24 +1,25 @@
/*
* Copyright © 2010 Red Hat, Inc.
*
- * 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
- * Red Hat, Inc. not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. Red Hat, Inc. makes no representations about the
- * suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
*
- * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL RED HAT, INC. 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.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
*
* Author: Benjamin Otte <otte at gnome.org>
*/
More information about the cairo-commit
mailing list