Remove unused NativeImage
Only the static method systemFormat of NativeImage was used, and only from raster pixmaps for default formats. This patch moves the method to qpixmap_raster.cpp. Change-Id: Ic3cb673775693ea0595bad5e5f267a8dd1e8b0ec Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>bb10
Allan Sandfeld Jensen
Allan Sandfeld Jensen
parent
39da34853f
commit
f222206e8d
|
|
@ -11,7 +11,6 @@ HEADERS += \
|
|||
image/qimagereader.h \
|
||||
image/qimagewriter.h \
|
||||
image/qmovie.h \
|
||||
image/qnativeimage_p.h \
|
||||
image/qpaintengine_pic_p.h \
|
||||
image/qpicture.h \
|
||||
image/qpicture_p.h \
|
||||
|
|
@ -45,7 +44,6 @@ SOURCES += \
|
|||
image/qmovie.cpp \
|
||||
image/qpixmap_raster.cpp \
|
||||
image/qpixmap_blitter.cpp \
|
||||
image/qnativeimage.cpp \
|
||||
image/qimagepixmapcleanuphooks.cpp \
|
||||
image/qicon.cpp \
|
||||
image/qiconloader.cpp \
|
||||
|
|
|
|||
|
|
@ -1,72 +0,0 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the QtGui module 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$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include <qdebug.h>
|
||||
#include "qnativeimage_p.h"
|
||||
#include <qpa/qplatformscreen.h>
|
||||
#include "private/qguiapplication_p.h"
|
||||
#include "qscreen.h"
|
||||
|
||||
#include "private/qpaintengine_raster_p.h"
|
||||
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
|
||||
QNativeImage::QNativeImage(int width, int height, QImage::Format format, bool /* isTextBuffer */, QWindow *)
|
||||
: image(width, height, format)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
QNativeImage::~QNativeImage()
|
||||
{
|
||||
}
|
||||
|
||||
QImage::Format QNativeImage::systemFormat()
|
||||
{
|
||||
if (!QGuiApplication::primaryScreen())
|
||||
return QImage::Format_Invalid;
|
||||
return QGuiApplication::primaryScreen()->handle()->format();
|
||||
}
|
||||
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the QtGui module 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$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QNATIVEIMAGE_P_H
|
||||
#define QNATIVEIMAGE_P_H
|
||||
|
||||
//
|
||||
// W A R N I N G
|
||||
// -------------
|
||||
//
|
||||
// This file is not part of the Qt API. It exists purely as an
|
||||
// implementation detail. This header file may change from version to
|
||||
// version without notice, or even be removed.
|
||||
//
|
||||
// We mean it.
|
||||
//
|
||||
|
||||
#include <QtGui/private/qtguiglobal_p.h>
|
||||
#include "qimage.h"
|
||||
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QWindow;
|
||||
|
||||
class QNativeImage
|
||||
{
|
||||
public:
|
||||
QNativeImage(int width, int height, QImage::Format format, bool isTextBuffer = false, QWindow *window = 0);
|
||||
~QNativeImage();
|
||||
|
||||
inline int width() const;
|
||||
inline int height() const;
|
||||
|
||||
QImage image;
|
||||
|
||||
static QImage::Format systemFormat();
|
||||
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(QNativeImage)
|
||||
};
|
||||
|
||||
inline int QNativeImage::width() const { return image.width(); }
|
||||
inline int QNativeImage::height() const { return image.height(); }
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QNATIVEIMAGE_P_H
|
||||
|
|
@ -42,7 +42,6 @@
|
|||
#include <private/qfont_p.h>
|
||||
|
||||
#include "qpixmap_raster_p.h"
|
||||
#include "qnativeimage_p.h"
|
||||
#include "qimage_p.h"
|
||||
#include "qpaintengine.h"
|
||||
|
||||
|
|
@ -50,9 +49,12 @@
|
|||
#include "qimage.h"
|
||||
#include <QBuffer>
|
||||
#include <QImageReader>
|
||||
#include <QGuiApplication>
|
||||
#include <QScreen>
|
||||
#include <private/qimage_p.h>
|
||||
#include <private/qsimd_p.h>
|
||||
#include <private/qdrawhelper_p.h>
|
||||
#include <qpa/qplatformscreen.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
|
|
@ -88,6 +90,13 @@ QRasterPlatformPixmap::~QRasterPlatformPixmap()
|
|||
{
|
||||
}
|
||||
|
||||
QImage::Format QRasterPlatformPixmap::systemOpaqueFormat()
|
||||
{
|
||||
if (!QGuiApplication::primaryScreen())
|
||||
return QImage::Format_RGB32;
|
||||
return QGuiApplication::primaryScreen()->handle()->format();
|
||||
}
|
||||
|
||||
QPlatformPixmap *QRasterPlatformPixmap::createCompatiblePlatformPixmap() const
|
||||
{
|
||||
return new QRasterPlatformPixmap(pixelType());
|
||||
|
|
@ -99,7 +108,7 @@ void QRasterPlatformPixmap::resize(int width, int height)
|
|||
if (pixelType() == BitmapType)
|
||||
format = QImage::Format_MonoLSB;
|
||||
else
|
||||
format = QNativeImage::systemFormat();
|
||||
format = systemOpaqueFormat();
|
||||
|
||||
image = QImage(width, height, format);
|
||||
w = width;
|
||||
|
|
@ -306,13 +315,13 @@ void QRasterPlatformPixmap::createPixmapForImage(QImage &sourceImage, Qt::ImageC
|
|||
? QImage::Format_ARGB32_Premultiplied
|
||||
: QImage::Format_RGB32;
|
||||
} else {
|
||||
QImage::Format opaqueFormat = QNativeImage::systemFormat();
|
||||
QImage::Format opaqueFormat = systemOpaqueFormat();
|
||||
QImage::Format alphaFormat = qt_alphaVersionForPainting(opaqueFormat);
|
||||
|
||||
if (!sourceImage.hasAlphaChannel()) {
|
||||
format = opaqueFormat;
|
||||
} else if ((flags & Qt::NoOpaqueDetection) == 0
|
||||
&& !const_cast<QImage &>(sourceImage).data_ptr()->checkForAlphaPixels())
|
||||
&& !sourceImage.data_ptr()->checkForAlphaPixels())
|
||||
{
|
||||
format = opaqueFormat;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ protected:
|
|||
void createPixmapForImage(QImage &sourceImage, Qt::ImageConversionFlags flags, bool inPlace);
|
||||
void setImage(const QImage &image);
|
||||
QImage image;
|
||||
static QImage::Format systemOpaqueFormat();
|
||||
|
||||
private:
|
||||
friend class QPixmap;
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@
|
|||
#include "qtextureglyphcache_p.h"
|
||||
#include "private/qfontengine_p.h"
|
||||
#include "private/qnumeric_p.h"
|
||||
#include "private/qnativeimage_p.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue