diff options
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/directx/dx_9rm.cxx | 9 | ||||
| -rw-r--r-- | canvas/source/directx/dx_surfacebitmap.cxx | 23 | ||||
| -rw-r--r-- | canvas/source/null/null_canvasfont.cxx | 1 |
3 files changed, 17 insertions, 16 deletions
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index 8d3ffd8b2755..e67898c07ba8 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -38,6 +38,7 @@ // vertex buffer (must be divisable // by 3, as each triangle primitive // has 3 vertices) +#include <string.h> #include <vcl/syschild.hxx> #include <vcl/window.hxx> @@ -439,7 +440,7 @@ namespace dxcanvas for(sal_uInt32 i=0; i<nNumLines; ++i) { - rtl_copyMemory(pDst,pImage,nNumBytesToCopy); + memcpy(pDst,pImage,nNumBytesToCopy); if( bClearRightColumn ) { @@ -458,7 +459,7 @@ namespace dxcanvas } if( bClearBottomRow ) - rtl_zeroMemory(pDst,nNumBytesToCopy+4); + memset(pDst, 0, nNumBytesToCopy+4); } break; @@ -498,7 +499,7 @@ namespace dxcanvas } if( bClearBottomRow ) - rtl_zeroMemory(pDst,4*(nNumColumns+1)); + memset(pDst, 0, 4*(nNumColumns+1)); } break; @@ -531,7 +532,7 @@ namespace dxcanvas } if( bClearBottomRow ) - rtl_zeroMemory(pDst,4*(nNumColumns+1)); + memset(pDst, 0, 4*(nNumColumns+1)); } break; diff --git a/canvas/source/directx/dx_surfacebitmap.cxx b/canvas/source/directx/dx_surfacebitmap.cxx index 8a416b380d3f..c45d5af9fa79 100644 --- a/canvas/source/directx/dx_surfacebitmap.cxx +++ b/canvas/source/directx/dx_surfacebitmap.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <string.h> #include "dx_surfacebitmap.hxx" #include "dx_impltools.hxx" @@ -83,7 +84,7 @@ namespace dxcanvas sal_uInt8* DXColorBuffer::lock() const { #if DIRECTX_VERSION < 0x0900 - rtl_zeroMemory((void *)&aSurfaceDesc,sizeof(DDSURFACEDESC)); + memset((void *)&aSurfaceDesc, 0, sizeof(DDSURFACEDESC)); aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); const DWORD dwFlags = DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY; if(SUCCEEDED(mpSurface->Lock(NULL,&aSurfaceDesc,dwFlags,NULL))) @@ -344,7 +345,7 @@ namespace dxcanvas #if DIRECTX_VERSION < 0x0900 DDSURFACEDESC aSurfaceDesc; - rtl_zeroMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC)); + memset(&aSurfaceDesc, 0, sizeof(DDSURFACEDESC)); aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); const DWORD dwFlags = DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY; @@ -468,7 +469,7 @@ namespace dxcanvas { #if DIRECTX_VERSION < 0x0900 DDSURFACEDESC aSurfaceDesc; - rtl_zeroMemory( &aSurfaceDesc,sizeof(DDSURFACEDESC) ); + memset( &aSurfaceDesc, 0, sizeof(DDSURFACEDESC) ); aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); if( FAILED(mpSurface->Lock( NULL, @@ -541,7 +542,7 @@ namespace dxcanvas #if DIRECTX_VERSION < 0x0900 DDSURFACEDESC aSurfaceDesc; - rtl_zeroMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC)); + memset(&aSurfaceDesc,0, sizeof(DDSURFACEDESC)); aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); const DWORD dwFlags = DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY; @@ -554,7 +555,7 @@ namespace dxcanvas sal_uInt32 nSegmentSizeInBytes = nWidth<<4; for(sal_uInt32 y=0; y<nHeight; ++y) { - rtl_copyMemory(pDst,pSrc,nSegmentSizeInBytes); + memcpy(pDst,pSrc,nSegmentSizeInBytes); pDst += nSegmentSizeInBytes; pSrc += aSurfaceDesc.lPitch; } @@ -570,7 +571,7 @@ namespace dxcanvas sal_uInt32 nSegmentSizeInBytes = nWidth<<4; for(sal_uInt32 y=0; y<nHeight; ++y) { - rtl_copyMemory(pDst,pSrc,nSegmentSizeInBytes); + memcpy(pDst,pSrc,nSegmentSizeInBytes); pDst += nSegmentSizeInBytes; pSrc += aLockedRect.Pitch; } @@ -623,7 +624,7 @@ namespace dxcanvas #if DIRECTX_VERSION < 0x0900 DDSURFACEDESC aSurfaceDesc; - rtl_zeroMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC)); + memset(&aSurfaceDesc, 0, sizeof(DDSURFACEDESC)); aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); const DWORD dwFlags = DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_WRITEONLY; @@ -636,7 +637,7 @@ namespace dxcanvas sal_uInt32 nSegmentSizeInBytes = nWidth<<4; for(sal_uInt32 y=0; y<nHeight; ++y) { - rtl_copyMemory(pDst,pSrc,nSegmentSizeInBytes); + memcpy(pDst,pSrc,nSegmentSizeInBytes); pSrc += nSegmentSizeInBytes; pDst += aSurfaceDesc.lPitch; } @@ -653,7 +654,7 @@ namespace dxcanvas sal_uInt32 nSegmentSizeInBytes = nWidth<<4; for(sal_uInt32 y=0; y<nHeight; ++y) { - rtl_copyMemory(pDst,pSrc,nSegmentSizeInBytes); + memcpy(pDst,pSrc,nSegmentSizeInBytes); pSrc += nSegmentSizeInBytes; pDst += aLockedRect.Pitch; } @@ -703,7 +704,7 @@ namespace dxcanvas #if DIRECTX_VERSION < 0x0900 DDSURFACEDESC aSurfaceDesc; - rtl_zeroMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC)); + memset(&aSurfaceDesc, 0, sizeof(DDSURFACEDESC)); aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); const DWORD dwFlags = DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_WRITEONLY; @@ -761,7 +762,7 @@ namespace dxcanvas #if DIRECTX_VERSION < 0x0900 DDSURFACEDESC aSurfaceDesc; - rtl_zeroMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC)); + memset(&aSurfaceDesc, 0, sizeof(DDSURFACEDESC)); aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); const DWORD dwFlags = DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY; diff --git a/canvas/source/null/null_canvasfont.cxx b/canvas/source/null/null_canvasfont.cxx index 838e9256e95a..22a5d738a2c4 100644 --- a/canvas/source/null/null_canvasfont.cxx +++ b/canvas/source/null/null_canvasfont.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ - #include "null_canvasfont.hxx" #include "null_textlayout.hxx" #include "null_spritecanvas.hxx" |