From 5efd9bde8b6656df8449962121425ba528309fad Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 29 May 2019 15:52:15 -0700 Subject: [PATCH] Fixed -Wmissing-prototypes --- DirectXTex/DirectXTexCompress.cpp | 3 +++ DirectXTex/DirectXTexMipmaps.cpp | 23 ++++++++++++++++------- DirectXTex/DirectXTexP.h | 1 - 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/DirectXTex/DirectXTexCompress.cpp b/DirectXTex/DirectXTexCompress.cpp index c368364..e306c87 100644 --- a/DirectXTex/DirectXTexCompress.cpp +++ b/DirectXTex/DirectXTexCompress.cpp @@ -493,6 +493,9 @@ namespace //------------------------------------------------------------------------------------- namespace DirectX { + bool _IsAlphaAllOpaqueBC(_In_ const Image& cImage); + // Also used by Image + bool _IsAlphaAllOpaqueBC(_In_ const Image& cImage) { if (!cImage.pixels) diff --git a/DirectXTex/DirectXTexMipmaps.cpp b/DirectXTex/DirectXTexMipmaps.cpp index 245fe33..26f698b 100644 --- a/DirectXTex/DirectXTexMipmaps.cpp +++ b/DirectXTex/DirectXTexMipmaps.cpp @@ -348,6 +348,14 @@ namespace 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) { if (mipLevels > 1) @@ -387,14 +395,15 @@ namespace DirectX } //--- Resizing color and alpha channels separately using WIC --- + _Use_decl_annotations_ 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) + IWICImagingFactory* pWIC, + bool iswic2, + IWICBitmap* original, + size_t newWidth, + size_t newHeight, + DWORD filter, + const Image* img) { if (!pWIC || !original || !img) return E_POINTER; diff --git a/DirectXTex/DirectXTexP.h b/DirectXTex/DirectXTexP.h index e2ab57a..732e19b 100644 --- a/DirectXTex/DirectXTexP.h +++ b/DirectXTex/DirectXTexP.h @@ -60,7 +60,6 @@ #pragma clang diagnostic ignored "-Wglobal-constructors" #pragma clang diagnostic ignored "-Wgnu-anonymous-struct" #pragma clang diagnostic ignored "-Wlanguage-extension-token" -#pragma clang diagnostic ignored "-Wmissing-prototypes" #pragma clang diagnostic ignored "-Wmissing-variable-declarations" #pragma clang diagnostic ignored "-Wnested-anon-types" #pragma clang diagnostic ignored "-Wreserved-id-macro"