Skip to content

Commit 3154ea1

Browse files
committed
Rand clang-format
1 parent df3eb17 commit 3154ea1

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

include/vsg/utils/ColorSpace.h

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ namespace vsg
2525
linearRGB
2626
};
2727

28-
2928
template<typename T>
3029
constexpr T linear_to_sRGB_component(T c)
3130
{
@@ -91,15 +90,19 @@ namespace vsg
9190
template<typename T>
9291
void convert(T& data, ColorSpace source, ColorSpace target)
9392
{
94-
if (source==sRGB && target==linearRGB) data = sRGB_to_linear(data);
95-
else if (source==linearRGB && target==sRGB) data = linear_to_sRGB(data);
93+
if (source == sRGB && target == linearRGB)
94+
data = sRGB_to_linear(data);
95+
else if (source == linearRGB && target == sRGB)
96+
data = linear_to_sRGB(data);
9697
}
9798

9899
template<typename T>
99100
void convert(size_t num, T* data, ColorSpace source, ColorSpace target)
100101
{
101-
if (source==sRGB && target==linearRGB) for(size_t i=0; i<num; ++i) data[i] = sRGB_to_linear(data[i]);
102-
else if (source==linearRGB && target==sRGB) for(size_t i=0; i<num; ++i) data[i] = linear_to_sRGB(data[i]);
102+
if (source == sRGB && target == linearRGB)
103+
for (size_t i = 0; i < num; ++i) data[i] = sRGB_to_linear(data[i]);
104+
else if (source == linearRGB && target == sRGB)
105+
for (size_t i = 0; i < num; ++i) data[i] = linear_to_sRGB(data[i]);
103106
}
104107

105108
extern VSG_DECLSPEC VkFormat uNorm_to_sRGB(VkFormat format);

src/vsg/app/Window.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
1818
#include <vsg/maths/color.h>
1919
#include <vsg/maths/vec4.h>
2020
#include <vsg/ui/ApplicationEvent.h>
21-
#include <vsg/vk/SubmitCommands.h>
2221
#include <vsg/utils/ColorSpace.h>
22+
#include <vsg/vk/SubmitCommands.h>
2323

2424
#include <array>
2525
#include <chrono>

src/vsg/io/tile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
3636
#include <vsg/state/VertexInputState.h>
3737
#include <vsg/state/material.h>
3838
#include <vsg/ui/UIEvent.h>
39-
#include <vsg/utils/ComputeBounds.h>
4039
#include <vsg/utils/ColorSpace.h>
40+
#include <vsg/utils/ComputeBounds.h>
4141
#include <vsg/vk/ResourceRequirements.h>
4242

4343
using namespace vsg;

src/vsg/utils/ColorSpace.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
1010
1111
</editor-fold> */
1212

13-
#include <vsg/utils/ColorSpace.h>
1413
#include <vsg/io/Logger.h>
14+
#include <vsg/utils/ColorSpace.h>
1515

1616
using namespace vsg;
1717

0 commit comments

Comments
 (0)