Implement C path functions

experimental/sk_surface.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "sk_surface.h"
 
 #include "SkCanvas.h"
 #include "SkImage.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkSurface.h"
 
 static SkImageInfo make(const sk_imageinfo_t& cinfo) {
     return SkImageInfo::Make(cinfo.width, cinfo.height,
                              (SkColorType)cinfo.colorType, (SkAlphaType)cinfo.alphaType);
 }
 
 static const SkRect& AsRect(const sk_rect_t& crect) {
     return reinterpret_cast<const SkRect&>(crect);
 }
 
 static const SkPath& AsPath(const sk_path_t& cpath) {
     return reinterpret_cast<const SkPath&>(cpath);
 }
 
+static SkPath* as_path(sk_path_t* cpath) {
+    return reinterpret_cast<SkPath*>(cpath);
+}
+
+static const SkPath* as_path(const sk_path_t* cpath) {

[reed1, 2014/10/08 12:12:46]

do we need this one? if so, can it take/return a ref (see const paint)?

[robertphillips, 2014/10/08 12:56:18]

Apparently it is not needed, I've removed it.

+    return reinterpret_cast<const SkPath*>(cpath);
+}
+
 static const SkImage* AsImage(const sk_image_t* cimage) {
     return reinterpret_cast<const SkImage*>(cimage);
 }
 
 static const SkPaint& AsPaint(const sk_paint_t& cpaint) {
     return reinterpret_cast<const SkPaint&>(cpaint);
 }
 
 static const SkPaint* AsPaint(const sk_paint_t* cpaint) {
     return reinterpret_cast<const SkPaint*>(cpaint);
@@ skipping 55 matching lines @@
 sk_color_t sk_paint_get_color(const sk_paint_t* cpaint) {
     return AsPaint(*cpaint).getColor();
 }
 
 void sk_paint_set_color(sk_paint_t* cpaint, sk_color_t c) {
     AsPaint(cpaint)->setColor(c);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
+sk_path_t* sk_path_new() {
+    return (sk_path_t*)SkNEW(SkPath);
+}
+
+void sk_path_delete(sk_path_t* cpath) {
+    SkDELETE(as_path(cpath));
+}
+
+void sk_path_move_to(sk_path_t* cpath, float x, float y) {
+    as_path(cpath)->moveTo(x, y);
+}
+
+void sk_path_line_to(sk_path_t* cpath, float x, float y) {
+    as_path(cpath)->lineTo(x, y);
+}
+
+void sk_path_quad_to(sk_path_t* cpath, float x0, float y0, float x1, float y1) {
+    as_path(cpath)->quadTo(x0, y0, x1, y1);
+}
+
+void sk_path_close(sk_path_t* cpath) {
+    as_path(cpath)->close();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
 void sk_canvas_save(sk_canvas_t* ccanvas) {
     AsCanvas(ccanvas)->save();
 }
 
 void sk_canvas_save_layer(sk_canvas_t* ccanvas, const sk_rect_t* crect, const sk_paint_t* cpaint) {
     AsCanvas(ccanvas)->drawRect(AsRect(*crect), AsPaint(*cpaint));
 }
 
 void sk_canvas_restore(sk_canvas_t* ccanvas) {
     AsCanvas(ccanvas)->restore();
@@ skipping 31 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 sk_surface_t* sk_surface_new_raster(const sk_imageinfo_t* cinfo) {
     return (sk_surface_t*)SkSurface::NewRaster(make(*cinfo));
 }
 
 sk_surface_t* sk_surface_new_raster_direct(const sk_imageinfo_t* cinfo, void* pixels,
                                            size_t rowBytes) {
     return (sk_surface_t*)SkSurface::NewRasterDirect(make(*cinfo), pixels, rowBytes);
 }
 

[robertphillips, 2014/10/07 18:20:09]

It seems a bit funky to call this delete but unref inside.

[reed1, 2014/10/08 12:12:46]

Yea, trying to be conservative in exposing when something is refcounted under
the hood -- we may have to expose that, but just trying out a more conservative
model.

 void sk_surface_delete(sk_surface_t* csurf) {
     SkSurface* surf = (SkSurface*)csurf;
     SkSafeUnref(surf);
 }
 
 sk_canvas_t* sk_surface_get_canvas(sk_surface_t* csurf) {
     SkSurface* surf = (SkSurface*)csurf;
     return (sk_canvas_t*)surf->getCanvas();
 }
 
@@ skipping 22 matching lines @@
     sk_rect_t cr = { 5, 5, 95, 95 };
     sk_canvas_draw_oval(ccanvas, &cr, cpaint);
     
     cr.left += 25;
     cr.top += 25;
     cr.right -= 25;
     cr.bottom -= 25;
     sk_paint_set_color(cpaint, 0xFF00FF00);
     sk_canvas_draw_rect(ccanvas, &cr, cpaint);
     
+    sk_path_t* cpath = sk_path_new();
+    sk_path_move_to(cpath, 50, 50);
+    sk_path_line_to(cpath, 100, 100);
+    sk_path_line_to(cpath, 50, 100);
+    sk_path_close(cpath);
+
+    sk_canvas_draw_path(ccanvas, cpath, cpaint);
+
     sk_image_t* cimage = sk_surface_new_image_snapshot(csurface);
     
     // HERE WE CROSS THE C..C++ boundary
     canvas->drawImage((const SkImage*)cimage, 20, 20, NULL);
     
+    sk_path_delete(cpath);
     sk_paint_delete(cpaint);
     sk_image_unref(cimage);
     sk_surface_delete(csurface);
 }