From 8c86e0e4249e32a461f65d0ac8b43084b5d1fa49 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Sun, 31 Dec 2023 17:55:16 -0800 Subject: [PATCH] December 31, 2023 (#431) --- .nuget/directxtex_desktop_2019.nuspec | 2 +- .nuget/directxtex_desktop_win10.nuspec | 2 +- .nuget/directxtex_uwp.nuspec | 2 +- CMakeLists.txt | 2 +- DirectXTex/DirectXTex.h | 2 +- HISTORY.md | 7 +++++++ README.md | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.nuget/directxtex_desktop_2019.nuspec b/.nuget/directxtex_desktop_2019.nuspec index d93eeeca..d2b7c922 100644 --- a/.nuget/directxtex_desktop_2019.nuspec +++ b/.nuget/directxtex_desktop_2019.nuspec @@ -10,7 +10,7 @@ This version is for Windows desktop applications using Visual Studio 2019 (16.11) or Visual Studio 2022 and supports Windows 7 / DirectX 11. DirectXTex, a shared source library for reading and writing .DDS files, and performing various texture content processing operations including resizing, format conversion, mip-map generation, block compression for Direct3D runtime texture resources, and height-map to normal-map conversion. This library makes use of the Windows Image Component (WIC) APIs. It also includes simple .TGA and .HDR readers and writers since these image file format are commonly used for texture content processing pipelines, but are not currently supported by a built-in WIC codec. - Matches the October 28, 2023 release on GitHub. + Matches the December 31, 2023 release on GitHub. http://go.microsoft.com/fwlink/?LinkId=248926 images\icon.jpg diff --git a/.nuget/directxtex_desktop_win10.nuspec b/.nuget/directxtex_desktop_win10.nuspec index 5959b4a3..ad975d12 100644 --- a/.nuget/directxtex_desktop_win10.nuspec +++ b/.nuget/directxtex_desktop_win10.nuspec @@ -10,7 +10,7 @@ This version is for Windows desktop applications using Visual Studio 2019 (16.11) or Visual Studio 2022 and supports Windows 10 / Windows 11 including both DirectX 11 and DirectX 12. DirectXTex, a shared source library for reading and writing .DDS files, and performing various texture content processing operations including resizing, format conversion, mip-map generation, block compression for Direct3D runtime texture resources, and height-map to normal-map conversion. This library makes use of the Windows Image Component (WIC) APIs. It also includes simple .TGA and .HDR readers and writers since these image file format are commonly used for texture content processing pipelines, but are not currently supported by a built-in WIC codec. - Matches the October 28, 2023 release on GitHub. + Matches the December 31, 2023 release on GitHub. http://go.microsoft.com/fwlink/?LinkId=248926 images\icon.jpg diff --git a/.nuget/directxtex_uwp.nuspec b/.nuget/directxtex_uwp.nuspec index 3608510d..b8840ea9 100644 --- a/.nuget/directxtex_uwp.nuspec +++ b/.nuget/directxtex_uwp.nuspec @@ -10,7 +10,7 @@ This version is for Universal Windows Platform apps on Windows 10 / Windows 11 using Visual Studio 2019 (16.11) or Visual Studio 2022. DirectXTex, a shared source library for reading and writing .DDS files, and performing various texture content processing operations including resizing, format conversion, mip-map generation, block compression for Direct3D runtime texture resources, and height-map to normal-map conversion. This library makes use of the Windows Image Component (WIC) APIs. It also includes simple .TGA and .HDR readers and writers since these image file format are commonly used for texture content processing pipelines, but are not currently supported by a built-in WIC codec. - Matches the October 28, 2023 release on GitHub. + Matches the December 31, 2023 release on GitHub. http://go.microsoft.com/fwlink/?LinkId=248926 images\icon.jpg diff --git a/CMakeLists.txt b/CMakeLists.txt index 57a97e26..23912633 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 3.20) -set(DIRECTXTEX_VERSION 2.0.1) +set(DIRECTXTEX_VERSION 2.0.2) if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET)) set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY") diff --git a/DirectXTex/DirectXTex.h b/DirectXTex/DirectXTex.h index b2d75f89..7f211014 100644 --- a/DirectXTex/DirectXTex.h +++ b/DirectXTex/DirectXTex.h @@ -47,7 +47,7 @@ struct IWICImagingFactory; struct IWICMetadataQueryReader; #endif -#define DIRECTX_TEX_VERSION 201 +#define DIRECTX_TEX_VERSION 202 namespace DirectX diff --git a/HISTORY.md b/HISTORY.md index 6c603416..c1318857 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -6,6 +6,13 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT ## Release History +### December 31, 2023 +* TGA reader bug fix for offset boundary check +* PPM/PFM reader bug fixes for bounds checking +* Xbox-specific functionality added to Auxiliary folder +* CMake project updates including pkg-config file generation +* Code review + ### October 28, 2023 * New ``DDS_PERMISSIVE_FLAG`` to allow reading of various DDS DX9 file variants * *breaking change* required to accept reading *Unreal Tournament 2004* DDS files diff --git a/README.md b/README.md index 54561088..10233654 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ http://go.microsoft.com/fwlink/?LinkId=248926 Copyright (c) Microsoft Corporation. -**October 28, 2023** +**December 31, 2023** This package contains DirectXTex, a shared source library for reading and writing ``.DDS`` files, and performing various texture content processing operations including resizing, format conversion, mip-map generation, block compression for Direct3D runtime texture resources, and height-map to normal-map conversion. This library makes use of the Windows Image Component (WIC) APIs. It also includes ``.TGA`` and ``.HDR`` readers and writers since these image file formats are commonly used for texture content processing pipelines, but are not currently supported by a built-in WIC codec.