1 files changed, 34 insertions, 26 deletions

diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index 28e9173bf7..b772ed97d2 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -354,7 +354,7 @@ void QQuickCanvasItem::setContextType(const QString &contextType)
         return;
 
     if (d->context) {
-        qmlInfo(this) << "Canvas already initialized with a different context type";
+        qmlWarning(this) << "Canvas already initialized with a different context type";
         return;
     }
 
@@ -517,7 +517,7 @@ void QQuickCanvasItem::setRenderTarget(QQuickCanvasItem::RenderTarget target)
     Q_D(QQuickCanvasItem);
     if (d->renderTarget != target) {
         if (d->context) {
-            qmlInfo(this) << "Canvas:renderTarget not changeble once context is active.";
+            qmlWarning(this) << "Canvas:renderTarget not changeble once context is active.";
             return;
         }
 
@@ -561,7 +561,7 @@ void QQuickCanvasItem::setRenderStrategy(QQuickCanvasItem::RenderStrategy strate
     Q_D(QQuickCanvasItem);
     if (d->renderStrategy != strategy) {
         if (d->context) {
-            qmlInfo(this) << "Canvas:renderStrategy not changeable once context is active.";
+            qmlWarning(this) << "Canvas:renderStrategy not changeable once context is active.";
             return;
         }
         d->renderStrategy = strategy;
@@ -839,13 +839,13 @@ void QQuickCanvasItem::getContext(QQmlV4Function *args)
     QV4::Scope scope(args->v4engine());
     QV4::ScopedString str(scope, (*args)[0]);
     if (!str) {
-        qmlInfo(this) << "getContext should be called with a string naming the required context type";
+        qmlWarning(this) << "getContext should be called with a string naming the required context type";
         args->setReturnValue(QV4::Encode::null());
         return;
     }
 
     if (!d->available) {
-        qmlInfo(this) << "Unable to use getContext() at this time, please wait for available: true";
+        qmlWarning(this) << "Unable to use getContext() at this time, please wait for available: true";
         args->setReturnValue(QV4::Encode::null());
         return;
     }
@@ -858,7 +858,7 @@ void QQuickCanvasItem::getContext(QQmlV4Function *args)
             return;
         }
 
-        qmlInfo(this) << "Canvas already initialized with a different context type";
+        qmlWarning(this) << "Canvas already initialized with a different context type";
         args->setReturnValue(QV4::Encode::null());
         return;
     }
@@ -881,7 +881,7 @@ void QQuickCanvasItem::requestAnimationFrame(QQmlV4Function *args)
     QV4::Scope scope(args->v4engine());
     QV4::ScopedFunctionObject f(scope, (*args)[0]);
     if (!f) {
-        qmlInfo(this) << "requestAnimationFrame should be called with an animation callback function";
+        qmlWarning(this) << "requestAnimationFrame should be called with an animation callback function";
         args->setReturnValue(QV4::Encode::null());
         return;
     }
@@ -909,7 +909,7 @@ void QQuickCanvasItem::cancelRequestAnimationFrame(QQmlV4Function *args)
     QV4::Scope scope(args->v4engine());
     QV4::ScopedValue v(scope, (*args)[0]);
     if (!v->isInteger()) {
-        qmlInfo(this) << "cancelRequestAnimationFrame should be called with an animation callback id";
+        qmlWarning(this) << "cancelRequestAnimationFrame should be called with an animation callback id";
         args->setReturnValue(QV4::Encode::null());
         return;
     }
@@ -1094,6 +1094,27 @@ QImage QQuickCanvasItem::toImage(const QRectF& rect) const
     return QImage();
 }
 
+static const char* mimeToType(const QString &mime)
+{
+    const QLatin1String imagePrefix("image/");
+    if (!mime.startsWith(imagePrefix))
+        return nullptr;
+    const QStringRef mimeExt = mime.midRef(imagePrefix.size());
+    if (mimeExt == QLatin1String("png"))
+        return "png";
+    else if (mimeExt == QLatin1String("bmp"))
+        return "bmp";
+    else if (mimeExt == QLatin1String("jpeg"))
+        return "jpeg";
+    else if (mimeExt == QLatin1String("x-portable-pixmap"))
+        return "ppm";
+    else if (mimeExt == QLatin1String("tiff"))
+        return "tiff";
+    else if (mimeExt == QLatin1String("xpm"))
+        return "xpm";
+    return nullptr;
+}
+
 /*!
   \qmlmethod string QtQuick::Canvas::toDataURL(string mimeType)
 
@@ -1111,27 +1132,14 @@ QString QQuickCanvasItem::toDataURL(const QString& mimeType) const
         QByteArray ba;
         QBuffer buffer(&ba);
         buffer.open(QIODevice::WriteOnly);
-        QString mime = mimeType.toLower();
-        QString type;
-        if (mime == QLatin1String("image/png")) {
-            type = QStringLiteral("PNG");
-        } else if (mime == QLatin1String("image/bmp"))
-            type = QStringLiteral("BMP");
-        else if (mime == QLatin1String("image/jpeg"))
-            type = QStringLiteral("JPEG");
-        else if (mime == QLatin1String("image/x-portable-pixmap"))
-            type = QStringLiteral("PPM");
-        else if (mime == QLatin1String("image/tiff"))
-            type = QStringLiteral("TIFF");
-        else if (mime == QLatin1String("image/xpm"))
-            type = QStringLiteral("XPM");
-        else
+        const QString mime = mimeType.toLower();
+        const char* type = mimeToType(mime);
+        if (!type)
             return QStringLiteral("data:,");
 
-        image.save(&buffer, type.toLatin1());
+        image.save(&buffer, type);
         buffer.close();
-        QString dataUrl = QStringLiteral("data:%1;base64,%2");
-        return dataUrl.arg(mime).arg(QLatin1String(ba.toBase64().constData()));
+        return QLatin1String("data:") + mime + QLatin1String(";base64,") + QLatin1String(ba.toBase64().constData());
     }
     return QStringLiteral("data:,");
 }