Add support for Qt 5, drop support for Qt 3 and KDE 3.

[mlt] / src / modules / qimage / qimage_wrapper.cpp

diff --git a/src/modules/qimage/qimage_wrapper.cpp b/src/modules/qimage/qimage_wrapper.cpp
index 2328054ef049d84eef10488ce663775f33c20e04..fc871e6cb45d201d2e3f42060843c1070f723a46 100644 (file)
--- a/src/modules/qimage/qimage_wrapper.cpp
+++ b/src/modules/qimage/qimage_wrapper.cpp
@@ -23,27 +23,17 @@
 
 #include "qimage_wrapper.h"
 
-#ifdef USE_QT3
-#include <qimage.h>
-#include <qmutex.h>
-
-#ifdef USE_KDE3
-#include <kinstance.h>
-#include <kimageio.h>
-#endif
-#endif
-
 #ifdef USE_KDE4
 #include <kcomponentdata.h>
 #endif
 
-#ifdef USE_QT4
-#include <QtGui/QImage>
-#include <QtCore/QSysInfo>
-#include <QtCore/QMutex>
-#include <QtCore/QtEndian>
-#include <QtCore/QTemporaryFile>
-#endif
+#include <QImage>
+#include <QSysInfo>
+#include <QApplication>
+#include <QMutex>
+#include <QtEndian>
+#include <QTemporaryFile>
+#include <QLocale>
 
 #ifdef USE_EXIF
 #include <libexif/exif-data.h>
@@ -59,16 +49,16 @@ extern "C" {
 
 #ifdef USE_KDE4
 static KComponentData *instance = 0L;
-#elif USE_KDE3
-static KInstance *instance = 0L;
 #endif
 
+static QApplication *app = NULL;
+
 static void qimage_delete( void *data )
 {
        QImage *image = ( QImage * )data;
        delete image;
        image = NULL;
-#if defined(USE_KDE3) || defined(USE_KDE4) 
+#if defined(USE_KDE4)
        if (instance) delete instance;
        instance = 0L;
 #endif
@@ -81,11 +71,6 @@ void init_qimage()
        if ( !instance ) {
            instance = new KComponentData( "qimage_prod" );
        }
-#elif defined(USE_KDE3)
-       if ( !instance ) {
-           instance = new KInstance( "qimage_prod" );
-           KImageIO::registerFormats();
-       }
 #endif
   
 }
@@ -178,13 +163,38 @@ int refresh_qimage( producer_qimage self, mlt_frame frame )
        sprintf( image_key, "%d", image_idx );
 
        int disable_exif = mlt_properties_get_int( producer_props, "disable_exif" );
+       
+       
+       if ( app == NULL ) 
+       {
+               if ( qApp ) 
+               {
+                       app = qApp;
+               }
+               else 
+               {
+#ifdef linux
+                       if ( getenv("DISPLAY") == 0 )
+                       {
+                               mlt_log_panic( MLT_PRODUCER_SERVICE( producer ), "Error, cannot render titles without an X11 environment.\nPlease either run melt from an X session or use a fake X server like xvfb:\nxvfb-run -a melt (...)\n" );
+                               return -1;
+                       }
+#endif
+                       int argc = 1;
+                       char* argv[1];
+                       argv[0] = (char*) "xxx";
+                       app = new QApplication( argc, argv );
+                       const char *localename = mlt_properties_get_lcnumeric( MLT_SERVICE_PROPERTIES( MLT_PRODUCER_SERVICE( producer ) ) );
+                       QLocale::setDefault( QLocale( localename ) );
+               }
+       }
 
        if ( image_idx != self->qimage_idx )
                self->qimage = NULL;
        if ( !self->qimage || mlt_properties_get_int( producer_props, "_disable_exif" ) != disable_exif )
        {
                self->current_image = NULL;
-               QImage *qimage = new QImage( mlt_properties_get_value( self->filenames, image_idx ) );
+               QImage *qimage = new QImage( QString::fromUtf8( mlt_properties_get_value( self->filenames, image_idx ) ) );
                self->qimage = qimage;
 
                if ( !qimage->isNull( ) )
@@ -249,7 +259,6 @@ void refresh_image( producer_qimage self, mlt_frame frame, mlt_image_format form
                        || strcmp( interps, "bicubic" ) == 0 )
                        interp = 1;
 
-#ifdef USE_QT4
                // Note - the original qimage is already safe and ready for destruction
                if ( qimage->depth() == 1 )
                {
@@ -261,14 +270,6 @@ void refresh_image( producer_qimage self, mlt_frame frame, mlt_image_format form
                QImage scaled = interp == 0 ? qimage->scaled( QSize( width, height ) ) :
                        qimage->scaled( QSize(width, height), Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
                int has_alpha = scaled.hasAlphaChannel();
-#endif
-
-#ifdef USE_QT3
-               // Note - the original qimage is already safe and ready for destruction
-               QImage scaled = interp == 0 ? qimage->scale( width, height, QImage::ScaleFree ) :
-                       qimage->smoothScale( width, height, QImage::ScaleFree );
-               self->has_alpha = 1;
-#endif
 
                // Store width and height
                self->current_width = width;