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

Commit 71ebfe44 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Fix libgui warnings"

parents ed4af7da 9a80d502

include/gui/BufferQueueCore.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -313,8 +313,8 @@ private: 




    // Cached data about the shared buffer in shared buffer mode

    // Cached data about the shared buffer in shared buffer mode

    struct SharedBufferCache {

    struct SharedBufferCache {

        SharedBufferCache(Rect _crop, uint32_t _transform, int _scalingMode,

        SharedBufferCache(Rect _crop, uint32_t _transform,

                android_dataspace _dataspace)

                uint32_t _scalingMode, android_dataspace _dataspace)

        : crop(_crop),

        : crop(_crop),

          transform(_transform),

          transform(_transform),

          scalingMode(_scalingMode),

          scalingMode(_scalingMode),

include/gui/IGraphicBufferProducer.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -352,7 +352,7 @@ public: 
    };

    };





    // QueueBufferOutput must be a POD structure

    // QueueBufferOutput must be a POD structure

    struct __attribute__ ((__packed__)) QueueBufferOutput {

    struct QueueBufferOutput {

        // outWidth - filled with default width applied to the buffer

        // outWidth - filled with default width applied to the buffer

        // outHeight - filled with default height applied to the buffer

        // outHeight - filled with default height applied to the buffer

        // outTransformHint - filled with default transform applied to the buffer

        // outTransformHint - filled with default transform applied to the buffer

libs/gui/Surface.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -408,7 +408,7 @@ int Surface::queueBuffer(android_native_buffer_t* buffer, int fenceFd) { 
        timestamp = systemTime(SYSTEM_TIME_MONOTONIC);

        timestamp = systemTime(SYSTEM_TIME_MONOTONIC);

        isAutoTimestamp = true;

        isAutoTimestamp = true;

        ALOGV("Surface::queueBuffer making up timestamp: %.2f ms",

        ALOGV("Surface::queueBuffer making up timestamp: %.2f ms",

            timestamp / 1000000.f);

            timestamp / 1000000.0);

    } else {

    } else {

        timestamp = mTimestamp;

        timestamp = mTimestamp;

    }

    }