Merge pull request #65 from bvssvni/master

Fixed error message
PistonDevelopers · Oct 17, 2014 · 4a815e0 · 4a815e0
2 parents c6f9b7a + b79ee86
commit 4a815e0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/shader_utils.rs b/src/shader_utils.rs
@@ -148,7 +148,7 @@ pub fn compile_shader(
                 gl::GetShaderInfoLog(
                     shader, 
                     len, 
-                    ptr::mut_null(), 
+                    ptr::null_mut(), 
                     buf.as_mut_ptr() as *mut GLchar
                 );
 

diff --git a/src/texture.rs b/src/texture.rs
@@ -85,7 +85,7 @@ impl Texture {
 
         match img.color() {
             image::RGBA(8) => {},
-            c => fail!("Unsupported color type {} in png", c),
+            c => return Err(format!("Unsupported color type {}", c)),
         };
 
         let (width, height) = img.dimensions();