EXR: support Tiled files, better detection of channel names, update TinyExr #2820
ci.yml
on: pull_request
Baseline cmake check
0s
Documentation Build
0s
Android
0s
Matrix: Linux
Matrix: Mac
Matrix: Windows
Annotations
4 errors
Commit message check
Some commit message summary lines are too long. See CONTRIBUTING.md for more information.
Invalid commits:
Tinyexr: do not include <miniz.h> since Renderdoc includes its own version in impl
|
Commit message check
Process completed with exit code 1.
|
Code formatting check
clang-format issues were found. See CONTRIBUTING.md for more information.
diff --git a/renderdoc/core/image_viewer.cpp b/renderdoc/core/image_viewer.cpp
index 409b1b3..4d5651e 100644
--- a/renderdoc/core/image_viewer.cpp
+++ b/renderdoc/core/image_viewer.cpp
@@ -763,7 +763,7 @@ void ImageViewer::RefreshFile()
int channels[4] = {-1, -1, -1, -1};
for(int i = 0; i < exrImage.num_channels; i++)
{
- const char* dotPos = strrchr(exrHeader.channels[i].name, '.');
+ const char *dotPos = strrchr(exrHeader.channels[i].name, '.');
const char *name = dotPos ? dotPos + 1 : exrHeader.channels[i].name;
switch(name[0])
{
@@ -776,7 +776,7 @@ void ImageViewer::RefreshFile()
float *rgba = (float *)data;
- if (exrImage.images != NULL)
+ if(exrImage.images != NULL)
{
// scanline image
float **src = (float **)exrImage.images;
@@ -805,7 +805,9 @@ void ImageViewer::RefreshFile()
const int thisTileWidth = tile.width;
const int thisTileHeight = tile.height;
float **src = (float **)tile.images;
- float *rgba_tile = rgba + (tile.offset_y * fullTileHeight * exrImage.width + tile.offset_x * fullTileWidth) * 4;
+ float *rgba_tile =
+ rgba +
+ (tile.offset_y * fullTileHeight * exrImage.width + tile.offset_x * fullTileWidth) * 4;
for(int y = 0; y < thisTileHeight; y++)
{
|
Code formatting check
Process completed with exit code 1.
|