AuroraMiddleware/DirectXTex
1
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex synced 2024-11-24 13:20:13 +00:00
Code Issues Releases Wiki Activity

Code review for standard library header usage (#207)

Browse Source
This commit is contained in:
Chuck Walbourn 2020-12-29 18:04:51 -08:00 committed by GitHub
parent e53571de0b
commit e14c36125c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 48 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DDSView/ddsview.cpp
View File

@ -9,16 +9,16 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define NOMINMAX #define NOMINMAX
#include <windows.h> #include <Windows.h>
#include <assert.h>
#include <stdio.h>
#include <dxgiformat.h>
#include <d3d11.h>
#include <algorithm> #include <algorithm>
#include <cassert>
#include <cstdio>
#include <directxmath.h> #include <dxgiformat.h>
#include <d3d11_1.h>
#include <DirectXMath.h>
#pragma warning(disable : 4619 4616 26812) #pragma warning(disable : 4619 4616 26812)

7
DirectXTex/DirectXTex.h
View File

@ -11,9 +11,10 @@
#pragma once #pragma once
#include <algorithm> #include <cstddef>
#include <cstdint> #include <cstdint>
#include <functional> #include <functional>
#include <utility>
#include <vector> #include <vector>
#if !defined(__d3d11_h__) && !defined(__d3d11_x_h__) && !defined(__d3d12_h__) && !defined(__d3d12_x_h__) && !defined(__XBOX_D3D12_X__) #if !defined(__d3d11_h__) && !defined(__d3d11_x_h__) && !defined(__d3d12_h__) && !defined(__d3d12_x_h__) && !defined(__XBOX_D3D12_X__)
@ -32,11 +33,11 @@
#include <OCIdl.h> #include <OCIdl.h>
#define DIRECTX_TEX_VERSION 191
struct IWICImagingFactory; struct IWICImagingFactory;
struct IWICMetadataQueryReader; struct IWICMetadataQueryReader;
#define DIRECTX_TEX_VERSION 191
namespace DirectX namespace DirectX
{ {

40
DirectXTex/DirectXTexP.h
View File

@ -1,6 +1,6 @@
//------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
// DirectXTexp.h // DirectXTexP.h
// //
// DirectX Texture Library - Private header // DirectX Texture Library - Private header
// //
// Copyright (c) Microsoft Corporation. All rights reserved. // Copyright (c) Microsoft Corporation. All rights reserved.
@ -85,12 +85,12 @@
#define NOHELP #define NOHELP
#pragma warning(pop) #pragma warning(pop)
#include <Windows.h>
#ifndef _WIN32_WINNT_WIN10 #ifndef _WIN32_WINNT_WIN10
#define _WIN32_WINNT_WIN10 0x0A00 #define _WIN32_WINNT_WIN10 0x0A00
#endif #endif
#include <Windows.h>
#ifdef _GAMING_XBOX_SCARLETT #ifdef _GAMING_XBOX_SCARLETT
#include <d3d12_xs.h> #include <d3d12_xs.h>
#elif defined(_GAMING_XBOX) #elif defined(_GAMING_XBOX)
@ -107,25 +107,21 @@
#define _XM_NO_XMVECTOR_OVERLOADS_ #define _XM_NO_XMVECTOR_OVERLOADS_
#include <DirectXMath.h>
#include <DirectXPackedVector.h>
#include <assert.h>
#include <malloc.h>
#include <memory>
#include <vector>
#include <time.h>
#include <stdlib.h>
#include <search.h>
#include <Ole2.h>
#include "DirectXTex.h" #include "DirectXTex.h"
#include <wincodec.h> #include <algorithm>
#include <cassert>
#include <cstdlib>
#include <ctime>
#include <cstring>
#include <memory>
#include <DirectXPackedVector.h>
#include <malloc.h>
#include <Ole2.h>
#include <wincodec.h>
#include <wrl\client.h> #include <wrl\client.h>
#include "scoped.h" #include "scoped.h"
@ -262,7 +258,7 @@ namespace DirectX
CONVF_FLOAT = 0x1, CONVF_FLOAT = 0x1,
CONVF_UNORM = 0x2, CONVF_UNORM = 0x2,
CONVF_UINT = 0x4, CONVF_UINT = 0x4,
CONVF_SNORM = 0x8, CONVF_SNORM = 0x8,
CONVF_SINT = 0x10, CONVF_SINT = 0x10,
CONVF_DEPTH = 0x20, CONVF_DEPTH = 0x20,
CONVF_STENCIL = 0x40, CONVF_STENCIL = 0x40,
@ -296,7 +292,7 @@ namespace DirectX
void* pDestination, _In_ size_t outSize, void* pDestination, _In_ size_t outSize,
_In_reads_bytes_(inSize) const void* pSource, _In_ size_t inSize, _In_reads_bytes_(inSize) const void* pSource, _In_ size_t inSize,
_In_ DXGI_FORMAT format, _In_ uint32_t tflags) noexcept; _In_ DXGI_FORMAT format, _In_ uint32_t tflags) noexcept;
_Success_(return != false) bool __cdecl _ExpandScanline( _Success_(return != false) bool __cdecl _ExpandScanline(
_Out_writes_bytes_(outSize) void* pDestination, _In_ size_t outSize, _Out_writes_bytes_(outSize) void* pDestination, _In_ size_t outSize,
_In_ DXGI_FORMAT outFormat, _In_ DXGI_FORMAT outFormat,

2
Texassemble/AnimatedGif.cpp
View File

@ -24,7 +24,9 @@
#define NOHELP #define NOHELP
#pragma warning(pop) #pragma warning(pop)
#include <cstddef>
#include <memory> #include <memory>
#include <utility>
#include <vector> #include <vector>
#include <wrl/client.h> #include <wrl/client.h>

9
Texassemble/texassemble.cpp
View File

@ -20,13 +20,14 @@
#define NOHELP #define NOHELP
#pragma warning(pop) #pragma warning(pop)
#include <stdio.h> #include <cassert>
#include <stdlib.h> #include <cstddef>
#include <assert.h> #include <cstdio>
#include <cstdlib>
#include <fstream> #include <fstream>
#include <memory> #include <memory>
#include <list> #include <list>
#include <utility>
#include <vector> #include <vector>
#include <wrl/client.h> #include <wrl/client.h>

1
Texconv/ExtendedBMP.cpp
View File

@ -24,6 +24,7 @@
#include <Windows.h> #include <Windows.h>
#include <cstddef>
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>

1
Texconv/PortablePixMap.cpp
View File

@ -21,6 +21,7 @@
#include <Windows.h> #include <Windows.h>
#include <cstddef>
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>

9
Texconv/texconv.cpp
View File

@ -19,10 +19,11 @@
#define NOHELP #define NOHELP
#pragma warning(pop) #pragma warning(pop)
#include <stdio.h> #include <algorithm>
#include <stdlib.h> #include <cassert>
#include <assert.h> #include <cstddef>
#include <cstdio>
#include <cstdlib>
#include <fstream> #include <fstream>
#include <memory> #include <memory>
#include <list> #include <list>

9
Texdiag/texdiag.cpp
View File

@ -20,10 +20,11 @@
#define NOHELP #define NOHELP
#pragma warning(pop) #pragma warning(pop)
#include <stdio.h> #include <algorithm>
#include <stdlib.h> #include <cassert>
#include <assert.h> #include <cstddef>
#include <cstdio>
#include <cstdlib>
#include <fstream> #include <fstream>
#include <memory> #include <memory>
#include <list> #include <list>