From cf696ea4ec7eda974739ab78fee84075799773ef Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 25 Oct 2016 06:29:12 +0200
Subject: [PATCH] Use the correct referencing.

---
 src/c/sk_region.cpp   | 25 +++++++++++--------------
 src/c/sk_types_priv.h |  6 ++++--
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/c/sk_region.cpp b/src/c/sk_region.cpp
index 555b818..221c970 100644
--- a/src/c/sk_region.cpp
+++ b/src/c/sk_region.cpp
@@ -15,13 +15,15 @@ sk_region_t *sk_region_new() {
 }
 
 sk_region_t *sk_region_new2(const sk_region_t *region) {
-  return ToRegion(new SkRegion(*AsRegion(region)));
+  return ToRegion(new SkRegion(AsRegion(*region)));
 }
 
-void sk_region_delete(sk_region_t *cpath) { delete AsRegion(cpath); }
+void sk_region_delete(sk_region_t *region) {
+  delete AsRegion(region);
+}
 
 void sk_region_contains(sk_region_t *r, const sk_region_t *region) {
-  AsRegion(r)->contains(*AsRegion(region));
+  AsRegion(r)->contains(AsRegion(*region));
 }
 
 void sk_region_contains2(sk_region_t *r, int x, int y) {
@@ -29,30 +31,25 @@ void sk_region_contains2(sk_region_t *r, int x, int y) {
 }
 
 bool sk_region_intersects(sk_region_t *r, const sk_region_t *src) {
-  return AsRegion(r)->intersects(*AsRegion(src));
+  return AsRegion(r)->intersects(AsRegion(*src));
 }
 
 bool sk_region_set_path(sk_region_t *dst, const sk_path_t *t, const sk_region_t* clip) {
-  SkRegion region = *AsRegion(dst);
-  return region.setPath(AsPath(*t), *AsRegion(clip));
+  return AsRegion(dst)->setPath(AsPath(*t), AsRegion(*clip));
 }
 
 bool sk_region_set_rect(sk_region_t *dst, const sk_irect_t *rect) {
-  SkRegion region = *AsRegion(dst);
-  return region.setRect(AsIRect(*rect));
+  return AsRegion(dst)->setRect(AsIRect(*rect));
 }
 
 bool sk_region_op(sk_region_t *dst, int left, int top, int right, int bottom, sk_region_op_t op) {
-  SkRegion region = *AsRegion(dst);
-  return region.op(left, top, right, bottom, (SkRegion::Op)op);
+  return AsRegion(dst)->op(left, top, right, bottom, (SkRegion::Op)op);
 }
 
 bool sk_region_op2(sk_region_t *dst, sk_region_t *src, sk_region_op_t op) {
-  SkRegion region = *AsRegion(dst);
-  return region.op(*AsRegion(src), (SkRegion::Op)op);
+  return AsRegion(dst)->op(AsRegion(*src), (SkRegion::Op)op);
 }
 
 sk_irect_t sk_region_get_bounds(sk_region_t *r) {
-  SkRegion region = *AsRegion(r);
   return ToIRect(AsRegion(r)->getBounds());
-}
\ No newline at end of file
+}
diff --git a/src/c/sk_types_priv.h b/src/c/sk_types_priv.h
index 88a3fcd..b4e9802 100644
--- a/src/c/sk_types_priv.h
+++ b/src/c/sk_types_priv.h
@@ -98,11 +98,14 @@ static inline const SkIRect& AsIRect(const sk_irect_t& crect) {
     return reinterpret_cast<const SkIRect&>(crect);
 }
 
-/* SkRegion */
 static inline SkRegion* AsRegion(sk_region_t* creg) {
     return reinterpret_cast<SkRegion*>(creg);
 }
 
+static inline SkRegion& AsRegion(sk_region_t& creg) {
+    return reinterpret_cast<SkRegion&>(creg);
+}
+
 static inline const SkRegion* AsRegion(const sk_region_t* creg) {
     return reinterpret_cast<const SkRegion*>(creg);
 }
@@ -114,7 +117,6 @@ static inline const SkRegion& AsRegion(const sk_region_t& creg) {
 static inline sk_region_t* ToRegion(SkRegion* reg) {
     return reinterpret_cast<sk_region_t*>(reg);
 }
-/* End SkRegion */
 
 static inline const SkBitmap* AsBitmap(const sk_bitmap_t* cbitmap) {
     return reinterpret_cast<const SkBitmap*>(cbitmap);
-- 
2.7.4