From 4c1a8527c14879cd415aadf6b71134bdfc5b0da3 Mon Sep 17 00:00:00 2001 From: walbourn_cp Date: Tue, 2 Jul 2013 15:27:07 -0700 Subject: [PATCH] DirectXTex: Fixed /analyze issues --- DirectXTex/DirectXTexWIC.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/DirectXTex/DirectXTexWIC.cpp b/DirectXTex/DirectXTexWIC.cpp index 3ef490b..b66ee4e 100644 --- a/DirectXTex/DirectXTexWIC.cpp +++ b/DirectXTex/DirectXTexWIC.cpp @@ -26,7 +26,7 @@ #ifdef __cplusplus_winrt - static inline HRESULT CreateMemoryStream( _COM_Outptr_ IStream** stream ) + static inline HRESULT CreateMemoryStream( _Outptr_ IStream** stream ) { auto randomAccessStream = ref new ::Windows::Storage::Streams::InMemoryRandomAccessStream(); return CreateStreamOverRandomAccessStream( randomAccessStream, __uuidof(IStream), reinterpret_cast( &stream ) ); @@ -38,9 +38,8 @@ #include #include - static inline HRESULT CreateMemoryStream( _COM_Outptr_ IStream** stream ) + static inline HRESULT CreateMemoryStream( _Outptr_ IStream** stream ) { - *stream = nullptr; Microsoft::WRL::ComPtr abiStream; HRESULT hr = Windows::Foundation::ActivateInstance( Microsoft::WRL::Wrappers::HStringReference( RuntimeClass_Windows_Storage_Streams_InMemoryRandomAccessStream ).Get(), @@ -57,7 +56,7 @@ #else - static inline HRESULT CreateMemoryStream( _COM_Outptr_ IStream** stream ) + static inline HRESULT CreateMemoryStream( _Outptr_ IStream** stream ) { return CreateStreamOnHGlobal( 0, TRUE, stream ); }