Fix compilation with Qt < 4.7

svn path=/trunk/kdenlive/; revision=5620

diff --git a/src/kthumb.cpp b/src/kthumb.cpp
index 1a953d5a1e903caf025a228844191252496532b3..bde533a5f47d8cec363f03a72ce2fdbd58dc9604 100644 (file)
--- a/src/kthumb.cpp
+++ b/src/kthumb.cpp
@@ -153,7 +153,7 @@ QPixmap KThumb::getImage(KUrl url, int frame, int width, int height)
 QImage KThumb::getFrame(Mlt::Producer *producer, int framepos, int width, int height)
 {
     QImage p(width, height, QImage::Format_ARGB32_Premultiplied);
-    if (producer == NULL) {
+    if (producer == NULL || !producer->is_valid()) {
         p.fill(Qt::red);
         return p;
     }
@@ -207,13 +207,21 @@ uint KThumb::imageVariance(QImage image )
     // First pass: get pivots and taking average
     for( uint i=0; i<STEPS ; i++ ){
         pivot[i] = bits[2 * i];
+#if QT_VERSION >= 0x040700
         avg+=pivot.at(i);
+#else
+        avg+=pivot[i];
+#endif
     }
     avg=avg/STEPS;
     // Second Step: calculate delta (average?)
     for (uint i=0; i<STEPS; i++)
     {
+#if QT_VERSION >= 0x040700
         int curdelta=abs(int(avg - pivot.at(i)));
+#else
+        int curdelta=abs(int(avg - pivot[i]));
+#endif
         delta+=curdelta;
     }
     return delta/STEPS;

diff --git a/thumbnailer/westleypreview.cpp b/thumbnailer/westleypreview.cpp
index a68787526576115daa26996ed70062aeb002f6b1..8512b60f9d1b483dd90fd9edece4942924f13edc 100644 (file)
--- a/thumbnailer/westleypreview.cpp
+++ b/thumbnailer/westleypreview.cpp
@@ -130,13 +130,21 @@ uint MltPreview::imageVariance(QImage image)
     // First pass: get pivots and taking average
     for( uint i=0; i<STEPS ; i++ ){
         pivot[i] = bits[2 * i];
+#if QT_VERSION >= 0x040700
         avg+=pivot.at(i);
+#else
+        avg+=pivot[i];
+#endif
     }
     avg=avg/STEPS;
     // Second Step: calculate delta (average?)
     for (uint i=0; i<STEPS; i++)
     {
+#if QT_VERSION >= 0x040700
         int curdelta=abs(int(avg - pivot.at(i)));
+#else
+        int curdelta=abs(int(avg - pivot[i]));
+#endif
         delta+=curdelta;
     }
     return delta / STEPS;