slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove references to qMemSet & qMemCopy

Browse Source 
Change-Id: Ie6e24798368305fb1eaa01d0e5fccdb5bb5aa33b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Oswald Buddenhagen
2012-09-11 13:03:14 +02:00
committed by Qt by Nokia
parent 83b79659b6
commit 946ff68c42
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/directshow/player/directshowioreader.cpp
View File

@@ -429,7 +429,7 @@ HRESULT DirectShowIOReader::blockingRead(
*bytesRead = m_device->read(reinterpret_cast<char *>(buffer), maxBytes); *bytesRead = m_device->read(reinterpret_cast<char *>(buffer), maxBytes);
if (*bytesRead != length) { if (*bytesRead != length) {
qMemSet(buffer + *bytesRead, 0, length - *bytesRead); ::memset(buffer + *bytesRead, 0, length - *bytesRead);
return S_FALSE; return S_FALSE;
} else { } else {
@@ -459,7 +459,7 @@ bool DirectShowIOReader::nonBlockingRead(
*bytesRead = m_device->read(reinterpret_cast<char *>(buffer), maxBytes); *bytesRead = m_device->read(reinterpret_cast<char *>(buffer), maxBytes);
if (*bytesRead != length) { if (*bytesRead != length) {
qMemSet(buffer + *bytesRead, 0, length - *bytesRead); ::memset(buffer + *bytesRead, 0, length - *bytesRead);
*result = S_FALSE; *result = S_FALSE;
} else { } else {

4
src/plugins/directshow/player/directshowiosource.cpp
View File

@@ -527,7 +527,7 @@ HRESULT DirectShowIOSource::QueryPinInfo(PIN_INFO *pInfo)
const int bytes = qMin(MAX_FILTER_NAME, (m_pinId.length() + 1) * 2); const int bytes = qMin(MAX_FILTER_NAME, (m_pinId.length() + 1) * 2);
qMemCopy(pInfo->achName, m_pinId.utf16(), bytes); ::memcpy(pInfo->achName, m_pinId.utf16(), bytes);
return S_OK; return S_OK;
} }
@@ -542,7 +542,7 @@ HRESULT DirectShowIOSource::QueryId(LPWSTR *Id)
*Id = static_cast<LPWSTR>(::CoTaskMemAlloc(bytes)); *Id = static_cast<LPWSTR>(::CoTaskMemAlloc(bytes));
qMemCopy(*Id, m_pinId.utf16(), bytes); ::memcpy(*Id, m_pinId.utf16(), bytes);
return S_OK; return S_OK;
} }

4
src/plugins/directshow/player/videosurfacefilter.cpp
View File

@@ -396,7 +396,7 @@ HRESULT VideoSurfaceFilter::QueryPinInfo(PIN_INFO *pInfo)
const int bytes = qMin(MAX_FILTER_NAME, (m_pinId.length() + 1) * 2); const int bytes = qMin(MAX_FILTER_NAME, (m_pinId.length() + 1) * 2);
qMemCopy(pInfo->achName, m_pinId.utf16(), bytes); ::memcpy(pInfo->achName, m_pinId.utf16(), bytes);
return S_OK; return S_OK;
} }
@@ -411,7 +411,7 @@ HRESULT VideoSurfaceFilter::QueryId(LPWSTR *Id)
*Id = static_cast<LPWSTR>(::CoTaskMemAlloc(bytes)); *Id = static_cast<LPWSTR>(::CoTaskMemAlloc(bytes));
qMemCopy(*Id, m_pinId.utf16(), bytes); ::memcpy(*Id, m_pinId.utf16(), bytes);
return S_OK; return S_OK;
} }