Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-16 15:00:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed -Wmissing-prototypes

Browse Source
This commit is contained in:
Chuck Walbourn 2019-05-29 15:52:15 -07:00
parent 5f125c6b8d
commit 5efd9bde8b
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DirectXTex/DirectXTexCompress.cpp
View File

@ -493,6 +493,9 @@ namespace
//------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
namespace DirectX namespace DirectX
{ {
bool _IsAlphaAllOpaqueBC(_In_ const Image& cImage);
// Also used by Image
bool _IsAlphaAllOpaqueBC(_In_ const Image& cImage) bool _IsAlphaAllOpaqueBC(_In_ const Image& cImage)
{ {
if (!cImage.pixels) if (!cImage.pixels)

23
DirectXTex/DirectXTexMipmaps.cpp
View File

@ -348,6 +348,14 @@ namespace
namespace DirectX namespace DirectX
{ {
bool _CalculateMipLevels(_In_ size_t width, _In_ size_t height, _Inout_ size_t& mipLevels);
bool _CalculateMipLevels3D(_In_ size_t width, _In_ size_t height, _In_ size_t depth, _Inout_ size_t& mipLevels);
// Also used by Compress
HRESULT _ResizeSeparateColorAndAlpha(_In_ IWICImagingFactory* pWIC, _In_ bool iswic2, _In_ IWICBitmap* original,
_In_ size_t newWidth, _In_ size_t newHeight, _In_ DWORD filter, _Inout_ const Image* img);
// Also used by Resize
bool _CalculateMipLevels(_In_ size_t width, _In_ size_t height, _Inout_ size_t& mipLevels) bool _CalculateMipLevels(_In_ size_t width, _In_ size_t height, _Inout_ size_t& mipLevels)
{ {
if (mipLevels > 1) if (mipLevels > 1)
@ -387,14 +395,15 @@ namespace DirectX
} }
//--- Resizing color and alpha channels separately using WIC --- //--- Resizing color and alpha channels separately using WIC ---
_Use_decl_annotations_
HRESULT _ResizeSeparateColorAndAlpha( HRESULT _ResizeSeparateColorAndAlpha(
_In_ IWICImagingFactory* pWIC, IWICImagingFactory* pWIC,
_In_ bool iswic2, bool iswic2,
_In_ IWICBitmap* original, IWICBitmap* original,
_In_ size_t newWidth, size_t newWidth,
_In_ size_t newHeight, size_t newHeight,
_In_ DWORD filter, DWORD filter,
_Inout_ const Image* img) const Image* img)
{ {
if (!pWIC || !original || !img) if (!pWIC || !original || !img)
return E_POINTER; return E_POINTER;

1
DirectXTex/DirectXTexP.h
View File

@ -60,7 +60,6 @@
#pragma clang diagnostic ignored "-Wglobal-constructors" #pragma clang diagnostic ignored "-Wglobal-constructors"
#pragma clang diagnostic ignored "-Wgnu-anonymous-struct" #pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
#pragma clang diagnostic ignored "-Wlanguage-extension-token" #pragma clang diagnostic ignored "-Wlanguage-extension-token"
#pragma clang diagnostic ignored "-Wmissing-prototypes"
#pragma clang diagnostic ignored "-Wmissing-variable-declarations" #pragma clang diagnostic ignored "-Wmissing-variable-declarations"
#pragma clang diagnostic ignored "-Wnested-anon-types" #pragma clang diagnostic ignored "-Wnested-anon-types"
#pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wreserved-id-macro"