Add license header to contributed files

src/conversions.rs

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016 Mattis Marjak
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 use super::bindings;
 
 pub trait FromRust<T> {
@@ -18,9 +33,7 @@ pub trait ToMagick<T> {
     fn to_magick(self) -> T;
 }
 
-impl<T, E> ToMagick<T> for E
+impl<T, E> ToMagick<T> for E where T: FromRust<E> {
-    where T: FromRust<E>
-{
     fn to_magick(self) -> T {
         <T as FromRust<E>>::from_rust(self)
     }

src/filters.rs

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016 Mattis Marjak
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 use ::bindings;
 
 pub enum FilterType {

src/wand/drawing.rs

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016 Mattis Marjak
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 use std::fmt;
 use std::ffi::{CStr, CString};
 use ::bindings;

src/wand/macros.rs

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016 Mattis Marjak
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 macro_rules! wand_common {
     (   $wand:ident,
         $new_wand:ident, $clear_wand:ident, $is_wand:ident, $clone:ident, $destroy:ident,

src/wand/magick.rs

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016 Mattis Marjak
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 use std::fmt;
 use std::ptr;
 use std::ffi::{CStr, CString};
@@ -36,7 +51,7 @@ impl MagickWand {
         let c_value = CString::new(value).unwrap();
         let result = unsafe {
             bindings::MagickSetOption(self.wand, c_key.as_ptr(), c_value.as_ptr())
-        }; 
+        };
         match result {
             bindings::MagickTrue => Ok(()),
             _ => Err("failed to set option"),

src/wand/mod.rs

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016 Mattis Marjak
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #[macro_use] mod macros;
 mod magick;
 mod drawing;

src/wand/pixel.rs

@@ -1,9 +1,23 @@
+/*
+ * Copyright 2016 Mattis Marjak
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 use std::fmt;
 use std::ffi::{CStr, CString};
 use ::bindings;
 use ::size_t;
 
-
 #[derive(Default, Debug)]
 pub struct HSL {
     hue: f64,