From 516a701e6b474fd73f16a8828935d4723f3959ff Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 26 Dec 2015 22:32:01 +0000
Subject: [PATCH] Fixed ControlCatalog resources.

---
 samples/ControlCatalog/App.paml                             | 2 +-
 samples/ControlCatalog/Pages/CarouselPage.paml              | 6 +++---
 .../Perspex.Markup.Xaml/Converters/BitmapTypeConverter.cs   | 4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/samples/ControlCatalog/App.paml b/samples/ControlCatalog/App.paml
index ba8bc0ca0c..b09160d0a8 100644
--- a/samples/ControlCatalog/App.paml
+++ b/samples/ControlCatalog/App.paml
@@ -11,6 +11,6 @@
       <Setter Property="FontSize" Value="13"/>
     </Style>
 
-    <StyleInclude Source="resource://application/ControlCatalog/ControlCatalog.SideBar.paml"/>
+    <StyleInclude Source="resm:ControlCatalog.SideBar.paml"/>
   </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/CarouselPage.paml b/samples/ControlCatalog/Pages/CarouselPage.paml
index 6f1243a005..3a38e0abd4 100644
--- a/samples/ControlCatalog/Pages/CarouselPage.paml
+++ b/samples/ControlCatalog/Pages/CarouselPage.paml
@@ -11,9 +11,9 @@
         <Carousel.Transition>
           <PageSlide Duration="0.25"/>
         </Carousel.Transition>
-        <Image Source="resource://application/ControlCatalog.Assets.delicate-arch-896885_640.jpg"/>
-        <Image Source="resource://application/ControlCatalog.Assets.hirsch-899118_640.jpg"/>
-        <Image Source="resource://application/ControlCatalog.Assets.maple-leaf-888807_640.jpg"/>
+        <Image Source="resm:ControlCatalog.Assets.delicate-arch-896885_640.jpg"/>
+        <Image Source="resm:ControlCatalog.Assets.hirsch-899118_640.jpg"/>
+        <Image Source="resm:ControlCatalog.Assets.maple-leaf-888807_640.jpg"/>
       </Carousel>
       <Button Name="right" VerticalAlignment="Center" Padding="20">
         <Path Data="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z" Fill="Black"/>
diff --git a/src/Markup/Perspex.Markup.Xaml/Converters/BitmapTypeConverter.cs b/src/Markup/Perspex.Markup.Xaml/Converters/BitmapTypeConverter.cs
index 81cf3b0cdc..8d0e1663c1 100644
--- a/src/Markup/Perspex.Markup.Xaml/Converters/BitmapTypeConverter.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Converters/BitmapTypeConverter.cs
@@ -30,11 +30,9 @@ namespace Perspex.Markup.Xaml.Converters
             {
                 case "file":
                     return new Bitmap((string)value);
-                case "resource":
+                default:
                     var assets = PerspexLocator.Current.GetService<IAssetLoader>();
                     return new Bitmap(assets.Open(uri));
-                default:
-                    throw new NotSupportedException($"Unsupported bitmap URI scheme: {uri.Scheme}.");
             }
         }