Make it work on macOS and update to QT 6.x

.gitignore

@@ -1,2 +1,8 @@
-
+*.o
+moc_*.cpp
+moc_predefs.h
+ui_*.h
+qrc_*.cpp
+Makefile
+*.pro.user.*
 *.user

mainwindow.cpp

@@ -85,15 +85,12 @@ void MainWindow::on_renderButton_clicked()
             depth_image.invertPixels();
         const QImage *eye_helper_left=0;
         const QImage *eye_helper_right=0;
-        bool show_helpers=false;
-        bool margin_helpers = false;
+        bool show_helpers = ui->show_helpers->isChecked();
+        bool margin_helpers = show_helpers && ui->margin_helpers->isChecked();
         QImage eye_helper_image_left=ui->helpers_image->getImage();
         QImage eye_helper_image_right;
-        if (ui->show_helpers->isChecked())
+        if (show_helpers)
         {
-            show_helpers=true;
-            margin_helpers = ui->margin_helpers->isChecked();
-            if (ui->show_helpers->isChecked())
             if(!eye_helper_image_left.isNull())
             {
                 if (ui->dual_helpers->isChecked())

model3d.cpp

@@ -4,7 +4,7 @@
 #include <OpenGL/gl.h>
 #include <qopenglext.h>
 #else
-#include "qgl.h"
+#include <qopengl.h>
 #endif
 #include <stdio.h>
 #include <math.h>

stereograma.pro

@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core gui network opengl widgets
+QT       += core gui network openglwidgets
 
 TARGET = stereograma
 TEMPLATE = app
@@ -14,6 +14,8 @@ win32:LIBS += -lGLU32 -lOpengl32
 win32:RC_FILE = icon_res.rc
 win32:QMAKE_CXXFLAGS += -Wa,-mbig-obj
 DEFINES+= USE_FLOAT
+#QMAKE_CXXFLAGS += -fsanitize=address
+#QMAKE_LFLAGS += -fsanitize=address
 
 SOURCES += main.cpp\
     ClickableLabel.cpp \

stereomaker.cpp

@@ -8,7 +8,12 @@ QVector<QRgb> StereoMaker::grayscale;
 
 StereoMaker::StereoMaker()
 {
-    depthsep=(int*)malloc(256*sizeof(int));
+    depthsep= new int [256];
+}
+
+StereoMaker::~StereoMaker()
+{
+    delete [] depthsep;
 }
 
 void StereoMaker::composeDepth(QImage & depth,QImage & compose,float compose_height)
@@ -100,8 +105,8 @@ QImage StereoMaker::render(const QImage & map, const QImage & ptrn, Preset *pset
 
     int x, left;
     int y, right;
-    int *lookL =(int*) malloc(vwidth*sizeof(int));
-    int *lookR =(int*) malloc(vwidth*sizeof(int));
+    int *lookL = new int [vwidth];
+    int *lookR = new int [vwidth];
 
     int dpi = psettings->getDotsPerInch();
     int yShift=dpi/16;
@@ -151,7 +156,7 @@ QImage StereoMaker::render(const QImage & map, const QImage & ptrn, Preset *pset
     //benchmark
     QElapsedTimer t_time;
     t_time.start();
-    unsigned int **patternptr=(unsigned int **)malloc(pattern_height*sizeof(void*));
+    unsigned int **patternptr= new unsigned int *[pattern_height];
     for (int i=pattern_height-1;i>=0;i--)
     {
         patternptr[i]=(unsigned int*)pattern.scanLine(i);
@@ -255,7 +260,7 @@ QImage StereoMaker::render(const QImage & map, const QImage & ptrn, Preset *pset
         }
 
 
-        CurResultScaledLine = CurResultLine.scaledToWidth(width,Qt::SmoothTransformation);
+        CurResultScaledLine = CurResultLine.scaled(width, 1, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
         memcpy(result.scanLine(y+rh),CurResultScaledLine.scanLine(0),result.bytesPerLine());
         if (progbarval!=10*y/(height-1))
         {
@@ -264,10 +269,10 @@ QImage StereoMaker::render(const QImage & map, const QImage & ptrn, Preset *pset
         }
     }
     qDebug("Time elapsed: %lld ms", t_time.elapsed());
-    free(lookL);
-    free(lookR);
+    delete [] lookL;
+    delete [] lookR;
     free(mapptr);
-    free(patternptr);
+    delete [] patternptr;
     if (show_helper)
     {
         QPainter painter(&result);
@@ -289,11 +294,10 @@ QImage StereoMaker::render(const QImage & map, const QImage & ptrn, Preset *pset
         {
             rh = 30;
         }
-        if (eye_helper_left!=0)
+        if (eye_helper_left != 0 && eye_helper_right != 0)
         {
             painter.drawImage(QPoint(result.width()/2-rect_sep/2-rw/2,rh/6),*eye_helper_left);
             painter.drawImage(QPoint(result.width()/2+rect_sep/2-rw/2,rh/6),*eye_helper_right);
-
         }
         else
         {

stereomaker.h

@@ -10,6 +10,7 @@ class StereoMaker
 {
 public:
     StereoMaker();
+    ~StereoMaker();
     QImage render(const QImage & dmap,const QImage & ptrn,Preset *psettings,QProgressBar * qpbar,const QImage * eye_helper_right,const QImage * eye_helper_left,bool show_helper, bool helpers_margin);
     void composeDepth(QImage & depth,QImage & compose, float composeHeight);
     static const QVector<QRgb> & getGrayScale();