diff options
| author | B Stack <bgstack15@gmail.com> | 2020-12-08 13:14:11 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-12-08 13:14:11 +0000 |
| commit | 35adf35f7d3b7744d58d7ff27fcaf1bb843060aa (patch) | |
| tree | 8e5414c3b8a914f57a1d4dc92ee0e55ae1f6e9ee /xBRZ/src | |
| parent | Merge branch '11.3' into 'master' (diff) | |
| parent | add upstream 11.4 (diff) | |
| download | FreeFileSync-35adf35f7d3b7744d58d7ff27fcaf1bb843060aa.tar.gz FreeFileSync-35adf35f7d3b7744d58d7ff27fcaf1bb843060aa.tar.bz2 FreeFileSync-35adf35f7d3b7744d58d7ff27fcaf1bb843060aa.zip | |
Merge branch '11.4' into 'master'11.4
add upstream 11.4
See merge request opensource-tracking/FreeFileSync!28
Diffstat (limited to 'xBRZ/src')
| -rw-r--r-- | xBRZ/src/xbrz_tools.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xBRZ/src/xbrz_tools.h b/xBRZ/src/xbrz_tools.h index 404849ca..98164678 100644 --- a/xBRZ/src/xbrz_tools.h +++ b/xBRZ/src/xbrz_tools.h @@ -182,10 +182,10 @@ void nearestNeighborScaleOverSource(const PixSrc* src, int srcWidth, int srcHeig /**/ PixTrg* trg, int trgWidth, int trgHeight, int trgPitch /*[bytes]*/, int yFirst, int yLast, PixConverter pixCvrt /*convert PixSrc to PixTrg*/) { - static_assert(std::is_integral<PixSrc>::value, "PixSrc* is expected to be cast-able to char*"); - static_assert(std::is_integral<PixTrg>::value, "PixTrg* is expected to be cast-able to char*"); + static_assert(std::is_integral_v<PixSrc>, "PixSrc* is expected to be cast-able to char*"); + static_assert(std::is_integral_v<PixTrg>, "PixTrg* is expected to be cast-able to char*"); - static_assert(std::is_same<decltype(pixCvrt(PixSrc())), PixTrg>::value, "PixConverter returning wrong pixel format"); + static_assert(std::is_same_v<decltype(pixCvrt(PixSrc())), PixTrg>, "PixConverter returning wrong pixel format"); if (srcPitch < srcWidth * static_cast<int>(sizeof(PixSrc)) || trgPitch < trgWidth * static_cast<int>(sizeof(PixTrg))) |