From 659aa8cfff5de0c8376f8deca644f1e5724cb099 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Mon, 6 Jun 2016 21:37:21 +0200
Subject: [PATCH] Revert "The stream cannot be referenced/disposed once passed
 to SKTypeface."

This reverts commit 35048c0e00689296ad8b95f4ab122f27961d443e.
---
 docs/en/SkiaSharp/SKTypeface.xml      |  8 ++++----
 samples/SharedDemo/SkiaSharp.Demos.cs | 12 ++++++------
 skia                                  |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/en/SkiaSharp/SKTypeface.xml b/docs/en/SkiaSharp/SKTypeface.xml
index bd6935ccc..d68404b24 100644
--- a/docs/en/SkiaSharp/SKTypeface.xml
+++ b/docs/en/SkiaSharp/SKTypeface.xml
@@ -228,15 +228,15 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="stream">The input stream.</param>
-        <param name="index">The font face index.</param>
-        <summary>Return a new typeface given a stream. Ownership of the stream is transferred, so the caller must not reference it again.</summary>
+        <param name="stream">Input stream</param>
+        <param name="index">the font face index.</param>
+        <summary>Return a new typeface given a stream. </summary>
         <returns>If the stream is not a valid font file, returns <paramref name="null" />. </returns>
         <remarks>
           <para>
           </para>
           <example>
-            <code lang="C#"><![CDATA[var stream = new SKFileStream (“myfont.ttf”);
+            <code lang="C#"><![CDATA[using (var stream = new SKFileStream (“myfont.ttf"))
 using (var tf = SKTypeface.FromStream (stream)) {
     paint.Color = XamDkBlue;
     paint.TextSize = 60;
diff --git a/samples/SharedDemo/SkiaSharp.Demos.cs b/samples/SharedDemo/SkiaSharp.Demos.cs
index 6dfeb9dd6..5c3aad870 100644
--- a/samples/SharedDemo/SkiaSharp.Demos.cs
+++ b/samples/SharedDemo/SkiaSharp.Demos.cs
@@ -289,8 +289,8 @@ namespace SkiaSharp
 					canvas.DrawText (text, 50, 50, paint);
 				}
 
-				var fileStream = new SKFileStream (CustomFontPath);
-				using (var tf = SKTypeface.FromStream (fileStream)) {
+				using (var stream = new SKFileStream (CustomFontPath))
+				using (var tf = SKTypeface.FromStream (stream)) {
 					paint.Color = XamDkBlue;
 					paint.TextSize = 60;
 					paint.Typeface = tf;
@@ -305,7 +305,7 @@ namespace SkiaSharp
 				using (var memory = new MemoryStream ()) {
 					resource.CopyTo (memory);
 					var bytes = memory.ToArray ();
-					var stream = new SKMemoryStream (bytes);
+					using (var stream = new SKMemoryStream (bytes))
 					using (var tf = SKTypeface.FromStream (stream)) {
 						paint.Color = XamLtBlue;
 						paint.TextSize = 60;
@@ -315,9 +315,9 @@ namespace SkiaSharp
 					}
 				}
 
-				var managedResource = assembly.GetManifestResourceStream (fontName);
-				var managedStream = new SKManagedStream (managedResource, true);
-				using (var tf = SKTypeface.FromStream (managedStream)) {
+				using (var resource = assembly.GetManifestResourceStream (fontName))
+				using (var stream = new SKManagedStream (resource))
+				using (var tf = SKTypeface.FromStream (stream)) {
 					paint.Color = XamPurple;
 					paint.TextSize = 60;
 					paint.Typeface = tf;
diff --git a/skia b/skia
index 6fde4a60e..deb4a7997 160000
--- a/skia
+++ b/skia
@@ -1 +1 @@
-Subproject commit 6fde4a60e6d70be6b78935a9b33a7b509e23e73e
+Subproject commit deb4a7997785aa732d385d4dab2d799fb29033aa