mirror of
https://github.com/microsoft/DirectXTex.git
synced 2025-07-09 11:40:14 +02:00
functions taking std::function should not be noexcept
This commit is contained in:
parent
21f7e28b80
commit
8359882401
@ -947,7 +947,7 @@ HRESULT DirectX::SaveWICTextureToFile(
|
|||||||
const wchar_t* fileName,
|
const wchar_t* fileName,
|
||||||
const GUID* targetFormat,
|
const GUID* targetFormat,
|
||||||
std::function<void(IPropertyBag2*)> setCustomProps,
|
std::function<void(IPropertyBag2*)> setCustomProps,
|
||||||
bool forceSRGB) noexcept
|
bool forceSRGB)
|
||||||
{
|
{
|
||||||
if (!fileName)
|
if (!fileName)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
@ -37,5 +37,5 @@ namespace DirectX
|
|||||||
_In_z_ const wchar_t* fileName,
|
_In_z_ const wchar_t* fileName,
|
||||||
_In_opt_ const GUID* targetFormat = nullptr,
|
_In_opt_ const GUID* targetFormat = nullptr,
|
||||||
_In_opt_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr,
|
_In_opt_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr,
|
||||||
_In_ bool forceSRGB = false) noexcept;
|
_In_ bool forceSRGB = false);
|
||||||
}
|
}
|
||||||
|
@ -1058,7 +1058,7 @@ HRESULT DirectX::SaveWICTextureToFile(
|
|||||||
D3D12_RESOURCE_STATES afterState,
|
D3D12_RESOURCE_STATES afterState,
|
||||||
const GUID* targetFormat,
|
const GUID* targetFormat,
|
||||||
std::function<void(IPropertyBag2*)> setCustomProps,
|
std::function<void(IPropertyBag2*)> setCustomProps,
|
||||||
bool forceSRGB) noexcept
|
bool forceSRGB)
|
||||||
{
|
{
|
||||||
if (!fileName)
|
if (!fileName)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
@ -41,5 +41,5 @@ namespace DirectX
|
|||||||
D3D12_RESOURCE_STATES afterState = D3D12_RESOURCE_STATE_RENDER_TARGET,
|
D3D12_RESOURCE_STATES afterState = D3D12_RESOURCE_STATE_RENDER_TARGET,
|
||||||
_In_opt_ const GUID* targetFormat = nullptr,
|
_In_opt_ const GUID* targetFormat = nullptr,
|
||||||
_In_opt_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr,
|
_In_opt_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr,
|
||||||
bool forceSRGB = false) noexcept;
|
bool forceSRGB = false);
|
||||||
}
|
}
|
||||||
|
@ -737,7 +737,7 @@ HRESULT DirectX::SaveWICTextureToFile(
|
|||||||
REFGUID guidContainerFormat,
|
REFGUID guidContainerFormat,
|
||||||
const wchar_t* fileName,
|
const wchar_t* fileName,
|
||||||
const GUID* targetFormat,
|
const GUID* targetFormat,
|
||||||
std::function<void(IPropertyBag2*)> setCustomProps) noexcept
|
std::function<void(IPropertyBag2*)> setCustomProps)
|
||||||
{
|
{
|
||||||
if (!pSource || !fileName)
|
if (!pSource || !fileName)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
@ -38,5 +38,5 @@ namespace DirectX
|
|||||||
_In_ REFGUID guidContainerFormat,
|
_In_ REFGUID guidContainerFormat,
|
||||||
_In_z_ const wchar_t* fileName,
|
_In_z_ const wchar_t* fileName,
|
||||||
_In_opt_ const GUID* targetFormat = nullptr,
|
_In_opt_ const GUID* targetFormat = nullptr,
|
||||||
_In_opt_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr) noexcept;
|
_In_opt_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user