Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
8 deleted
16 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/plugins/imageformats/gif/gif.pro

    r561 r846  
    22include(../../qpluginbase.pri)
    33
    4 HEADERS += qgifhandler.h
    5 SOURCES += main.cpp \
    6            qgifhandler.cpp
     4include(../../../gui/image/qgifhandler.pri)
     5SOURCES += $$PWD/main.cpp
    76
    87QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats

  • trunk/src/plugins/imageformats/gif/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    4848#undef QT_NO_IMAGEFORMAT_GIF
    4949#endif
    50 #include "qgifhandler.h"
     50#include <qgifhandler_p.h>
    5151
    5252QT_BEGIN_NAMESPACE

  • trunk/src/plugins/imageformats/ico/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/plugins/imageformats/ico/qicohandler.cpp

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    5555#include <QtCore/QBuffer>
    5656#include <qvariant.h>
     57
     58QT_BEGIN_NAMESPACE
     59
    5760// These next two structs represent how the icon information is stored
    5861// in an ICO file.
    … …  
    557560                else                    // # colors used
    558561                    icoAttrib.ncolors = header.biClrUsed ? header.biClrUsed : 1 << icoAttrib.nbits;
     562                if (icoAttrib.ncolors > 256) //color table can't be more than 256
     563                    return img;
    559564                icoAttrib.w = iconEntry.bWidth;
    560565                if (icoAttrib.w == 0)
    … …  
    892897}
    893898
     899QT_END_NAMESPACE

  • trunk/src/plugins/imageformats/ico/qicohandler.h

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    4444#include <QtGui/QImageIOHandler>
    4545
     46QT_BEGIN_NAMESPACE
     47
    4648class ICOReader;
    4749class QtIcoHandler: public QImageIOHandler
    … …  
    7274};
    7375
     76QT_END_NAMESPACE
     77
    7478#endif /* QTICOHANDLER_H */
    7579

  • trunk/src/plugins/imageformats/imageformats.pro

    r2 r846  
    11TEMPLATE = subdirs
    22
    3 !contains(QT_CONFIG, no-jpeg):SUBDIRS += jpeg
    4 !contains(QT_CONFIG, no-gif):SUBDIRS += gif
    5 !contains(QT_CONFIG, no-mng):SUBDIRS += mng
     3!contains(QT_CONFIG, no-jpeg):!contains(QT_CONFIG, jpeg):SUBDIRS += jpeg
     4!contains(QT_CONFIG, no-gif):!contains(QT_CONFIG, gif):SUBDIRS += gif
     5!contains(QT_CONFIG, no-mng):!contains(QT_CONFIG, mng):SUBDIRS += mng
    66contains(QT_CONFIG, svg):SUBDIRS += svg
    7 !contains(QT_CONFIG, no-tiff):SUBDIRS += tiff
     7!contains(QT_CONFIG, no-tiff):!contains(QT_CONFIG, tiff):SUBDIRS += tiff
    88!contains(QT_CONFIG, no-ico):SUBDIRS += ico

  • trunk/src/plugins/imageformats/jpeg/jpeg.pro

    r561 r846  
    44QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-jpeg)"
    55
    6 HEADERS += qjpeghandler.h
    7 SOURCES += main.cpp \
    8            qjpeghandler.cpp
    9 
    10 wince*: {
    11         DEFINES += NO_GETENV
    12         contains(CE_ARCH,x86):CONFIG -= stl exceptions
    13         contains(CE_ARCH,x86):CONFIG += exceptions_off
    14 }
    15 
    16 symbian: {
    17         #Disable warnings in 3rdparty code due to unused arguments
    18         QMAKE_CXXFLAGS.CW += -W nounusedarg
    19         TARGET.UID3=0x2001E61B
    20 }
    21 
    22 contains(QT_CONFIG, system-jpeg) {
    23         unix:LIBS += -ljpeg
    24         win32:LIBS += libjpeg.lib
    25 }
    26 !contains(QT_CONFIG, system-jpeg) {
    27         INCLUDEPATH += ../../../3rdparty/libjpeg
    28         SOURCES  += \
    29             ../../../3rdparty/libjpeg/jcapimin.c \
    30             ../../../3rdparty/libjpeg/jcapistd.c \
    31             ../../../3rdparty/libjpeg/jccoefct.c \
    32             ../../../3rdparty/libjpeg/jccolor.c \
    33             ../../../3rdparty/libjpeg/jcdctmgr.c \
    34             ../../../3rdparty/libjpeg/jchuff.c \
    35             ../../../3rdparty/libjpeg/jcinit.c \
    36             ../../../3rdparty/libjpeg/jcmainct.c \
    37             ../../../3rdparty/libjpeg/jcmarker.c \
    38             ../../../3rdparty/libjpeg/jcmaster.c \
    39             ../../../3rdparty/libjpeg/jcomapi.c \
    40             ../../../3rdparty/libjpeg/jcparam.c \
    41             ../../../3rdparty/libjpeg/jcphuff.c \
    42             ../../../3rdparty/libjpeg/jcprepct.c \
    43             ../../../3rdparty/libjpeg/jcsample.c \
    44             ../../../3rdparty/libjpeg/jctrans.c \
    45             ../../../3rdparty/libjpeg/jdapimin.c \
    46             ../../../3rdparty/libjpeg/jdapistd.c \
    47             ../../../3rdparty/libjpeg/jdatadst.c \
    48             ../../../3rdparty/libjpeg/jdatasrc.c \
    49             ../../../3rdparty/libjpeg/jdcoefct.c \
    50             ../../../3rdparty/libjpeg/jdcolor.c \
    51             ../../../3rdparty/libjpeg/jddctmgr.c \
    52             ../../../3rdparty/libjpeg/jdhuff.c \
    53             ../../../3rdparty/libjpeg/jdinput.c \
    54             ../../../3rdparty/libjpeg/jdmainct.c \
    55             ../../../3rdparty/libjpeg/jdmarker.c \
    56             ../../../3rdparty/libjpeg/jdmaster.c \
    57             ../../../3rdparty/libjpeg/jdmerge.c \
    58             ../../../3rdparty/libjpeg/jdphuff.c \
    59             ../../../3rdparty/libjpeg/jdpostct.c \
    60             ../../../3rdparty/libjpeg/jdsample.c \
    61             ../../../3rdparty/libjpeg/jdtrans.c \
    62             ../../../3rdparty/libjpeg/jerror.c \
    63             ../../../3rdparty/libjpeg/jfdctflt.c \
    64             ../../../3rdparty/libjpeg/jfdctfst.c \
    65             ../../../3rdparty/libjpeg/jfdctint.c \
    66             ../../../3rdparty/libjpeg/jidctflt.c \
    67             ../../../3rdparty/libjpeg/jidctfst.c \
    68             ../../../3rdparty/libjpeg/jidctint.c \
    69             ../../../3rdparty/libjpeg/jidctred.c \
    70             ../../../3rdparty/libjpeg/jmemmgr.c \
    71             ../../../3rdparty/libjpeg/jquant1.c \
    72             ../../../3rdparty/libjpeg/jquant2.c \
    73             ../../../3rdparty/libjpeg/jutils.c \
    74             ../../../3rdparty/libjpeg/jmemnobs.c
    75 }
     6include(../../../gui/image/qjpeghandler.pri)
     7SOURCES += main.cpp
    768
    779QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
    7810target.path += $$[QT_INSTALL_PLUGINS]/imageformats
    7911INSTALLS += target
    80 

  • trunk/src/plugins/imageformats/jpeg/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    4848#undef QT_NO_IMAGEFORMAT_JPEG
    4949#endif
    50 #include "qjpeghandler.h"
     50#include <qjpeghandler_p.h>
    5151
    5252QT_BEGIN_NAMESPACE

  • trunk/src/plugins/imageformats/mng/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    4848#undef QT_NO_IMAGEFORMAT_MNG
    4949#endif
    50 #include "qmnghandler.h"
     50#include <qmnghandler_p.h>
    5151
    5252#include <qiodevice.h>

  • trunk/src/plugins/imageformats/mng/mng.pro

    r561 r846  
    33
    44QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-mng)"
    5 
    6 HEADERS += qmnghandler.h
    7 SOURCES += main.cpp \
    8            qmnghandler.cpp
    95
    106symbian: {
    … …  
    1410}
    1511
    16 contains(QT_CONFIG, system-mng) {
    17         unix:LIBS += -lmng
    18         win32:LIBS += libmng.lib
    19 }
    20 !contains(QT_CONFIG, system-mng) {
    21         DEFINES += MNG_BUILD_SO
    22         DEFINES += MNG_NO_INCLUDE_JNG
    23         INCLUDEPATH += ../../../3rdparty/libmng
    24         SOURCES  += \
    25             ../../../3rdparty/libmng/libmng_callback_xs.c \
    26             ../../../3rdparty/libmng/libmng_chunk_io.c \
    27             ../../../3rdparty/libmng/libmng_chunk_descr.c \
    28             ../../../3rdparty/libmng/libmng_chunk_prc.c \
    29             ../../../3rdparty/libmng/libmng_chunk_xs.c \
    30             ../../../3rdparty/libmng/libmng_cms.c \
    31             ../../../3rdparty/libmng/libmng_display.c \
    32             ../../../3rdparty/libmng/libmng_dither.c \
    33             ../../../3rdparty/libmng/libmng_error.c \
    34             ../../../3rdparty/libmng/libmng_filter.c \
    35             ../../../3rdparty/libmng/libmng_hlapi.c \
    36             ../../../3rdparty/libmng/libmng_jpeg.c \
    37             ../../../3rdparty/libmng/libmng_object_prc.c \
    38             ../../../3rdparty/libmng/libmng_pixels.c \
    39             ../../../3rdparty/libmng/libmng_prop_xs.c \
    40             ../../../3rdparty/libmng/libmng_read.c \
    41             ../../../3rdparty/libmng/libmng_trace.c \
    42             ../../../3rdparty/libmng/libmng_write.c \
    43             ../../../3rdparty/libmng/libmng_zlib.c
    44 }
    45 
    46 contains(QT_CONFIG, system-zlib) {
    47         LIBS += -lz
    48 }
    49 !contains(QT_CONFIG, system-zlib) {
    50         INCLUDEPATH +=  ../../../3rdparty/zlib
    51 }
     12include(../../../gui/image/qmnghandler.pri)
     13SOURCES += main.cpp
    5214
    5315QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
    5416target.path += $$[QT_INSTALL_PLUGINS]/imageformats
    5517INSTALLS += target
    56 

  • trunk/src/plugins/imageformats/svg/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    6363QStringList QSvgPlugin::keys() const
    6464{
    65     return QStringList() << QLatin1String("svg");
     65    return QStringList() << QLatin1String("svg") << QLatin1String("svgz");
    6666}
    6767
    6868QImageIOPlugin::Capabilities QSvgPlugin::capabilities(QIODevice *device, const QByteArray &format) const
    6969{
    70     //### canRead disabled for now because it's hard to detect
    71     //    whether the file is actually svg without parsing it
    72     //if (device->isReadable() && QSvgIOHandler::canRead(device))
    73 
    74     if (format == "svg")
     70    if (format == "svg" || format == "svgz")
    7571        return Capabilities(CanRead);
    76     else
    77         return 0;
    78 
    79 
    80     if (!device->isOpen())
     72    if (!format.isEmpty())
    8173        return 0;
    8274
    8375    Capabilities cap;
    84     if (device->isReadable())
     76    if (device->isReadable() && QSvgIOHandler::canRead(device))
    8577        cap |= CanRead;
    8678    return cap;

  • trunk/src/plugins/imageformats/svg/qsvgiohandler.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    4949#include "qpainter.h"
    5050#include "qvariant.h"
     51#include "qbuffer.h"
    5152#include "qdebug.h"
    5253
    … …  
    5657{
    5758public:
    58     QSvgIOHandlerPrivate()
    59         : r(new QSvgRenderer()), loaded(false)
     59    QSvgIOHandlerPrivate(QSvgIOHandler *qq)
     60        : q(qq), loaded(false), readDone(false), backColor(Qt::transparent)
    6061    {}
    61     ~QSvgIOHandlerPrivate()
    62     {
    63         delete r;
    64     }
    6562
    6663    bool load(QIODevice *device);
    67     static bool findSvgTag(QIODevice *device);
    68 
    69     QSvgRenderer *r;
    70     QSize         defaultSize;
    71     QSize         currentSize;
    72     bool          loaded;
     64
     65    QSvgIOHandler   *q;
     66    QSvgRenderer     r;
     67    QXmlStreamReader xmlReader;
     68    QSize            defaultSize;
     69    QRect            clipRect;
     70    QSize            scaledSize;
     71    QRect            scaledClipRect;
     72    bool             loaded;
     73    bool             readDone;
     74    QColor           backColor;
    7375};
    7476
     77
    7578bool QSvgIOHandlerPrivate::load(QIODevice *device)
    7679{
    7780    if (loaded)
    7881        return true;
    79 
    80     if (r->load(device->readAll())) {
    81         defaultSize = QSize(r->viewBox().width(), r->viewBox().height());
    82         if (currentSize.isEmpty())
    83             currentSize = defaultSize;
    84     }
    85     loaded = r->isValid();
     82    if (q->format().isEmpty())
     83        q->canRead();
     84
     85    // # The SVG renderer doesn't handle trailing, unrelated data, so we must
     86    // assume that all available data in the device is to be read.
     87    bool res = false;
     88    QBuffer *buf = qobject_cast<QBuffer *>(device);
     89    if (buf) {
     90        const QByteArray &ba = buf->data();
     91        res = r.load(QByteArray::fromRawData(ba.constData() + buf->pos(), ba.size() - buf->pos()));
     92        buf->seek(ba.size());
     93    } else if (q->format() == "svgz") {
     94        res = r.load(device->readAll());
     95    } else {
     96        xmlReader.setDevice(device);
     97        res = r.load(&xmlReader);
     98    }
     99
     100    if (res) {
     101        defaultSize = QSize(r.viewBox().width(), r.viewBox().height());
     102        loaded = true;
     103    }
    86104
    87105    return loaded;
    88106}
    89107
    90 bool QSvgIOHandlerPrivate::findSvgTag(QIODevice *device)
    91 {
    92     qint64 pos = device->pos();
    93     device->seek(0);
    94     char buffer[256];
    95     const char svg_tag[] = "<svg";
    96 
    97     while (1) {
    98         int size = device->read(buffer, 256);
    99         for (int i=0; i<size - 5; ++i) {
    100             if (!memcmp(buffer + i, svg_tag, 4)) {
    101                 if (buffer[i+4] == ' ' || buffer[i+4] == '\t'
    102                     || buffer[i+4] == '\n' || buffer[i+4] == '\r')
    103                 {
    104                     device->seek(pos);
    105                     return true;
    106                 }
     108
     109QSvgIOHandler::QSvgIOHandler()
     110    : d(new QSvgIOHandlerPrivate(this))
     111{
     112
     113}
     114
     115
     116QSvgIOHandler::~QSvgIOHandler()
     117{
     118    delete d;
     119}
     120
     121
     122bool QSvgIOHandler::canRead() const
     123{
     124    if (!device())
     125        return false;
     126    if (d->loaded && !d->readDone)
     127        return true;        // Will happen if we have been asked for the size
     128
     129    QByteArray buf = device()->peek(8);
     130    if (buf.startsWith("\x1f\x8b")) {
     131        setFormat("svgz");
     132        return true;
     133    } else if (buf.contains("<?xml") || buf.contains("<svg")) {
     134        setFormat("svg");
     135        return true;
     136    }
     137    return false;
     138}
     139
     140
     141QByteArray QSvgIOHandler::name() const
     142{
     143    return "svg";
     144}
     145
     146
     147bool QSvgIOHandler::read(QImage *image)
     148{
     149    if (!d->readDone && d->load(device())) {
     150        bool xform = (d->clipRect.isValid() || d->scaledSize.isValid() || d->scaledClipRect.isValid());
     151        QSize finalSize = d->defaultSize;
     152        QRectF bounds;
     153        if (xform && !d->defaultSize.isEmpty()) {
     154            bounds = QRectF(QPointF(0,0), QSizeF(d->defaultSize));
     155            QPoint tr1, tr2;
     156            QSizeF sc(1, 1);
     157            if (d->clipRect.isValid()) {
     158                tr1 = -d->clipRect.topLeft();
     159                finalSize = d->clipRect.size();
    107160            }
     161            if (d->scaledSize.isValid()) {
     162                sc = QSizeF(qreal(d->scaledSize.width()) / finalSize.width(),
     163                            qreal(d->scaledSize.height()) / finalSize.height());
     164                finalSize = d->scaledSize;
     165            }
     166            if (d->scaledClipRect.isValid()) {
     167                tr2 = -d->scaledClipRect.topLeft();
     168                finalSize = d->scaledClipRect.size();
     169            }
     170            QTransform t;
     171            t.translate(tr2.x(), tr2.y());
     172            t.scale(sc.width(), sc.height());
     173            t.translate(tr1.x(), tr1.y());
     174            bounds = t.mapRect(bounds);
    108175        }
    109         if (device->atEnd())
    110             break;
    111         device->seek(device->pos()-4);
    112     }
    113     device->seek(pos);
    114     return false;
    115 }
    116 
    117 QSvgIOHandler::QSvgIOHandler()
    118     : d(new QSvgIOHandlerPrivate())
    119 {
    120 
    121 }
    122 
    123 
    124 QSvgIOHandler::~QSvgIOHandler()
    125 {
    126     delete d;
    127 }
    128 
    129 
    130 bool QSvgIOHandler::canRead() const
    131 {
    132     return QSvgIOHandlerPrivate::findSvgTag(device());
    133 }
    134 
    135 
    136 QByteArray QSvgIOHandler::name() const
    137 {
    138     return "svg";
    139 }
    140 
    141 
    142 bool QSvgIOHandler::read(QImage *image)
    143 {
    144     if (d->load(device())) {
    145         *image = QImage(d->currentSize, QImage::Format_ARGB32_Premultiplied);
    146         if (!d->currentSize.isEmpty()) {
    147             image->fill(0x00000000);
     176        *image = QImage(finalSize, QImage::Format_ARGB32_Premultiplied);
     177        if (!finalSize.isEmpty()) {
     178            image->fill(d->backColor.rgba());
    148179            QPainter p(image);
    149             d->r->render(&p);
     180            d->r.render(&p, bounds);
    150181            p.end();
    151182        }
     183        d->readDone = true;
    152184        return true;
    153185    }
    … …  
    167199        return d->defaultSize;
    168200        break;
     201    case ClipRect:
     202        return d->clipRect;
     203        break;
    169204    case ScaledSize:
    170         return d->currentSize;
     205        return d->scaledSize;
     206        break;
     207    case ScaledClipRect:
     208        return d->scaledClipRect;
     209        break;
     210    case BackgroundColor:
     211        return d->backColor;
    171212        break;
    172213    default:
    … …  
    180221{
    181222    switch(option) {
    182     case Size:
    183         d->defaultSize = value.toSize();
    184         d->currentSize = value.toSize();
     223    case ClipRect:
     224        d->clipRect = value.toRect();
    185225        break;
    186226    case ScaledSize:
    187         d->currentSize = value.toSize();
     227        d->scaledSize = value.toSize();
     228        break;
     229    case ScaledClipRect:
     230        d->scaledClipRect = value.toRect();
     231        break;
     232    case BackgroundColor:
     233        d->backColor = value.value<QColor>();
    188234        break;
    189235    default:
    … …  
    199245    case ImageFormat:
    200246    case Size:
     247    case ClipRect:
    201248    case ScaledSize:
     249    case ScaledClipRect:
     250    case BackgroundColor:
    202251        return true;
    203252    default:
    … …  
    207256}
    208257
     258
    209259bool QSvgIOHandler::canRead(QIODevice *device)
    210260{
    211     return QSvgIOHandlerPrivate::findSvgTag(device);
     261    QByteArray buf = device->peek(8);
     262    return buf.startsWith("\x1f\x8b") || buf.contains("<?xml") || buf.contains("<svg");
    212263}
    213264

  • trunk/src/plugins/imageformats/svg/qsvgiohandler.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/plugins/imageformats/tiff/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    4848#undef QT_NO_IMAGEFORMAT_TIFF
    4949#endif
    50 #include "qtiffhandler.h"
     50#include <qtiffhandler_p.h>
    5151
    5252QT_BEGIN_NAMESPACE

  • trunk/src/plugins/imageformats/tiff/tiff.pro

    r561 r846  
    44QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-tiff)"
    55
    6 HEADERS += qtiffhandler.h
    7 SOURCES += main.cpp \
    8            qtiffhandler.cpp
    9 
    10 contains(QT_CONFIG, system-tiff) {
    11         unix:LIBS += -ltiff
    12         win32:LIBS += libtiff.lib
    13 }
    14 !contains(QT_CONFIG, system-tiff) {
    15         INCLUDEPATH += ../../../3rdparty/libtiff/libtiff
    16         SOURCES  += \
    17             ../../../3rdparty/libtiff/libtiff/tif_aux.c \
    18             ../../../3rdparty/libtiff/libtiff/tif_close.c \
    19             ../../../3rdparty/libtiff/libtiff/tif_codec.c \
    20             ../../../3rdparty/libtiff/libtiff/tif_color.c \
    21             ../../../3rdparty/libtiff/libtiff/tif_compress.c \
    22             ../../../3rdparty/libtiff/libtiff/tif_dir.c \
    23             ../../../3rdparty/libtiff/libtiff/tif_dirinfo.c \
    24             ../../../3rdparty/libtiff/libtiff/tif_dirread.c \
    25             ../../../3rdparty/libtiff/libtiff/tif_dirwrite.c \
    26             ../../../3rdparty/libtiff/libtiff/tif_dumpmode.c \
    27             ../../../3rdparty/libtiff/libtiff/tif_error.c \
    28             ../../../3rdparty/libtiff/libtiff/tif_extension.c \
    29             ../../../3rdparty/libtiff/libtiff/tif_fax3.c \
    30             ../../../3rdparty/libtiff/libtiff/tif_fax3sm.c \
    31             ../../../3rdparty/libtiff/libtiff/tif_flush.c \
    32             ../../../3rdparty/libtiff/libtiff/tif_getimage.c \
    33             ../../../3rdparty/libtiff/libtiff/tif_luv.c \
    34             ../../../3rdparty/libtiff/libtiff/tif_lzw.c \
    35             ../../../3rdparty/libtiff/libtiff/tif_next.c \
    36             ../../../3rdparty/libtiff/libtiff/tif_open.c \
    37             ../../../3rdparty/libtiff/libtiff/tif_packbits.c \
    38             ../../../3rdparty/libtiff/libtiff/tif_pixarlog.c \
    39             ../../../3rdparty/libtiff/libtiff/tif_predict.c \
    40             ../../../3rdparty/libtiff/libtiff/tif_print.c \
    41             ../../../3rdparty/libtiff/libtiff/tif_read.c \
    42             ../../../3rdparty/libtiff/libtiff/tif_strip.c \
    43             ../../../3rdparty/libtiff/libtiff/tif_swab.c \
    44             ../../../3rdparty/libtiff/libtiff/tif_thunder.c \
    45             ../../../3rdparty/libtiff/libtiff/tif_tile.c \
    46             ../../../3rdparty/libtiff/libtiff/tif_version.c \
    47             ../../../3rdparty/libtiff/libtiff/tif_warning.c \
    48             ../../../3rdparty/libtiff/libtiff/tif_write.c \
    49             ../../../3rdparty/libtiff/libtiff/tif_zip.c
    50             win32 {
    51                SOURCES += ../../../3rdparty/libtiff/libtiff/tif_win32.c
    52             }
    53             os2 {
    54                SOURCES += ../../../3rdparty/libtiff/libtiff/tif_unix.c
    55             }
    56             unix: {
    57                SOURCES += ../../../3rdparty/libtiff/libtiff/tif_unix.c
    58             }
    59             wince*: {
    60                SOURCES += ../../../corelib/kernel/qfunctions_wince.cpp
    61             }
    62             symbian*: {
    63                SOURCES += ../../../3rdparty/libtiff/port/lfind.c
    64             }
    65 }
    66 
    67 contains(QT_CONFIG, system-zlib) {
    68         LIBS += -lz
    69 }
    70 !contains(QT_CONFIG, system-zlib) {
    71         INCLUDEPATH +=  ../../../3rdparty/zlib
    72 }
     6include(../../../gui/image/qtiffhandler.pri)
     7SOURCES += main.cpp
    738
    749QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
Note: See TracChangeset for help on using the changeset viewer.