wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-03 06:18:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

[aom] Fix win32 debug build

Browse source 
Visual Studio 2015u3 fails to compile reconintra.c for win32
debug targets. It's confused by the #if conditional inside
the assert macro expansion.

The checks are obsolete upstream. Address the issue by
duplicating the assert calls for each branch of the
conditional.
This commit is contained in:
trav90 2018-10-18 19:49:57 -05:00 • committed by Roy Tam
commit debbee1e2a
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
third_party/aom/av1/common/reconintra.c vendored
View file

@ -3118,16 +3118,16 @@ void av1_predict_intra_block(const MACROBLOCKD *xd, int wpx, int hpx,
} else {
// Can only happen for large rectangular block sizes as such large
// transform sizes aren't available.
assert(bsize == BLOCK_32X64
#if CONFIG_EXT_PARTITION
|| bsize == BLOCK_64X128
assert(bsize == BLOCK_32X64 || bsize == BLOCK_64X128);
#else
assert(bsize == BLOCK_32X64);
#endif // CONFIG_EXT_PARTITION
);
assert(tx_size == TX_32X32
#if CONFIG_TX64X64
|| tx_size == TX64X64
assert(tx_size == TX_32X32 || tx_size == TX64X64);
#else
assert(tx_size == TX_32X32);
#endif // CONFIG_TX64X64
);
// In this case, we continue to the bottom square sub-block.
}
#endif // CONFIG_RECT_INTRA_PRED && CONFIG_RECT_TX && (CONFIG_VAR_TX ||
@ -3191,16 +3191,16 @@ void av1_predict_intra_block(const MACROBLOCKD *xd, int wpx, int hpx,
} else {
// Can only happen for large rectangular block sizes as such large
// transform sizes aren't available.
assert(bsize == BLOCK_64X32
#if CONFIG_EXT_PARTITION
|| bsize == BLOCK_128X64
assert(bsize == BLOCK_64X32 || bsize == BLOCK_128X64);
#else
assert(bsize == BLOCK_64X32);
#endif // CONFIG_EXT_PARTITION
);
assert(tx_size == TX_32X32
#if CONFIG_TX64X64
|| tx_size == TX64X64
assert(tx_size == TX_32X32 || tx_size == TX64X64);
#else
assert(tx_size == TX_32X32);
#endif // CONFIG_TX64X64
);
// In this case, we continue to the right square sub-block.
}
#endif // CONFIG_RECT_INTRA_PRED && CONFIG_RECT_TX && (CONFIG_VAR_TX ||