Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-05-31 16:21:16 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-05-31 16:22:52 +0300
commitaba4e6810f8b4d0e459137b64e061a2cadc457d1 (patch)
tree2b6159c7ba0f23c020600b71276772fa4a882b5b /source/blender/imbuf
parent72a563cdee8fef198a200ff65b57ddb847c01795 (diff)
Cleanup: style, use braces in source/ (include disabled blocks)
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r--source/blender/imbuf/intern/dds/ColorBlock.cpp3
-rw-r--r--source/blender/imbuf/intern/filter.c6
-rw-r--r--source/blender/imbuf/intern/jpeg.c3
3 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/dds/ColorBlock.cpp b/source/blender/imbuf/intern/dds/ColorBlock.cpp
index 581d740c97c..1ca584e9b0e 100644
--- a/source/blender/imbuf/intern/dds/ColorBlock.cpp
+++ b/source/blender/imbuf/intern/dds/ColorBlock.cpp
@@ -180,8 +180,9 @@ bool ColorBlock::isSingleColorNoAlpha() const
Color32 c;
int i;
for (i = 0; i < 16; i++) {
- if (m_color[i].a != 0)
+ if (m_color[i].a != 0) {
c = m_color[i];
+ }
}
Color32 mask(0xFF, 0xFF, 0xFF, 0x00);
diff --git a/source/blender/imbuf/intern/filter.c b/source/blender/imbuf/intern/filter.c
index 49e1a66886d..e6b95968498 100644
--- a/source/blender/imbuf/intern/filter.c
+++ b/source/blender/imbuf/intern/filter.c
@@ -446,9 +446,11 @@ void IMB_filter_extend(struct ImBuf *ibuf, char *mask, int filter)
#if 0
k = 0;
- for (i = -n; i <= n; i++)
- for (j = -n; j <= n; j++)
+ for (i = -n; i <= n; i++) {
+ for (j = -n; j <= n; j++) {
weight[k++] = sqrt((float)i * i + j * j);
+ }
+ }
#endif
weight[0] = 1;
diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c
index 0822c069755..4e2d8897ff8 100644
--- a/source/blender/imbuf/intern/jpeg.c
+++ b/source/blender/imbuf/intern/jpeg.c
@@ -579,8 +579,9 @@ static int init_jpeg(FILE *outfile, struct jpeg_compress_struct *cinfo, struct I
/* just write RGBA as RGB,
* unsupported feature only confuses other s/w */
- if (ibuf->planes == 32)
+ if (ibuf->planes == 32) {
cinfo->in_color_space = JCS_UNKNOWN;
+ }
#endif
switch (cinfo->in_color_space) {
case JCS_RGB: