Kaydet (Commit) 765efd36 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

DBG_ASSERT -> assert

The only caller of GetResourceSkipHeader (BitmapEx ctor in
vcl/source/gdi/bitmapex.cxx) unconditionally expects *ppResMgr to be non-null
after the call.

Change-Id: I17e71df81019de5b78c4356c7aec967c50a5a6ae
üst f471fe7b
......@@ -1075,15 +1075,11 @@ void * ResMgr::GetResourceSkipHeader( const ResId& rResId, ResMgr ** ppResMgr )
{
osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
DBG_ASSERT( rResId.GetResMgr(), "illegal ResId without ResMgr" );
*ppResMgr = rResId.GetResMgr();
if( *ppResMgr )
{
(*ppResMgr)->GetResource( rResId );
(*ppResMgr)->Increment( sizeof( RSHEADER_TYPE ) );
return (*ppResMgr)->GetClass();
}
return getEmptyBuffer();
assert(*ppResMgr != nullptr);
(*ppResMgr)->GetResource( rResId );
(*ppResMgr)->Increment( sizeof( RSHEADER_TYPE ) );
return (*ppResMgr)->GetClass();
}
void ResMgr::PopContext( const Resource* pResObj )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment