Бранимир Караџић преди 6 години
родител
ревизия
dab021bc46
променени са 3 файла, в които са добавени 5 реда и са изтрити 5 реда
  1. 3 3
      src/image.cpp
  2. 1 1
      src/image_cubemap_filter.cpp
  3. 1 1
      src/image_encode.cpp

+ 3 - 3
src/image.cpp

@@ -1019,7 +1019,7 @@ namespace bimg
 
 
 		for (uint32_t zz = 0; zz < _depth; ++zz, src += _srcPitch*_height, dst += _dstPitch*_height)
 		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 srcPitch = _width * 4;
 				const uint32_t size = bx::uint32_min(srcPitch, _dstPitch);
 				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;
 			break;
 
 
@@ -4570,7 +4570,7 @@ namespace bimg
 			{
 			{
 				const uint32_t srcPitch = _width * 4;
 				const uint32_t srcPitch = _width * 4;
 				const uint32_t size = bx::uint32_min(srcPitch, _dstPitch);
 				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;
 			break;
 
 

+ 1 - 1
src/image_cubemap_filter.cpp

@@ -363,7 +363,7 @@ namespace bimg
 			ImageMip dstMip;
 			ImageMip dstMip;
 			imageGetRawData(*output, side, 0, output->m_data, output->m_size, dstMip);
 			imageGetRawData(*output, side, 0, output->m_data, output->m_size, dstMip);
 
 
-			bx::memCopy(const_cast<uint8_t*>(dstMip.m_data), srcData, dstPitch, dstWidth, srcPitch, dstPitch);
+			bx::memCopy(const_cast<uint8_t*>(dstMip.m_data), dstPitch, srcData, srcPitch, dstPitch, dstWidth);
 		}
 		}
 
 
 		return output;
 		return output;

+ 1 - 1
src/image_encode.cpp

@@ -169,7 +169,7 @@ namespace bimg
 				break;
 				break;
 
 
 			case TextureFormat::RGBA8:
 			case TextureFormat::RGBA8:
-				bx::memCopy(_dst, _src, srcPitch, _height, srcPitch, dstPitch);
+				bx::memCopy(_dst, dstPitch, _src, srcPitch, srcPitch, _height);
 				break;
 				break;
 
 
 			default:
 			default: