Merge pull request #329 from tomaka/choose-pixel-format

choose_pixel_format now returns a Result

2 files changed, 4 insertions, 4 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 7f404c3..aba6752 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -304,7 +304,7 @@ impl<'a> BuilderAttribs<'a> {
         (new_attribs, sharing)
     }
 
-    fn choose_pixel_format<T, I>(&self, iter: I) -> (T, PixelFormat)
+    fn choose_pixel_format<T, I>(&self, iter: I) -> Result<(T, PixelFormat), CreationError>
                                  where I: Iterator<Item=(T, PixelFormat)>, T: Clone
     {
         let mut current_result = None;
@@ -343,7 +343,7 @@ impl<'a> BuilderAttribs<'a> {
         }
 
         current_result.or(current_software_result)
-                      .expect("Could not find compliant pixel format")
+                      .ok_or(CreationError::NotSupported)
     }
 }
 
diff --git a/src/win32/init.rs b/src/win32/init.rs
index 5266ae4..08d54c0 100644
--- a/src/win32/init.rs
+++ b/src/win32/init.rs
@@ -136,7 +136,7 @@ unsafe fn init(title: Vec<u16>, builder: BuilderAttribs<'static>,
         // getting the pixel format that we will use and setting it
         {
             let formats = enumerate_native_pixel_formats(&dummy_window);
-            let (id, _) = builder.choose_pixel_format(formats.into_iter().map(|(a, b)| (b, a)));
+            let (id, _) = try!(builder.choose_pixel_format(formats.into_iter().map(|(a, b)| (b, a))));
             try!(set_pixel_format(&dummy_window, id));
         }
 
@@ -206,7 +206,7 @@ unsafe fn init(title: Vec<u16>, builder: BuilderAttribs<'static>,
             enumerate_native_pixel_formats(&real_window)
         };
 
-        let (id, _) = builder.choose_pixel_format(formats.into_iter().map(|(a, b)| (b, a)));
+        let (id, _) = try!(builder.choose_pixel_format(formats.into_iter().map(|(a, b)| (b, a))));
         try!(set_pixel_format(&real_window, id));
     }