From 9a4419b617a931aa96ce6aa5b7f13a0af209dd31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sun, 12 Jul 2015 12:10:55 +0200
Subject: Fix FTBFS with clang
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 ksquirrel/ksquirrelpart/sq_glwidget_helpers.cpp | 1 +
 ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp   | 6 +++++-
 ksquirrel/sq_glwidget_helpers.cpp               | 1 +
 ksquirrel/sq_glwidget_stuff.cpp                 | 6 +++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_helpers.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_helpers.cpp
index b407a86..0dd96c0 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget_helpers.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget_helpers.cpp
@@ -25,6 +25,7 @@
 #include <tqpointarray.h>
 
 #include <algorithm>
+#include <cstdlib>
 
 #include <tdetoolbar.h>
 
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
index d1e2f92..40ce9ee 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
@@ -544,7 +544,7 @@ void SQ_GLWidget::saveAs()
         default: scgetter = SQ_GLHelpers::scanLine0;
     }
 
-    RGBA scan[w];
+    RGBA *scan = new RGBA[w];
     RGBA *data = tab->parts[tab->current].buffer->data();
 
     fmt_image im2 = im;
@@ -563,6 +563,7 @@ void SQ_GLWidget::saveAs()
     if(err != SQE_OK)
     {
         KMessageBox::error(this, i18n("Error writing image"));
+        delete [] scan;
         return;
     }
 
@@ -571,6 +572,7 @@ void SQ_GLWidget::saveAs()
     if(err != SQE_OK)
     {
         KMessageBox::error(this, i18n("Error writing image"));
+        delete [] scan;
         return;
     }
 
@@ -593,11 +595,13 @@ void SQ_GLWidget::saveAs()
         {
             wlib->codec->write_close();
             KMessageBox::error(this, i18n("Error writing image"));
+            delete [] scan;
             return;
         }
     }
 
     wlib->codec->write_close();
+    delete [] scan;
 
     // copy to non-local directory
     if(!url.isLocalFile())
diff --git a/ksquirrel/sq_glwidget_helpers.cpp b/ksquirrel/sq_glwidget_helpers.cpp
index b407a86..0dd96c0 100644
--- a/ksquirrel/sq_glwidget_helpers.cpp
+++ b/ksquirrel/sq_glwidget_helpers.cpp
@@ -25,6 +25,7 @@
 #include <tqpointarray.h>
 
 #include <algorithm>
+#include <cstdlib>
 
 #include <tdetoolbar.h>
 
diff --git a/ksquirrel/sq_glwidget_stuff.cpp b/ksquirrel/sq_glwidget_stuff.cpp
index d1e2f92..40ce9ee 100644
--- a/ksquirrel/sq_glwidget_stuff.cpp
+++ b/ksquirrel/sq_glwidget_stuff.cpp
@@ -544,7 +544,7 @@ void SQ_GLWidget::saveAs()
         default: scgetter = SQ_GLHelpers::scanLine0;
     }
 
-    RGBA scan[w];
+    RGBA *scan = new RGBA[w];
     RGBA *data = tab->parts[tab->current].buffer->data();
 
     fmt_image im2 = im;
@@ -563,6 +563,7 @@ void SQ_GLWidget::saveAs()
     if(err != SQE_OK)
     {
         KMessageBox::error(this, i18n("Error writing image"));
+        delete [] scan;
         return;
     }
 
@@ -571,6 +572,7 @@ void SQ_GLWidget::saveAs()
     if(err != SQE_OK)
     {
         KMessageBox::error(this, i18n("Error writing image"));
+        delete [] scan;
         return;
     }
 
@@ -593,11 +595,13 @@ void SQ_GLWidget::saveAs()
         {
             wlib->codec->write_close();
             KMessageBox::error(this, i18n("Error writing image"));
+            delete [] scan;
             return;
         }
     }
 
     wlib->codec->write_close();
+    delete [] scan;
 
     // copy to non-local directory
     if(!url.isLocalFile())
-- 
cgit v1.2.3