Scarfski/basis_universal
1
0
Fork 0
mirror of https://github.com/BinomialLLC/basis_universal.git synced 2026-06-08 08:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rich Geldreich
2021-12-27 02:18:33 -05:00
parent 4e0c016c70
commit 928a0caa3e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
encoder/jpgd.cpp
View File

@@ -2085,7 +2085,7 @@ namespace jpgd {
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 @@ namespace jpgd {
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 @@ namespace jpgd {
{
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 @@ namespace jpgd {
}
case JPGD_YH2V1:
{
if (m_flags & cFlagLinearChromaFiltering)
if ((m_flags & cFlagLinearChromaFiltering) && (m_image_x_size >= 2) && (m_image_y_size >= 2))
H2V1ConvertFiltered();
else
H2V1Convert();