Fix XYZ and always set channel names to RGBA when using oiio

Author: zshipko

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "image2"
-version = "1.5.2"
+version = "1.5.3"
 authors = ["Zach Shipko <[email protected]>"]
 license = "ISC"
 keywords = ["image", "image-processing"]

src/color.rs

@@ -158,19 +158,15 @@ impl Color for Xyz {
             b /= 12.92
         }
 
-        r *= 100.;
-        g *= 100.;
-        b *= 100.;
-
         pixel[0] = r * 0.4124 + g * 0.3576 + b * 0.1805;
         pixel[1] = r * 0.2126 + g * 0.7152 + b * 0.0722;
         pixel[2] = r * 0.0193 + g * 0.1192 + b * 0.9505;
     }
 
     fn to_rgb(px: &Pixel<Xyz>, mut rgb: &mut Pixel<Rgb>) {
-        let x = px[0] / 100.;
-        let y = px[1] / 100.;
-        let z = px[2] / 100.;
+        let x = px[0];
+        let y = px[1];
+        let z = px[2];
 
         rgb[0] = {
             let var_r = x * 3.2406 + y * -1.5372 + z * -0.4986;

src/io/oiio.rs

@@ -89,7 +89,6 @@ impl ImageOutput {
     /// Note: `image` dimensions and type will take precendence over the ImageSpec
     pub fn write<T: Type, C: Color>(mut self, image: &Image<T, C>) -> Result<(), Error> {
         let base_type = T::BASE;
-        let name = C::NAME.as_bytes().as_ptr() as *const _;
         let path: &std::path::Path = self.path.as_ref();
         let path_str = std::ffi::CString::new(path.to_string_lossy().as_bytes().to_vec()).unwrap();
         let filename = path_str.as_ptr();
@@ -98,16 +97,12 @@ impl ImageOutput {
         let out = self.image_output;
         let spec = &mut self.spec;
         unsafe {
-            cpp!([out as "ImageOutput*", name as "const char *", filename as "const char *", base_type as "TypeDesc::BASETYPE", spec as "ImageSpec *", width as "size_t", height as "size_t", channels as "size_t", pixels as "const void*"] {
+            cpp!([out as "ImageOutput*", filename as "const char *", base_type as "TypeDesc::BASETYPE", spec as "ImageSpec *", width as "size_t", height as "size_t", channels as "size_t", pixels as "const void*"] {
                 ImageSpec outspec (*spec);
                 outspec.width = width;
                 outspec.height = height;
                 outspec.nchannels = channels;
-                auto x = std::vector<std::string>(channels);
-                for (int i = 0; i < channels; i++){
-                    x[i] = std::string(1, name[i]);
-                }
-                outspec.channelnames = x;
+                outspec.channelnames.assign({"R", "G", "B", "A"});
                 outspec.set_format(TypeDesc(base_type));
                 out->open (filename, outspec);
                 out->write_image (base_type, pixels);

src/tests.rs

@@ -211,8 +211,13 @@ fn test_saturation() {
 
 #[test]
 fn test_xyz() {
+    let image: Image<f32, Rgb> = Image::open("images/A.exr").unwrap();
+    let image: Image<f32, Xyz> = image.convert();
+    assert!(image.save("images/test-xyz.exr").is_ok());
+
     let image: Image<f32, Xyz> = Image::open("images/A.exr").unwrap();
-    assert!(image.save("images/test-xyz.jpg").is_ok());
+    let image: Image<f32, Rgb> = image.convert();
+    assert!(image.save("images/test-xyz1.exr").is_ok());
 }
 
 #[cfg(feature = "oiio")]