Use utility function to create sample image.

6 files changed, 8 insertions, 129 deletions

diff --git a/src/cairo-tests/image-rotate.cpp b/src/cairo-tests/image-rotate.cpp
index e56d706..796fb26 100644
--- a/src/cairo-tests/image-rotate.cpp
+++ b/src/cairo-tests/image-rotate.cpp
@@ -12,31 +12,14 @@
 
 #include "caskbench.h"
 #include "caskbench_context.h"
+#include "cairo-shapes.h"
 
 static cairo_surface_t *image;
 
 int
 ca_setup_image_rotate(caskbench_context_t *ctx)
 {
-    int i, x, y;
-    cairo_t *cr_image;
-
-    image = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 160, 40);
-    cr_image = cairo_create (image);
-    cairo_set_source_surface (cr_image, image, 0, 0);
-
-    x = 5;
-    for (i=0; i<16; i++) {
-        x += 10;
-        y = (i%2)*10;
-
-        cairo_set_source_rgba (cr_image, 1.0/(i+1), 1.0, 16.0*i/255.0, 1.0);
-        cairo_rectangle (cr_image, x, y, 10, 10);
-        cairo_fill (cr_image);
-    }
-
-    cairo_destroy (cr_image);
-
+    image = cairoCreateSampleImage (ctx);
     return 1;
 }
 
diff --git a/src/cairo-tests/image-scale.cpp b/src/cairo-tests/image-scale.cpp
index 120577c..ff98391 100644
--- a/src/cairo-tests/image-scale.cpp
+++ b/src/cairo-tests/image-scale.cpp
@@ -20,25 +20,7 @@ static cairo_surface_t *image;
 int
 ca_setup_image_scale(caskbench_context_t *ctx)
 {
-    int i, x, y;
-    cairo_t *cr_image;
-
-    image = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 160, 40);
-    cr_image = cairo_create (image);
-    cairo_set_source_surface (cr_image, image, 0, 0);
-
-    x = 5;
-    for (i=0; i<16; i++) {
-        x += 10;
-        y = (i%2)*10;
-
-        cairo_set_source_rgba (cr_image, 1.0/(i+1), 1.0, 16.0*i/255.0, 1.0);
-        cairo_rectangle (cr_image, x, y, 10, 10);
-        cairo_fill (cr_image);
-    }
-
-    cairo_destroy (cr_image);
-
+    image = cairoCreateSampleImage (ctx);
     return 1;
 }
 
diff --git a/src/cairo-tests/image.cpp b/src/cairo-tests/image.cpp
index cbf4c78..69dc905 100644
--- a/src/cairo-tests/image.cpp
+++ b/src/cairo-tests/image.cpp
@@ -12,31 +12,14 @@
 
 #include "caskbench.h"
 #include "caskbench_context.h"
+#include <cairo-shapes.h>
 
 static cairo_surface_t *image;
 
 int
 ca_setup_image(caskbench_context_t *ctx)
 {
-    int i, x, y;
-    cairo_t *cr_image;
-
-    image = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 160, 40);
-    cr_image = cairo_create (image);
-    cairo_set_source_surface (cr_image, image, 0, 0);
-
-    x = 5;
-    for (i=0; i<16; i++) {
-        x += 10;
-        y = (i%2)*10;
-
-        cairo_set_source_rgba (cr_image, 1.0/(i+1), 1.0, 16.0*i/255.0, 1.0);
-        cairo_rectangle (cr_image, x, y, 10, 10);
-        cairo_fill (cr_image);
-    }
-
-    cairo_destroy (cr_image);
-
+    image = cairoCreateSampleImage (ctx);
     return 1;
 }
 
diff --git a/src/skia-tests/image-rotate.cpp b/src/skia-tests/image-rotate.cpp
index 65acb45..2191dee 100644
--- a/src/skia-tests/image-rotate.cpp
+++ b/src/skia-tests/image-rotate.cpp
@@ -20,30 +20,7 @@ static SkBitmap bitmap;
 int
 sk_setup_image_rotate(caskbench_context_t *ctx)
 {
-    int i, x, y;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 160, 40);
-    SkImageInfo info = SkImageInfo::Make(160, 40,
-                                         kBGRA_8888_SkColorType,
-                                         kPremul_SkAlphaType);
-    bitmap.allocPixels(info);
-    SkBitmapDevice device(bitmap);
-    SkCanvas canvas(&device);
-    SkPaint paint;
-    SkRect r;
-
-    canvas.clear(0);
-
-    x = 5;
-    for (i=0; i<16; i++) {
-        paint.setARGB(255, 255/(i+1), 255, 16*i);
-        x += 10;
-        y = (i%2)*10;
-        r.set(x, y, x+10, y+10);
-
-        canvas.drawRect(r, paint);
-    }
-    canvas.flush();
-
+    bitmap = skiaCreateSampleImage (ctx);
     return 1;
 }
 
diff --git a/src/skia-tests/image-scale.cpp b/src/skia-tests/image-scale.cpp
index 87cc192..6e5b581 100644
--- a/src/skia-tests/image-scale.cpp
+++ b/src/skia-tests/image-scale.cpp
@@ -20,30 +20,7 @@ static SkBitmap bitmap;
 int
 sk_setup_image_scale(caskbench_context_t *ctx)
 {
-    int i, x, y;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 160, 40);
-    SkImageInfo info = SkImageInfo::Make(160, 40,
-                                         kBGRA_8888_SkColorType,
-                                         kPremul_SkAlphaType);
-    bitmap.allocPixels(info);
-    SkBitmapDevice device(bitmap);
-    SkCanvas canvas(&device);
-    SkPaint paint;
-    SkRect r;
-
-    canvas.clear(0);
-
-    x = 5;
-    for (i=0; i<16; i++) {
-        paint.setARGB(255, 255/(i+1), 255, 16*i);
-        x += 10;
-        y = (i%2)*10;
-        r.set(x, y, x+10, y+10);
-
-        canvas.drawRect(r, paint);
-    }
-    canvas.flush();
-
+    bitmap = skiaCreateSampleImage (ctx);
     return 1;
 }
 
diff --git a/src/skia-tests/image.cpp b/src/skia-tests/image.cpp
index f60763a..e2035fb 100644
--- a/src/skia-tests/image.cpp
+++ b/src/skia-tests/image.cpp
@@ -20,30 +20,7 @@ static SkBitmap bitmap;
 int
 sk_setup_image(caskbench_context_t *ctx)
 {
-    int i, x, y;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 160, 40);
-    SkImageInfo info = SkImageInfo::Make(160, 40,
-                                         kBGRA_8888_SkColorType,
-                                         kPremul_SkAlphaType);
-    bitmap.allocPixels(info);
-    SkBitmapDevice device(bitmap);
-    SkCanvas canvas(&device);
-    SkPaint paint;
-    SkRect r;
-
-    canvas.clear(0);
-
-    x = 5;
-    for (i=0; i<16; i++) {
-        paint.setARGB(255, 255/(i+1), 255, 16*i);
-        x += 10;
-        y = (i%2)*10;
-        r.set(x, y, x+10, y+10);
-
-        canvas.drawRect(r, paint);
-    }
-    canvas.flush();
-
+    bitmap = skiaCreateSampleImage (ctx);
     return 1;
 }