Originally 2005-04-20 Carl Worth <cworth@cworth.org>

Remove cairo_show_surface. Add new cairo_set_source_surface.
Remove _cairo_gstate_show_surface.
Replace calls to cairo_show_surface with cairo_set_source_surface; cairo_paint.
Fix messages to prefer - over _.
Fix documentation.
Three new tests to exercise set_source_surface more completely, (two of these are expected failures dues to outstanding bugs).

1 files changed, 65 insertions, 0 deletions

diff --git a/test/source-surface-scale-paint.c b/test/source-surface-scale-paint.c
new file mode 100644
index 000000000..1bf769d28
--- /dev/null
+++ b/test/source-surface-scale-paint.c
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2005 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.
+ *
+ * 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.
+ *
+ * Author: Carl D. Worth <cworth@cworth.org>
+ */
+
+#include "cairo-test.h"
+
+cairo_test_t test = {
+    "source-surface-scale-paint",
+    "Test call sequence: cairo_set_source_surface; cairo_scale; cairo_paint",
+    12, 12
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_surface_t *surface;
+    unsigned long data[16] = {
+	0xffffffff, 0xffffffff,		0xffff0000, 0xffff0000,
+	0xffffffff, 0xffffffff,		0xffff0000, 0xffff0000,
+
+	0xff00ff00, 0xff00ff00,		0xff0000ff, 0xff0000ff,
+	0xff00ff00, 0xff00ff00,		0xff0000ff, 0xff0000ff
+    };
+    int i;
+
+    surface = cairo_image_surface_create_for_data ((unsigned char *) data,
+					      CAIRO_FORMAT_ARGB32, 4, 4, 16);
+
+    cairo_set_source_surface (cr, surface, 2, 2);
+    cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_NEAREST);
+    cairo_scale (cr, 2, 2);
+    cairo_paint (cr);
+
+    cairo_surface_destroy (surface);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+    return cairo_test_expect_failure (&test, draw,
+				      "cairo_set_source needs user space locking semantics");
+}