From 1e71767b40fd09f8eefe562c775e7c8e16e8d0b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Wed, 7 Aug 2019 15:52:50 +0300
Subject: [PATCH] cdg: Update to image 0.22 and cdg_renderer 0.3

---
 gst-plugin-cdg/Cargo.toml    | 6 +++---
 gst-plugin-cdg/src/cdgdec.rs | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/gst-plugin-cdg/Cargo.toml b/gst-plugin-cdg/Cargo.toml
index 5ff2d309..8bf80240 100644
--- a/gst-plugin-cdg/Cargo.toml
+++ b/gst-plugin-cdg/Cargo.toml
@@ -13,9 +13,9 @@ gstreamer = { git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", fea
 gstreamer-base = { git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["subclassing", "v1_12"] }
 gstreamer-video = { git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["subclassing", "v1_12"] }
 gstreamer-app = { git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
-cdg = "0.1.0"
-cdg_renderer = "0.2"
-image = "0.21"
+cdg = "0.1"
+cdg_renderer = "0.3"
+image = "0.22"
 muldiv = "0.2"
 
 [lib]
diff --git a/gst-plugin-cdg/src/cdgdec.rs b/gst-plugin-cdg/src/cdgdec.rs
index 6b1dabef..5cc496dd 100644
--- a/gst-plugin-cdg/src/cdgdec.rs
+++ b/gst-plugin-cdg/src/cdgdec.rs
@@ -180,10 +180,7 @@ impl VideoDecoderImpl for CdgDec {
                     .enumerate()
                 {
                     let p = cdg_inter.get_pixel(x as u32, y as u32);
-                    pixel[0] = p.data[0];
-                    pixel[1] = p.data[1];
-                    pixel[2] = p.data[2];
-                    pixel[3] = p.data[3];
+                    pixel.copy_from_slice(&p.0);
                 }
             }
         }