diff options
Diffstat (limited to 'src/shared/qwaylandsharedmemoryformathelper_p.h')
-rw-r--r-- | src/shared/qwaylandsharedmemoryformathelper_p.h | 64 |
1 files changed, 11 insertions, 53 deletions
diff --git a/src/shared/qwaylandsharedmemoryformathelper_p.h b/src/shared/qwaylandsharedmemoryformathelper_p.h index 72cc8401c..c8a9c2865 100644 --- a/src/shared/qwaylandsharedmemoryformathelper_p.h +++ b/src/shared/qwaylandsharedmemoryformathelper_p.h @@ -1,46 +1,11 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QWAYLANDSHAREDMEMORYFORMATHELPER_H #define QWAYLANDSHAREDMEMORYFORMATHELPER_H #include <QtGui/QImage> +#include <QtCore/private/qglobal_p.h> //the correct protocol header for the wayland server or wayland client has to be //included before this file is included @@ -59,6 +24,7 @@ public: case WL_SHM_FORMAT_RGB565: return QImage::Format_RGB16; case WL_SHM_FORMAT_XRGB1555: return QImage::Format_RGB555; case WL_SHM_FORMAT_RGB888: return QImage::Format_RGB888; + case WL_SHM_FORMAT_BGR888: return QImage::Format_BGR888; case WL_SHM_FORMAT_XRGB4444: return QImage::Format_RGB444; case WL_SHM_FORMAT_ARGB4444: return QImage::Format_ARGB4444_Premultiplied; case WL_SHM_FORMAT_XBGR8888: return QImage::Format_RGBX8888; @@ -71,7 +37,6 @@ public: default: return QImage::Format_Invalid; } } - static inline QVector<wl_shm_format> supportedWaylandFormats(); private: //IMPLEMENTATION (which has to be inline in the header because of the include trick) @@ -112,7 +77,13 @@ private: WL_SHM_FORMAT_XRGB2101010, //Format_RGB30, WL_SHM_FORMAT_ARGB2101010, //Format_A2RGB30_Premultiplied, WL_SHM_FORMAT_C8, //Format_Alpha8, - WL_SHM_FORMAT_C8 //Format_Grayscale8, + WL_SHM_FORMAT_C8, //Format_Grayscale8, + wl_shm_format(INT_MIN), //Format_RGBX64, + wl_shm_format(INT_MIN), //Format_RGBA64, + wl_shm_format(INT_MIN), //Format_RGBA64_Premultiplied, + wl_shm_format(INT_MIN), //Format_Grayscale16, + WL_SHM_FORMAT_BGR888, //Format_BGR888 + }; const size_t size = sizeof(formats_array) / sizeof(*formats_array); return Array(size, formats_array); @@ -127,19 +98,6 @@ wl_shm_format QWaylandSharedMemoryFormatHelper::fromQImageFormat(QImage::Format return array.data[format]; } -QVector<wl_shm_format> QWaylandSharedMemoryFormatHelper::supportedWaylandFormats() -{ - QVector<wl_shm_format> retFormats; - Array array = getData(); - for (size_t i = 0; i < array.size; i++) { - if (int(array.data[i]) != INT_MIN - && !retFormats.contains(array.data[i])) { - retFormats.append(array.data[i]); - } - } - return retFormats; -} - QT_END_NAMESPACE #endif //QWAYLANDSHAREDMEMORYFORMATHELPER_H |