From bfa53ff6c0c79730d8e79246319fedf790004890 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 19 Sep 2016 11:33:43 -0700 Subject: [PATCH] Rename Evaluate and Transform --- DirectXTex/DirectXTex.h | 18 +++++++++--------- DirectXTex/DirectXTexMisc.cpp | 20 ++++++++++---------- Texconv/texconv.cpp | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/DirectXTex/DirectXTex.h b/DirectXTex/DirectXTex.h index aa7a175..90d26c2 100644 --- a/DirectXTex/DirectXTex.h +++ b/DirectXTex/DirectXTex.h @@ -616,17 +616,17 @@ namespace DirectX HRESULT __cdecl ComputeMSE( _In_ const Image& image1, _In_ const Image& image2, _Out_ float& mse, _Out_writes_opt_(4) float* mseV, _In_ DWORD flags = 0 ); - HRESULT __cdecl Evaluate( _In_ const Image& image, - _In_ std::function pixelFunc ); + HRESULT __cdecl EvaluateImage( _In_ const Image& image, + _In_ std::function pixelFunc ); - HRESULT __cdecl Transform( _In_ const Image& image, - _In_ std::function pixelFunc, + ScratchImage& result ); + HRESULT __cdecl TransformImage( _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata, + _In_ std::function pixelFunc, - ScratchImage& result ); - HRESULT __cdecl Transform(_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata, - _In_ std::function pixelFunc, - ScratchImage& result ); + ScratchImage& result ); //--------------------------------------------------------------------------------- // WIC utility code diff --git a/DirectXTex/DirectXTexMisc.cpp b/DirectXTex/DirectXTexMisc.cpp index 84c3457..0f92c1d 100644 --- a/DirectXTex/DirectXTexMisc.cpp +++ b/DirectXTex/DirectXTexMisc.cpp @@ -168,7 +168,7 @@ namespace } //------------------------------------------------------------------------------------- - HRESULT Evaluate_( + HRESULT EvaluateImage_( const Image& image, std::function pixelFunc) { @@ -204,7 +204,7 @@ namespace //------------------------------------------------------------------------------------- - HRESULT Transform_( + HRESULT TransformImage_( const Image& srcImage, std::function pixelFunc, const Image& destImage) @@ -464,7 +464,7 @@ HRESULT DirectX::ComputeMSE( // Evaluates a user-supplied function for all the pixels in the image //------------------------------------------------------------------------------------- _Use_decl_annotations_ -HRESULT DirectX::Evaluate( +HRESULT DirectX::EvaluateImage( const Image& image, std::function pixelFunc) { @@ -489,11 +489,11 @@ HRESULT DirectX::Evaluate( if (!img) return E_POINTER; - return Evaluate_(*img, pixelFunc); + return EvaluateImage_(*img, pixelFunc); } else { - return Evaluate_(image, pixelFunc); + return EvaluateImage_(image, pixelFunc); } } @@ -502,7 +502,7 @@ HRESULT DirectX::Evaluate( // Use a user-supplied function to compute a new image from an input image //------------------------------------------------------------------------------------- _Use_decl_annotations_ -HRESULT DirectX::Transform( +HRESULT DirectX::TransformImage( const Image& image, std::function pixelFunc, ScratchImage& result) @@ -525,7 +525,7 @@ HRESULT DirectX::Transform( return E_POINTER; } - hr = Transform_(image, pixelFunc, *dimg); + hr = TransformImage_(image, pixelFunc, *dimg); if (FAILED(hr)) { result.Release(); @@ -536,7 +536,7 @@ HRESULT DirectX::Transform( } _Use_decl_annotations_ -HRESULT DirectX::Transform( +HRESULT DirectX::TransformImage( const Image* srcImages, size_t nimages, const TexMetadata& metadata, std::function pixelFunc, @@ -599,7 +599,7 @@ HRESULT DirectX::Transform( return E_FAIL; } - hr = Transform_(src, pixelFunc, dst); + hr = TransformImage_(src, pixelFunc, dst); if (FAILED(hr)) { result.Release(); @@ -643,7 +643,7 @@ HRESULT DirectX::Transform( return E_FAIL; } - hr = Transform_(src, pixelFunc, dst); + hr = TransformImage_(src, pixelFunc, dst); if (FAILED(hr)) { result.Release(); diff --git a/Texconv/texconv.cpp b/Texconv/texconv.cpp index deb122a..77764da 100644 --- a/Texconv/texconv.cpp +++ b/Texconv/texconv.cpp @@ -1744,7 +1744,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[]) XMVECTOR colorKeyValue = XMLoadColor(reinterpret_cast(&colorKey)); - hr = Transform(image->GetImages(), image->GetImageCount(), image->GetMetadata(), + hr = TransformImage(image->GetImages(), image->GetImageCount(), image->GetMetadata(), [&](XMVECTOR* outPixels, const XMVECTOR* inPixels, size_t width, size_t y) { static const XMVECTORF32 s_tolerance = { 0.2f, 0.2f, 0.2f, 0.f };