kernel: fix QOIStreamDecoder::finished() and zero init the array

matcool · Aug 12, 2023 · 59fb818 · 59fb818
1 parent 013ed74
commit 59fb818
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/kernel/window/qoi.cpp b/kernel/window/qoi.cpp
@@ -20,6 +20,10 @@ QOIStreamDecoder::QOIStreamDecoder(Span<const u8> data) : m_data(data) {
 
 	// ignore colorspace and channels
 	m_data = m_data.sub(2);
+
+	for (auto& col : m_prev_pixels) {
+		col = Color(0, 0, 0, 0);
+	}
 }
 
 static constexpr u8 QOI_OP_INDEX = 0b0000'0000;
@@ -87,6 +91,7 @@ Color QOIStreamDecoder::next_pixel() {
 }
 
 bool QOIStreamDecoder::finished() const {
+	if (m_run_counter) return false;
 	if (!m_data || m_data.size() < 8) return true;
 	// if the next 7 bytes are 0 and the one after is a 1, then qoi's stream is finished.
 	return !m_data.iter().take(7).any() && m_data[7] == 1;

diff --git a/kernel/window/qoi.hpp b/kernel/window/qoi.hpp
@@ -8,7 +8,6 @@
 class QOIStreamDecoder {
 	Span<const u8> m_data;
 
-	// TODO: should be entirely 0, instead of 255 alpha
 	Array<Color, 64> m_prev_pixels;
 	Color m_last_pixel = Color(0, 0, 0, 255);
 	u8 m_run_counter = 0;