commit 928a0caa3e5db2d4748bce6b23507757f9867d14
author Rich Geldreich <richgel99@gmail.com> Mon Dec 27 02:18:33 2021 -0500
committer Rich Geldreich <richgel99@gmail.com> Mon Dec 27 02:18:33 2021 -0500
tree f91709c0195d2478fcc44497370a24c8239f50cc
parent 4e0c016c707258e9e92add407391ccf0d9e25686

Fixing asserts on 1x1 jpeg's when chroma filtering is enabled.

encoder/jpgd.cpp

diff --git a/encoder/jpgd.cpp b/encoder/jpgd.cpp
index 4608344..563fa74 100644
--- a/encoder/jpgd.cpp
+++ b/encoder/jpgd.cpp
@@ -2085,7 +2085,7 @@
 		if (setjmp(m_jmp_state))
 			return JPGD_FAILED;
 
-		const bool chroma_y_filtering = (m_flags & cFlagLinearChromaFiltering) && ((m_scan_type == JPGD_YH2V2) || (m_scan_type == JPGD_YH1V2));
+		const bool chroma_y_filtering = (m_flags & cFlagLinearChromaFiltering) && ((m_scan_type == JPGD_YH2V2) || (m_scan_type == JPGD_YH1V2)) && (m_image_x_size >= 2) && (m_image_y_size >= 2);
 		if (chroma_y_filtering)
 		{
 			std::swap(m_pSample_buf, m_pSample_buf_prev);
@@ -2114,7 +2114,7 @@
 		if (m_total_lines_left == 0)
 			return JPGD_DONE;
 
-		const bool chroma_y_filtering = (m_flags & cFlagLinearChromaFiltering) && ((m_scan_type == JPGD_YH2V2) || (m_scan_type == JPGD_YH1V2));
+		const bool chroma_y_filtering = (m_flags & cFlagLinearChromaFiltering) && ((m_scan_type == JPGD_YH2V2) || (m_scan_type == JPGD_YH1V2)) && (m_image_x_size >= 2) && (m_image_y_size >= 2);
 
 		bool get_another_mcu_row = false;
 		bool got_mcu_early = false;
@@ -2144,7 +2144,7 @@
 		{
 		case JPGD_YH2V2:
 		{
-			if (m_flags & cFlagLinearChromaFiltering)
+			if ((m_flags & cFlagLinearChromaFiltering) && (m_image_x_size >= 2) && (m_image_y_size >= 2))
 			{
 				if (m_num_buffered_scanlines == 1)
 				{
@@ -2173,7 +2173,7 @@
 		}
 		case JPGD_YH2V1:
 		{
-			if (m_flags & cFlagLinearChromaFiltering)
+			if ((m_flags & cFlagLinearChromaFiltering) && (m_image_x_size >= 2) && (m_image_y_size >= 2))
 				H2V1ConvertFiltered();
 			else
 				H2V1Convert();