From dab021bc46dabba270123a32cc1c2f8102593e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Sat, 27 Jul 2019 20:12:31 -0700 Subject: [PATCH] Cleanup. --- src/image.cpp | 6 +++--- src/image_cubemap_filter.cpp | 2 +- src/image_encode.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/image.cpp b/src/image.cpp index 015dab2..9ef2e3a 100644 --- a/src/image.cpp +++ b/src/image.cpp @@ -1019,7 +1019,7 @@ namespace bimg for (uint32_t zz = 0; zz < _depth; ++zz, src += _srcPitch*_height, dst += _dstPitch*_height) { - bx::memCopy(dst, src, pitch, _height, _srcPitch, _dstPitch); + bx::memCopy(dst, _dstPitch, src, _srcPitch, pitch, _height); } } @@ -4544,7 +4544,7 @@ namespace bimg { const uint32_t srcPitch = _width * 4; const uint32_t size = bx::uint32_min(srcPitch, _dstPitch); - bx::memCopy(_dst, _src, size, _height, srcPitch, _dstPitch); + bx::memCopy(_dst, _dstPitch, _src, srcPitch, size, _height); } break; @@ -4570,7 +4570,7 @@ namespace bimg { const uint32_t srcPitch = _width * 4; const uint32_t size = bx::uint32_min(srcPitch, _dstPitch); - bx::memCopy(_dst, _src, size, _height, srcPitch, _dstPitch); + bx::memCopy(_dst, _dstPitch, _src, srcPitch, size, _height); } break; diff --git a/src/image_cubemap_filter.cpp b/src/image_cubemap_filter.cpp index aeac1df..b8e4b37 100644 --- a/src/image_cubemap_filter.cpp +++ b/src/image_cubemap_filter.cpp @@ -363,7 +363,7 @@ namespace bimg ImageMip dstMip; imageGetRawData(*output, side, 0, output->m_data, output->m_size, dstMip); - bx::memCopy(const_cast(dstMip.m_data), srcData, dstPitch, dstWidth, srcPitch, dstPitch); + bx::memCopy(const_cast(dstMip.m_data), dstPitch, srcData, srcPitch, dstPitch, dstWidth); } return output; diff --git a/src/image_encode.cpp b/src/image_encode.cpp index faf1a45..7d24cc5 100644 --- a/src/image_encode.cpp +++ b/src/image_encode.cpp @@ -169,7 +169,7 @@ namespace bimg break; case TextureFormat::RGBA8: - bx::memCopy(_dst, _src, srcPitch, _height, srcPitch, dstPitch); + bx::memCopy(_dst, dstPitch, _src, srcPitch, srcPitch, _height); break; default: