diff --git a/src/conversions.rs b/src/conversions.rs index b19e9ee..26f5b9d 100644 --- a/src/conversions.rs +++ b/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 { @@ -18,9 +33,7 @@ pub trait ToMagick { fn to_magick(self) -> T; } -impl ToMagick for E - where T: FromRust -{ +impl ToMagick for E where T: FromRust { fn to_magick(self) -> T { >::from_rust(self) } diff --git a/src/filters.rs b/src/filters.rs index 73a8e6e..6ef4c20 100644 --- a/src/filters.rs +++ b/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 { diff --git a/src/wand/drawing.rs b/src/wand/drawing.rs index 3c36b01..0f07766 100644 --- a/src/wand/drawing.rs +++ b/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; diff --git a/src/wand/macros.rs b/src/wand/macros.rs index d1aa154..f971633 100644 --- a/src/wand/macros.rs +++ b/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, diff --git a/src/wand/magick.rs b/src/wand/magick.rs index 80c5388..5e0976e 100644 --- a/src/wand/magick.rs +++ b/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"), diff --git a/src/wand/mod.rs b/src/wand/mod.rs index bad31d4..211f2a9 100644 --- a/src/wand/mod.rs +++ b/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; diff --git a/src/wand/pixel.rs b/src/wand/pixel.rs index 83f4f7e..965af81 100644 --- a/src/wand/pixel.rs +++ b/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,