File tree Expand file tree Collapse file tree
libretro-common/formats/png Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -1618,9 +1618,10 @@ bool rpng_iterate_image(rpng_t *rpng)
16181618 return false;
16191619
16201620 case PNG_CHUNK_IHDR :
1621- if ( (rpng -> flags & RPNG_FLAG_HAS_IHDR )
1622- || (rpng -> flags & RPNG_FLAG_HAS_IDAT )
1623- || (rpng -> flags & RPNG_FLAG_HAS_IEND ))
1621+ if (rpng -> flags & (
1622+ RPNG_FLAG_HAS_IHDR
1623+ | RPNG_FLAG_HAS_IDAT
1624+ | RPNG_FLAG_HAS_IEND ))
16241625 return false;
16251626
16261627 if (chunk_size != 13 )
@@ -1705,11 +1706,12 @@ bool rpng_iterate_image(rpng_t *rpng)
17051706 if (chunk_size % 3 )
17061707 return false;
17071708
1708- if ( !(rpng -> flags & RPNG_FLAG_HAS_IHDR )
1709- || (rpng -> flags & RPNG_FLAG_HAS_PLTE )
1710- || (rpng -> flags & RPNG_FLAG_HAS_IEND )
1711- || (rpng -> flags & RPNG_FLAG_HAS_IDAT )
1712- || (rpng -> flags & RPNG_FLAG_HAS_TRNS ))
1709+ if ( !(rpng -> flags & RPNG_FLAG_HAS_IHDR )
1710+ || (rpng -> flags & (
1711+ RPNG_FLAG_HAS_PLTE
1712+ | RPNG_FLAG_HAS_IEND
1713+ | RPNG_FLAG_HAS_IDAT
1714+ | RPNG_FLAG_HAS_TRNS )))
17131715 return false;
17141716
17151717 buf += 8 ;
@@ -1770,8 +1772,7 @@ bool rpng_iterate_image(rpng_t *rpng)
17701772 break ;
17711773
17721774 case PNG_CHUNK_IEND :
1773- if ( !(rpng -> flags & RPNG_FLAG_HAS_IHDR )
1774- || !(rpng -> flags & RPNG_FLAG_HAS_IDAT ))
1775+ if ((rpng -> flags & (RPNG_FLAG_HAS_IHDR | RPNG_FLAG_HAS_IDAT )) != (RPNG_FLAG_HAS_IHDR | RPNG_FLAG_HAS_IDAT ))
17751776 return false;
17761777
17771778 rpng -> flags |= RPNG_FLAG_HAS_IEND ;
You can’t perform that action at this time.
0 commit comments