diff options
author | Andrei Karas <akaras@inbox.ru> | 2018-10-29 02:02:04 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2018-10-29 02:02:04 +0300 |
commit | a6d18b282ab916c6536dc25516affeb9200043b6 (patch) | |
tree | 9980735a47cb2118999fb4f4dceaa52bf9f4fae7 /src/resources/dye | |
parent | 98c74738f21d7ae256f1273b6c1614ee64e2a3ad (diff) | |
download | manaverse-a6d18b282ab916c6536dc25516affeb9200043b6.tar.gz manaverse-a6d18b282ab916c6536dc25516affeb9200043b6.tar.bz2 manaverse-a6d18b282ab916c6536dc25516affeb9200043b6.tar.xz manaverse-a6d18b282ab916c6536dc25516affeb9200043b6.zip |
Fix code style.s20181102
Diffstat (limited to 'src/resources/dye')
-rw-r--r-- | src/resources/dye/dyepalette.cpp | 4 | ||||
-rw-r--r-- | src/resources/dye/dyepalette_replaceacolor.cpp | 12 | ||||
-rw-r--r-- | src/resources/dye/dyepalette_replaceaoglcolor.cpp | 12 | ||||
-rw-r--r-- | src/resources/dye/dyepalette_replacescolor.cpp | 12 | ||||
-rw-r--r-- | src/resources/dye/dyepalette_replacesoglcolor.cpp | 12 |
5 files changed, 26 insertions, 26 deletions
diff --git a/src/resources/dye/dyepalette.cpp b/src/resources/dye/dyepalette.cpp index d5fab2550..f250b36f6 100644 --- a/src/resources/dye/dyepalette.cpp +++ b/src/resources/dye/dyepalette.cpp @@ -253,7 +253,7 @@ void DyePalette::initFunctions() { #ifdef SIMD_SUPPORTED const uint32_t flags = Cpu::getFlags(); - if ((flags & Cpu::FEATURE_AVX2) != 0u) + if ((flags & Cpu::FEATURE_AVX2) != 0U) { funcReplaceSColor = &DyePalette::replaceSColorAvx2; funcReplaceSColorAvx2 = &DyePalette::replaceSColorAvx2; @@ -271,7 +271,7 @@ void DyePalette::initFunctions() funcReplaceAOGLColorSse2 = &DyePalette::replaceAOGLColorSse2; #endif // USE_OPENGL } - else if ((flags & Cpu::FEATURE_SSE2) != 0u) + else if ((flags & Cpu::FEATURE_SSE2) != 0U) { funcReplaceSColor = &DyePalette::replaceSColorSse2; funcReplaceSColorAvx2 = &DyePalette::replaceSColorSse2; diff --git a/src/resources/dye/dyepalette_replaceacolor.cpp b/src/resources/dye/dyepalette_replaceacolor.cpp index 5d94d9a1f..3ca757021 100644 --- a/src/resources/dye/dyepalette_replaceacolor.cpp +++ b/src/resources/dye/dyepalette_replaceacolor.cpp @@ -41,9 +41,9 @@ void DyePalette::replaceAColorDefault(uint32_t *restrict pixels, { STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); - if ((sz == 0u) || (pixels == nullptr)) + if ((sz == 0U) || (pixels == nullptr)) return; - if ((sz % 2) != 0u) + if ((sz % 2) != 0U) -- it_end; for (const uint32_t *const p_end = pixels + CAST_SIZE(bufSize); @@ -101,9 +101,9 @@ void DyePalette::replaceAColorSse2(uint32_t *restrict pixels, { STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); - if ((sz == 0u) || (pixels == nullptr)) + if ((sz == 0U) || (pixels == nullptr)) return; - if ((sz % 2) != 0u) + if ((sz % 2) != 0U) -- it_end; const int mod = bufSize % 4; const int bufEnd = bufSize - mod; @@ -172,9 +172,9 @@ void DyePalette::replaceAColorAvx2(uint32_t *restrict pixels, { STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); - if ((sz == 0u) || (pixels == nullptr)) + if ((sz == 0U) || (pixels == nullptr)) return; - if ((sz % 2) != 0u) + if ((sz % 2) != 0U) -- it_end; const int mod = bufSize % 8; const int bufEnd = bufSize - mod; diff --git a/src/resources/dye/dyepalette_replaceaoglcolor.cpp b/src/resources/dye/dyepalette_replaceaoglcolor.cpp index ec999812a..e50136783 100644 --- a/src/resources/dye/dyepalette_replaceaoglcolor.cpp +++ b/src/resources/dye/dyepalette_replaceaoglcolor.cpp @@ -43,9 +43,9 @@ void DyePalette::replaceAOGLColorDefault(uint32_t *restrict pixels, { STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); - if (sz == 0u || pixels == nullptr) + if (sz == 0U || pixels == nullptr) return; - if ((sz % 2) != 0u) + if ((sz % 2) != 0U) -- it_end; for (const uint32_t *const p_end = pixels + CAST_SIZE(bufSize); @@ -104,9 +104,9 @@ void DyePalette::replaceAOGLColorSse2(uint32_t *restrict pixels, { STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); - if (sz == 0u || pixels == nullptr) + if (sz == 0U || pixels == nullptr) return; - if ((sz % 2) != 0u) + if ((sz % 2) != 0U) -- it_end; if (bufSize >= 8) @@ -188,9 +188,9 @@ void DyePalette::replaceAOGLColorAvx2(uint32_t *restrict pixels, { STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); - if (sz == 0u || pixels == nullptr) + if (sz == 0U || pixels == nullptr) return; - if ((sz % 2) != 0u) + if ((sz % 2) != 0U) -- it_end; if (bufSize >= 8) diff --git a/src/resources/dye/dyepalette_replacescolor.cpp b/src/resources/dye/dyepalette_replacescolor.cpp index 80b82751d..4c987aa9d 100644 --- a/src/resources/dye/dyepalette_replacescolor.cpp +++ b/src/resources/dye/dyepalette_replacescolor.cpp @@ -41,9 +41,9 @@ void DyePalette::replaceSColorDefault(uint32_t *restrict pixels, { STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); - if (sz == 0u || pixels == nullptr) + if (sz == 0U || pixels == nullptr) return; - if ((sz % 2) != 0u) + if ((sz % 2) != 0U) -- it_end; for (const uint32_t *const p_end = pixels + CAST_SIZE(bufSize); @@ -102,9 +102,9 @@ void DyePalette::replaceSColorSse2(uint32_t *restrict pixels, { STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); - if (sz == 0u || pixels == nullptr) + if (sz == 0U || pixels == nullptr) return; - if ((sz % 2) != 0u) + if ((sz % 2) != 0U) -- it_end; const int mod = bufSize % 8; const int bufEnd = bufSize - mod; @@ -183,9 +183,9 @@ void DyePalette::replaceSColorAvx2(uint32_t *restrict pixels, { STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); - if (sz == 0u || pixels == nullptr) + if (sz == 0U || pixels == nullptr) return; - if ((sz % 2) != 0u) + if ((sz % 2) != 0U) -- it_end; const int mod = bufSize % 8; const int bufEnd = bufSize - mod; diff --git a/src/resources/dye/dyepalette_replacesoglcolor.cpp b/src/resources/dye/dyepalette_replacesoglcolor.cpp index 7e435d936..4483ed02b 100644 --- a/src/resources/dye/dyepalette_replacesoglcolor.cpp +++ b/src/resources/dye/dyepalette_replacesoglcolor.cpp @@ -43,9 +43,9 @@ void DyePalette::replaceSOGLColorDefault(uint32_t *restrict pixels, { STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); - if ((sz == 0u) || (pixels == nullptr)) + if ((sz == 0U) || (pixels == nullptr)) return; - if ((sz % 2) != 0u) + if ((sz % 2) != 0U) -- it_end; for (const uint32_t *const p_end = pixels + CAST_SIZE(bufSize); @@ -104,9 +104,9 @@ void DyePalette::replaceSOGLColorSse2(uint32_t *restrict pixels, { STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); - if ((sz == 0u) || (pixels == nullptr)) + if ((sz == 0U) || (pixels == nullptr)) return; - if ((sz % 2) != 0u) + if ((sz % 2) != 0U) -- it_end; if (bufSize >= 8) @@ -190,9 +190,9 @@ void DyePalette::replaceSOGLColorAvx2(uint32_t *restrict pixels, { STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); - if ((sz == 0u) || (pixels == nullptr)) + if ((sz == 0U) || (pixels == nullptr)) return; - if ((sz % 2) != 0u) + if ((sz % 2) != 0U) -- it_end; if (bufSize >= 8) |