diff --git a/d3/d57/PPL_8cpp_source.html b/d3/d57/PPL_8cpp_source.html
index 2ba71d2ac..1e147114c 100644
--- a/d3/d57/PPL_8cpp_source.html
+++ b/d3/d57/PPL_8cpp_source.html
@@ -374,7 +374,7 @@
std::vector< std::byte > convertImageDataToFormat(std::span< const std::byte > imageData, ImageFormat oldFormat, ImageFormat newFormat, uint16_t width, uint16_t height)
Converts an image from one format to another.
-std::vector< std::byte > resizeImageData(std::span< const std::byte > imageData, ImageFormat format, uint16_t width, uint16_t newWidth, uint16_t height, uint16_t newHeight, bool srgb, ResizeFilter filter, ResizeEdge edge=ResizeEdge::CLAMP)
Resize given image data to the new dimensions.
+std::vector< std::byte > resizeImageData(std::span< const std::byte > imageData, ImageFormat format, uint16_t width, uint16_t newWidth, uint16_t height, uint16_t newHeight, bool srgb, ResizeFilter filter, ResizeEdge edge=ResizeEdge::CLAMP)
Resize given image data to the new dimensions.
diff --git a/d4/df2/ImageConversion_8cpp_source.html b/d4/df2/ImageConversion_8cpp_source.html
index 569e342c6..f659d6ec0 100644
--- a/d4/df2/ImageConversion_8cpp_source.html
+++ b/d4/df2/ImageConversion_8cpp_source.html
@@ -1451,106 +1451,109 @@
1324 return {pixel, 0, 0, 0xffff};
-
-
-
-
-
-
- 1332 std::span<RG1616> inPixels{
reinterpret_cast<RG1616*
>(stbImage.get()), outPixels.size()};
-
- 1334#ifdef SOURCEPP_BUILD_WITH_TBB
- 1335 std::execution::par_unseq,
-
-
- 1338 return {pixel.r, pixel.g, 0, 0xffff};
-
-
-
-
-
-
-
-
- 1347 std::span<RGB161616> inPixels{
reinterpret_cast<RGB161616*
>(stbImage.get()), outPixels.size()};
-
- 1349#ifdef SOURCEPP_BUILD_WITH_TBB
- 1350 std::execution::par_unseq,
-
-
- 1353 return {pixel.r, pixel.g, pixel.b, 0xffff};
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ 1333 std::span<RG1616> inPixels{
reinterpret_cast<RG1616*
>(stbImage.get()), outPixels.size()};
+
+ 1335#ifdef SOURCEPP_BUILD_WITH_TBB
+ 1336 std::execution::par_unseq,
+
+
+ 1339 return {pixel.r, pixel.g, 0, 0xffff};
+
+
+
+
+
+
+
+
+
+ 1349 std::span<RGB161616> inPixels{
reinterpret_cast<RGB161616*
>(stbImage.get()), outPixels.size()};
+
+ 1351#ifdef SOURCEPP_BUILD_WITH_TBB
+ 1352 std::execution::par_unseq,
+
+
+ 1355 return {pixel.r, pixel.g, pixel.b, 0xffff};
+
+
+
+
+
+
+
+
+
-
- 1367 const std::unique_ptr<stbi_uc, void(*)(
void*)> stbImage{
- 1368 stbi_load_from_memory(
reinterpret_cast<const stbi_uc*
>(fileData.data()),
static_cast<int>(fileData.size()), &width, &height, &channels, 0),
-
-
-
-
-
-
-
- 1376 case 1: format = ImageFormat::I8;
break;
- 1377 case 2: format = ImageFormat::UV88;
break;
- 1378 case 3: format = ImageFormat::RGB888;
break;
- 1379 case 4: format = ImageFormat::RGBA8888;
break;
-
-
-
-
-
+
+
+
+
+ 1370 const std::unique_ptr<stbi_uc, void(*)(
void*)> stbImage{
+ 1371 stbi_load_from_memory(
reinterpret_cast<const stbi_uc*
>(fileData.data()),
static_cast<int>(fileData.size()), &width, &height, &channels, 0),
+
+
+
+
+
+
+
+ 1379 case 1: format = ImageFormat::I8;
break;
+ 1380 case 2: format = ImageFormat::UV88;
break;
+ 1381 case 3: format = ImageFormat::RGB888;
break;
+ 1382 case 4: format = ImageFormat::RGBA8888;
break;
+
+
-
-
- 1388 case ResizeMethod::NONE:
break;
- 1389 case ResizeMethod::POWER_OF_TWO_BIGGER:
return std::bit_ceil(n);
- 1390 case ResizeMethod::POWER_OF_TWO_SMALLER:
return std::bit_floor(n);
-
-
-
-
-
-
-
-
-
-
-
- 1402 if (imageData.empty() || format == ImageFormat::EMPTY) {
-
-
- 1405 const auto pixelLayout = ::imageFormatToSTBIRPixelLayout(format);
- 1406 if (pixelLayout == -1) {
-
-
-
- 1410 stbir_resize(in.data(), width, height,
ImageFormatDetails::bpp(containerFormat) / 8 * width, intermediary.data(), newWidth, newHeight,
ImageFormatDetails::bpp(containerFormat) / 8 * newWidth,
static_cast<stbir_pixel_layout
>(::imageFormatToSTBIRPixelLayout(containerFormat)),
static_cast<stbir_datatype
>(::imageFormatToSTBIRDataType(containerFormat, srgb)), STBIR_EDGE_CLAMP,
static_cast<stbir_filter
>(filter));
-
-
-
- 1414 stbir_resize(imageData.data(), width, height,
ImageFormatDetails::bpp(format) / 8 * width, out.data(), newWidth, newHeight,
ImageFormatDetails::bpp(format) / 8 * newWidth,
static_cast<stbir_pixel_layout
>(pixelLayout),
static_cast<stbir_datatype
>(::imageFormatToSTBIRDataType(format, srgb)),
static_cast<stbir_edge
>(edge),
static_cast<stbir_filter
>(filter));
-
-
-
- 1418std::vector<std::byte>
ImageConversion::resizeImageDataStrict(std::span<const std::byte> imageData,
ImageFormat format, uint16_t width, uint16_t newWidth, uint16_t& widthOut,
ResizeMethod widthResize, uint16_t height, uint16_t newHeight, uint16_t& heightOut,
ResizeMethod heightResize,
bool srgb,
ResizeFilter filter,
ResizeEdge edge) {
- 1419 if (imageData.empty() || format == ImageFormat::EMPTY) {
-
-
-
-
- 1424 return resizeImageData(imageData, format, width, widthOut, height, heightOut, srgb, filter, edge);
-
+
+
+
+
+
+ 1391 case ResizeMethod::NONE:
break;
+ 1392 case ResizeMethod::POWER_OF_TWO_BIGGER:
return std::bit_ceil(n);
+ 1393 case ResizeMethod::POWER_OF_TWO_SMALLER:
return std::bit_floor(n);
+
+
+
+
+
+
+
+
+
+
+
+ 1405 if (imageData.empty() || format == ImageFormat::EMPTY) {
+
+
+ 1408 const auto pixelLayout = ::imageFormatToSTBIRPixelLayout(format);
+ 1409 if (pixelLayout == -1) {
+
+
+
+ 1413 stbir_resize(in.data(), width, height,
ImageFormatDetails::bpp(containerFormat) / 8 * width, intermediary.data(), newWidth, newHeight,
ImageFormatDetails::bpp(containerFormat) / 8 * newWidth,
static_cast<stbir_pixel_layout
>(::imageFormatToSTBIRPixelLayout(containerFormat)),
static_cast<stbir_datatype
>(::imageFormatToSTBIRDataType(containerFormat, srgb)), STBIR_EDGE_CLAMP,
static_cast<stbir_filter
>(filter));
+
+
+
+ 1417 stbir_resize(imageData.data(), width, height,
ImageFormatDetails::bpp(format) / 8 * width, out.data(), newWidth, newHeight,
ImageFormatDetails::bpp(format) / 8 * newWidth,
static_cast<stbir_pixel_layout
>(pixelLayout),
static_cast<stbir_datatype
>(::imageFormatToSTBIRDataType(format, srgb)),
static_cast<stbir_edge
>(edge),
static_cast<stbir_filter
>(filter));
+
+
+
+ 1421std::vector<std::byte>
ImageConversion::resizeImageDataStrict(std::span<const std::byte> imageData,
ImageFormat format, uint16_t width, uint16_t newWidth, uint16_t& widthOut,
ResizeMethod widthResize, uint16_t height, uint16_t newHeight, uint16_t& heightOut,
ResizeMethod heightResize,
bool srgb,
ResizeFilter filter,
ResizeEdge edge) {
+ 1422 if (imageData.empty() || format == ImageFormat::EMPTY) {
+
+
+
+
+ 1427 return resizeImageData(imageData, format, width, widthOut, height, heightOut, srgb, filter, edge);
+
#define VTFPP_REMAP_TO_8(value, shift)
#define VTFPP_REMAP_FROM_8(value, shift)
#define VTFPP_CASE_CONVERT_AND_BREAK(InputType, r, g, b, a)
@@ -1564,8 +1567,8 @@
std::vector< std::byte > convertFileToImageData(std::span< const std::byte > fileData, ImageFormat &format, int &width, int &height, int &frameCount)
std::vector< std::byte > convertImageDataToFile(std::span< const std::byte > imageData, ImageFormat format, uint16_t width, uint16_t height, FileFormat fileFormat=FileFormat::DEFAULT)
Converts image data to a PNG or EXR file. EXR format will be used for floating-point image formats.
-void setResizedDims(uint16_t &width, ResizeMethod widthResize, uint16_t &height, ResizeMethod heightResize)
Set the new image dimensions given a resize method.
-uint16_t getResizedDim(uint16_t n, ResizeMethod method)
Get the new image size given a resize method.
+void setResizedDims(uint16_t &width, ResizeMethod widthResize, uint16_t &height, ResizeMethod heightResize)
Set the new image dimensions given a resize method.
+uint16_t getResizedDim(uint16_t n, ResizeMethod method)
Get the new image size given a resize method.
FileFormat getDefaultFileFormatForImageFormat(ImageFormat format)
PNG for integer formats, EXR for floating point formats.
@@ -1575,9 +1578,9 @@
-std::vector< std::byte > resizeImageDataStrict(std::span< const std::byte > imageData, ImageFormat format, uint16_t width, uint16_t newWidth, uint16_t &widthOut, ResizeMethod widthResize, uint16_t height, uint16_t newHeight, uint16_t &heightOut, ResizeMethod heightResize, bool srgb, ResizeFilter filter, ResizeEdge edge=ResizeEdge::CLAMP)
Resize given image data to the new dimensions, where the new width and height are governed by the res...
+std::vector< std::byte > resizeImageDataStrict(std::span< const std::byte > imageData, ImageFormat format, uint16_t width, uint16_t newWidth, uint16_t &widthOut, ResizeMethod widthResize, uint16_t height, uint16_t newHeight, uint16_t &heightOut, ResizeMethod heightResize, bool srgb, ResizeFilter filter, ResizeEdge edge=ResizeEdge::CLAMP)
Resize given image data to the new dimensions, where the new width and height are governed by the res...
std::vector< std::byte > convertImageDataToFormat(std::span< const std::byte > imageData, ImageFormat oldFormat, ImageFormat newFormat, uint16_t width, uint16_t height)
Converts an image from one format to another.
-std::vector< std::byte > resizeImageData(std::span< const std::byte > imageData, ImageFormat format, uint16_t width, uint16_t newWidth, uint16_t height, uint16_t newHeight, bool srgb, ResizeFilter filter, ResizeEdge edge=ResizeEdge::CLAMP)
Resize given image data to the new dimensions.
+std::vector< std::byte > resizeImageData(std::span< const std::byte > imageData, ImageFormat format, uint16_t width, uint16_t newWidth, uint16_t height, uint16_t newHeight, bool srgb, ResizeFilter filter, ResizeEdge edge=ResizeEdge::CLAMP)
Resize given image data to the new dimensions.
constexpr uint32_t getMipDim(uint8_t mip, uint16_t dim)
diff --git a/d5/d61/namespacevtfpp_1_1ImageConversion.html b/d5/d61/namespacevtfpp_1_1ImageConversion.html
index 8185eb75b..10b4c3736 100644
--- a/d5/d61/namespacevtfpp_1_1ImageConversion.html
+++ b/d5/d61/namespacevtfpp_1_1ImageConversion.html
@@ -680,7 +680,7 @@ Definition at line 1386 of file ImageConversion.cpp.
+Definition at line 1389 of file ImageConversion.cpp.
@@ -754,7 +754,7 @@ Definition at line 1401 of file ImageConversion.cpp.
+Definition at line 1404 of file ImageConversion.cpp.
@@ -852,7 +852,7 @@ Definition at line 1418 of file ImageConversion.cpp.
+Definition at line 1421 of file ImageConversion.cpp.
@@ -896,7 +896,7 @@ Definition at line 1396 of file ImageConversion.cpp.
+Definition at line 1399 of file ImageConversion.cpp.
diff --git a/da/d01/ImageConversion_8h_source.html b/da/d01/ImageConversion_8h_source.html
index b32cd42e7..227d9660a 100644
--- a/da/d01/ImageConversion_8h_source.html
+++ b/da/d01/ImageConversion_8h_source.html
@@ -543,8 +543,8 @@
typename member_type< T >::type member_type_t
std::vector< std::byte > convertFileToImageData(std::span< const std::byte > fileData, ImageFormat &format, int &width, int &height, int &frameCount)
std::vector< std::byte > convertImageDataToFile(std::span< const std::byte > imageData, ImageFormat format, uint16_t width, uint16_t height, FileFormat fileFormat=FileFormat::DEFAULT)
Converts image data to a PNG or EXR file. EXR format will be used for floating-point image formats.
-void setResizedDims(uint16_t &width, ResizeMethod widthResize, uint16_t &height, ResizeMethod heightResize)
Set the new image dimensions given a resize method.
-uint16_t getResizedDim(uint16_t n, ResizeMethod method)
Get the new image size given a resize method.
+void setResizedDims(uint16_t &width, ResizeMethod widthResize, uint16_t &height, ResizeMethod heightResize)
Set the new image dimensions given a resize method.
+uint16_t getResizedDim(uint16_t n, ResizeMethod method)
Get the new image size given a resize method.
@@ -572,10 +572,10 @@
-std::vector< std::byte > resizeImageDataStrict(std::span< const std::byte > imageData, ImageFormat format, uint16_t width, uint16_t newWidth, uint16_t &widthOut, ResizeMethod widthResize, uint16_t height, uint16_t newHeight, uint16_t &heightOut, ResizeMethod heightResize, bool srgb, ResizeFilter filter, ResizeEdge edge=ResizeEdge::CLAMP)
Resize given image data to the new dimensions, where the new width and height are governed by the res...
+std::vector< std::byte > resizeImageDataStrict(std::span< const std::byte > imageData, ImageFormat format, uint16_t width, uint16_t newWidth, uint16_t &widthOut, ResizeMethod widthResize, uint16_t height, uint16_t newHeight, uint16_t &heightOut, ResizeMethod heightResize, bool srgb, ResizeFilter filter, ResizeEdge edge=ResizeEdge::CLAMP)
Resize given image data to the new dimensions, where the new width and height are governed by the res...
std::vector< std::byte > convertImageDataToFormat(std::span< const std::byte > imageData, ImageFormat oldFormat, ImageFormat newFormat, uint16_t width, uint16_t height)
Converts an image from one format to another.
bool applyChannelToImageData(std::span< std::byte > imageData, std::span< const std::byte > channelData, auto P::*channel)
Applies a single channel to the given image data.
-std::vector< std::byte > resizeImageData(std::span< const std::byte > imageData, ImageFormat format, uint16_t width, uint16_t newWidth, uint16_t height, uint16_t newHeight, bool srgb, ResizeFilter filter, ResizeEdge edge=ResizeEdge::CLAMP)
Resize given image data to the new dimensions.
+std::vector< std::byte > resizeImageData(std::span< const std::byte > imageData, ImageFormat format, uint16_t width, uint16_t newWidth, uint16_t height, uint16_t newHeight, bool srgb, ResizeFilter filter, ResizeEdge edge=ResizeEdge::CLAMP)
Resize given image data to the new dimensions.
diff --git a/dd/d09/VTF_8cpp_source.html b/dd/d09/VTF_8cpp_source.html
index 28bbf54bc..845e82e87 100644
--- a/dd/d09/VTF_8cpp_source.html
+++ b/dd/d09/VTF_8cpp_source.html
@@ -1575,13 +1575,13 @@
std::vector< std::byte > convertFileToImageData(std::span< const std::byte > fileData, ImageFormat &format, int &width, int &height, int &frameCount)
std::vector< std::byte > convertImageDataToFile(std::span< const std::byte > imageData, ImageFormat format, uint16_t width, uint16_t height, FileFormat fileFormat=FileFormat::DEFAULT)
Converts image data to a PNG or EXR file. EXR format will be used for floating-point image formats.
-void setResizedDims(uint16_t &width, ResizeMethod widthResize, uint16_t &height, ResizeMethod heightResize)
Set the new image dimensions given a resize method.
+void setResizedDims(uint16_t &width, ResizeMethod widthResize, uint16_t &height, ResizeMethod heightResize)
Set the new image dimensions given a resize method.
std::vector< std::byte > convertSeveralImageDataToFormat(std::span< const std::byte > imageData, ImageFormat oldFormat, ImageFormat newFormat, uint8_t mipCount, uint16_t frameCount, uint16_t faceCount, uint16_t width, uint16_t height, uint16_t sliceCount)
Converts several images from one format to another.
std::vector< std::byte > convertImageDataToFormat(std::span< const std::byte > imageData, ImageFormat oldFormat, ImageFormat newFormat, uint16_t width, uint16_t height)
Converts an image from one format to another.
-std::vector< std::byte > resizeImageData(std::span< const std::byte > imageData, ImageFormat format, uint16_t width, uint16_t newWidth, uint16_t height, uint16_t newHeight, bool srgb, ResizeFilter filter, ResizeEdge edge=ResizeEdge::CLAMP)
Resize given image data to the new dimensions.
+std::vector< std::byte > resizeImageData(std::span< const std::byte > imageData, ImageFormat format, uint16_t width, uint16_t newWidth, uint16_t height, uint16_t newHeight, bool srgb, ResizeFilter filter, ResizeEdge edge=ResizeEdge::CLAMP)
Resize given image data to the new dimensions.
constexpr uint32_t getMipDim(uint8_t mip, uint16_t dim)
constexpr uint8_t getRecommendedMipCountForDims(ImageFormat format, uint16_t width, uint16_t height)