From 4fce5d1795eaf6b9911e139b7ec50292d004e269 Mon Sep 17 00:00:00 2001 From: aavit Date: Wed, 25 Jan 2012 16:04:51 +0100 Subject: Moving tiff image format support and libtiff out of qtbase The tiff plugin and bundled libtiff is moving to the qtimageformats project on Gerrit. Task-number: QTBUG-23887 Change-Id: I4c848232fdccddd7e7f54215f9eaa78dc4c3a53d Reviewed-by: Kent Hansen Reviewed-by: Lars Knoll --- src/plugins/imageformats/imageformats.pro | 1 - src/plugins/imageformats/tiff/main.cpp | 97 ------------------------------- src/plugins/imageformats/tiff/tiff.pro | 11 ---- 3 files changed, 109 deletions(-) delete mode 100644 src/plugins/imageformats/tiff/main.cpp delete mode 100644 src/plugins/imageformats/tiff/tiff.pro (limited to 'src/plugins/imageformats') diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro index bd227c1bfe..2b05f2feec 100644 --- a/src/plugins/imageformats/imageformats.pro +++ b/src/plugins/imageformats/imageformats.pro @@ -2,5 +2,4 @@ TEMPLATE = subdirs !contains(QT_CONFIG, no-jpeg):!contains(QT_CONFIG, jpeg):SUBDIRS += jpeg !contains(QT_CONFIG, no-gif):!contains(QT_CONFIG, gif):SUBDIRS += gif -!contains(QT_CONFIG, no-tiff):!contains(QT_CONFIG, tiff):SUBDIRS += tiff !contains(QT_CONFIG, no-ico):SUBDIRS += ico diff --git a/src/plugins/imageformats/tiff/main.cpp b/src/plugins/imageformats/tiff/main.cpp deleted file mode 100644 index d0e5eb1c45..0000000000 --- a/src/plugins/imageformats/tiff/main.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -#ifndef QT_NO_IMAGEFORMATPLUGIN - -#ifdef QT_NO_IMAGEFORMAT_TIFF -#undef QT_NO_IMAGEFORMAT_TIFF -#endif -#include - -QT_BEGIN_NAMESPACE - -class QTiffPlugin : public QImageIOPlugin -{ -public: - Capabilities capabilities(QIODevice * device, const QByteArray & format) const; - QImageIOHandler * create(QIODevice * device, const QByteArray & format = QByteArray()) const; - QStringList keys() const; -}; - -QImageIOPlugin::Capabilities QTiffPlugin::capabilities(QIODevice *device, const QByteArray &format) const -{ - if (format == "tiff" || format == "tif") - return Capabilities(CanRead | CanWrite); - if (!format.isEmpty()) - return 0; - if (!device->isOpen()) - return 0; - - Capabilities cap; - if (device->isReadable() && QTiffHandler::canRead(device)) - cap |= CanRead; - if (device->isWritable()) - cap |= CanWrite; - return cap; -} - -QImageIOHandler* QTiffPlugin::create(QIODevice *device, const QByteArray &format) const -{ - QImageIOHandler *tiffHandler = new QTiffHandler(); - tiffHandler->setDevice(device); - tiffHandler->setFormat(format); - return tiffHandler; -} - -QStringList QTiffPlugin::keys() const -{ - return QStringList() << QLatin1String("tiff") << QLatin1String("tif"); -} - -Q_EXPORT_STATIC_PLUGIN(QTiffPlugin) -Q_EXPORT_PLUGIN2(qtiff, QTiffPlugin) - -QT_END_NAMESPACE - -#endif /* QT_NO_IMAGEFORMATPLUGIN */ diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro deleted file mode 100644 index 4ad065420a..0000000000 --- a/src/plugins/imageformats/tiff/tiff.pro +++ /dev/null @@ -1,11 +0,0 @@ -TARGET = qtiff -load(qt_plugin) - -QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-tiff)" - -include(../../../gui/image/qtiffhandler.pri) -SOURCES += main.cpp - -DESTDIR = $$QT.gui.plugins/imageformats -target.path += $$[QT_INSTALL_PLUGINS]/imageformats -INSTALLS += target -- cgit v1.2.3