From 311c175f3184103950c72bc5c775174597430b83 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 14 Jul 2017 01:31:22 +0300 Subject: Replace std::vector into macro STD_VECTOR. In most case it equal to std::vector except debug modes. Now it can be also mse::mstd::vector, but sadly this class not support all required features. --- src/resources/dye/dyepalette_replaceacolor.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/resources/dye/dyepalette_replaceacolor.cpp') diff --git a/src/resources/dye/dyepalette_replaceacolor.cpp b/src/resources/dye/dyepalette_replaceacolor.cpp index 27c0567cf..256efb8bb 100644 --- a/src/resources/dye/dyepalette_replaceacolor.cpp +++ b/src/resources/dye/dyepalette_replaceacolor.cpp @@ -39,7 +39,7 @@ PRAGMA48(GCC diagnostic pop) void DyePalette::replaceAColorDefault(uint32_t *restrict pixels, const int bufSize) const restrict2 { - std::vector::const_iterator it_end = mColors.end(); + STD_VECTOR::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); if ((sz == 0u) || (pixels == nullptr)) return; @@ -52,7 +52,7 @@ void DyePalette::replaceAColorDefault(uint32_t *restrict pixels, uint8_t *const p = reinterpret_cast(&pixels[ptr]); const unsigned int data = pixels[ptr]; - std::vector::const_iterator it = mColors.begin(); + STD_VECTOR::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -94,7 +94,7 @@ void DyePalette::replaceAColorDefault(uint32_t *restrict pixels, uint8_t *const p = reinterpret_cast(pixels); const unsigned int data = *pixels; - std::vector::const_iterator it = mColors.begin(); + STD_VECTOR::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -141,7 +141,7 @@ __attribute__ ((target ("sse2"))) void DyePalette::replaceAColorSse2(uint32_t *restrict pixels, const int bufSize) const restrict2 { - std::vector::const_iterator it_end = mColors.end(); + STD_VECTOR::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); if ((sz == 0u) || (pixels == nullptr)) return; @@ -156,7 +156,7 @@ void DyePalette::replaceAColorSse2(uint32_t *restrict pixels, __m128i base = _mm_loadu_si128(reinterpret_cast<__m128i*>( &pixels[ptr])); - std::vector::const_iterator it = mColors.begin(); + STD_VECTOR::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -182,7 +182,7 @@ void DyePalette::replaceAColorSse2(uint32_t *restrict pixels, uint8_t *const p = reinterpret_cast(&pixels[ptr]); const unsigned int data = pixels[ptr]; - std::vector::const_iterator it = mColors.begin(); + STD_VECTOR::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -212,7 +212,7 @@ __attribute__ ((target ("avx2"))) void DyePalette::replaceAColorAvx2(uint32_t *restrict pixels, const int bufSize) const restrict2 { - std::vector::const_iterator it_end = mColors.end(); + STD_VECTOR::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); if ((sz == 0u) || (pixels == nullptr)) return; @@ -227,7 +227,7 @@ void DyePalette::replaceAColorAvx2(uint32_t *restrict pixels, __m256i base = _mm256_loadu_si256(reinterpret_cast<__m256i*>( &pixels[ptr])); - std::vector::const_iterator it = mColors.begin(); + STD_VECTOR::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -253,7 +253,7 @@ void DyePalette::replaceAColorAvx2(uint32_t *restrict pixels, uint8_t *const p = reinterpret_cast(&pixels[ptr]); const unsigned int data = pixels[ptr]; - std::vector::const_iterator it = mColors.begin(); + STD_VECTOR::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; -- cgit v1.2.3-60-g2f50