Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62210655 authored by Nick Desaulniers's avatar Nick Desaulniers Committed by android-build-merger
Browse files

Merge "[frameworks][native][libs]{math|ui} fix... 

Merge "[frameworks][native][libs]{math|ui} fix -Wimplicit-int-float-conversion" am: c875ac80 am: 0b8612ba
am: 0f1f4e05

Change-Id: I6e52c0c32de78d1fde14684555db2aa8c1201244
parents 4e9348bd 0f1f4e05

libs/math/include/math/quat.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -109,7 +109,7 @@ public: 




    // initialize from 4 values to w + xi + yj + zk

    // initialize from 4 values to w + xi + yj + zk

    template<typename A, typename B, typename C, typename D>

    template<typename A, typename B, typename C, typename D>

    constexpr TQuaternion(A w, B x, C y, D z) : x(x), y(y), z(z), w(w) { }

    constexpr TQuaternion(A w, B x, C y, D z) : x(static_cast<T>(x)), y(static_cast<T>(y)), z(static_cast<T>(z)), w(static_cast<T>(w)) { }





    // initialize from a vec3 + a value to : v.xi + v.yj + v.zk + w

    // initialize from a vec3 + a value to : v.xi + v.yj + v.zk + w

    template<typename A, typename B>

    template<typename A, typename B>

libs/math/include/math/vec2.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ public: 
    constexpr TVec2(A v) : x(v), y(v) { }

    constexpr TVec2(A v) : x(v), y(v) { }





    template<typename A, typename B>

    template<typename A, typename B>

    constexpr TVec2(A x, B y) : x(x), y(y) { }

    constexpr TVec2(A x, B y) : x(static_cast<T>(x)), y(static_cast<T>(y)) { }





    template<typename A>

    template<typename A>

    explicit

    explicit

libs/math/include/math/vec3.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -86,13 +86,13 @@ public: 




    // handles implicit conversion to a tvec4. must not be explicit.

    // handles implicit conversion to a tvec4. must not be explicit.

    template<typename A, typename = typename std::enable_if<std::is_arithmetic<A>::value >::type>

    template<typename A, typename = typename std::enable_if<std::is_arithmetic<A>::value >::type>

    constexpr TVec3(A v) : x(v), y(v), z(v) { }

    constexpr TVec3(A v) : x(static_cast<T>(v)), y(static_cast<T>(v)), z(static_cast<T>(v)) { }





    template<typename A, typename B, typename C>

    template<typename A, typename B, typename C>

    constexpr TVec3(A x, B y, C z) : x(x), y(y), z(z) { }

    constexpr TVec3(A x, B y, C z) : x(static_cast<T>(x)), y(static_cast<T>(y)), z(static_cast<T>(z)) { }





    template<typename A, typename B>

    template<typename A, typename B>

    constexpr TVec3(const TVec2<A>& v, B z) : x(v.x), y(v.y), z(z) { }

    constexpr TVec3(const TVec2<A>& v, B z) : x(v.x), y(v.y), z(static_cast<T>(z)) { }





    template<typename A>

    template<typename A>

    explicit

    explicit

libs/ui/ColorSpace.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -364,7 +364,11 @@ std::unique_ptr<float3[]> ColorSpace::createLUT(uint32_t size, const ColorSpace& 
    for (uint32_t z = 0; z < size; z++) {

    for (uint32_t z = 0; z < size; z++) {

        for (int32_t y = int32_t(size - 1); y >= 0; y--) {

        for (int32_t y = int32_t(size - 1); y >= 0; y--) {

            for (uint32_t x = 0; x < size; x++) {

            for (uint32_t x = 0; x < size; x++) {

                *data++ = connector.transform({x * m, y * m, z * m});

                *data++ = connector.transform({

                    static_cast<float>(x) * m,

                    static_cast<float>(y) * m,

                    static_cast<float>(z) * m,

                });

            }

            }

        }

        }

    }

    }

libs/ui/GraphicBufferAllocator.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -81,7 +81,7 @@ void GraphicBufferAllocator::dump(std::string& result) const { 
        if (rec.size) {

        if (rec.size) {

            StringAppendF(&result,

            StringAppendF(&result,

                          "%10p: %7.2f KiB | %4u (%4u) x %4u | %4u | %8X | 0x%" PRIx64 " | %s\n",

                          "%10p: %7.2f KiB | %4u (%4u) x %4u | %4u | %8X | 0x%" PRIx64 " | %s\n",

                          list.keyAt(i), rec.size / 1024.0, rec.width, rec.stride, rec.height,

                          list.keyAt(i), static_cast<double>(rec.size) / 1024.0, rec.width, rec.stride, rec.height,

                          rec.layerCount, rec.format, rec.usage, rec.requestorName.c_str());

                          rec.layerCount, rec.format, rec.usage, rec.requestorName.c_str());

        } else {

        } else {

            StringAppendF(&result,

            StringAppendF(&result,
@@ -91,7 +91,7 @@ void GraphicBufferAllocator::dump(std::string& result) const { 
        }

        }

        total += rec.size;

        total += rec.size;

    }

    }

    StringAppendF(&result, "Total allocated (estimate): %.2f KB\n", total / 1024.0);

    StringAppendF(&result, "Total allocated (estimate): %.2f KB\n", static_cast<double>(total) / 1024.0);





    result.append(mAllocator->dumpDebugInfo());

    result.append(mAllocator->dumpDebugInfo());

}

}