summaryrefslogtreecommitdiffstats
path: root/graphics/nomacs
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/nomacs')
-rw-r--r--graphics/nomacs/imagestore.patch27
-rw-r--r--graphics/nomacs/missed-includes.patch28
-rw-r--r--graphics/nomacs/nomacs.SlackBuild2
3 files changed, 57 insertions, 0 deletions
diff --git a/graphics/nomacs/imagestore.patch b/graphics/nomacs/imagestore.patch
new file mode 100644
index 0000000000..9e86c4ad01
--- /dev/null
+++ b/graphics/nomacs/imagestore.patch
@@ -0,0 +1,27 @@
+Description: Fixed logPolar
+ just copied the new line from upstream
+Author: Alf Gaida <agaida@siduction.org>
+Last-Update: 2020-02-08
+
+--- nomacs-3.12.0+dfsg.orig/src/DkCore/DkImageStorage.cpp
++++ nomacs-3.12.0+dfsg/src/DkCore/DkImageStorage.cpp
+@@ -1424,7 +1424,7 @@ void DkImage::mapGammaTable(cv::Mat& img
+ qDebug() << "gamma computation takes: " << dt;
+ }
+
+-void DkImage::logPolar(const cv::Mat& src, cv::Mat& dst, CvPoint2D32f center, double scaleLog, double angle, double scale) {
++void DkImage::logPolar(const cv::Mat& src, cv::Mat& dst, cv::Point2d center, double scaleLog, double angle, double scale) {
+
+ cv::Mat mapx, mapy;
+
+
+--- nomacs-3.12.0+dfsg.orig/src/DkCore/DkImageStorage.h
++++ nomacs-3.12.0+dfsg/src/DkCore/DkImageStorage.h
+@@ -95,7 +95,7 @@ public:
+ static void mapGammaTable(cv::Mat& img, const QVector<unsigned short>& gammaTable);
+ static void gammaToLinear(cv::Mat& img);
+ static void linearToGamma(cv::Mat& img);
+- static void logPolar(const cv::Mat& src, cv::Mat& dst, CvPoint2D32f center, double scaleLog, double angle, double scale = 1.0);
++ static void logPolar(const cv::Mat& src, cv::Mat& dst, cv::Point2d center, double scaleLog, double angle, double scale = 1.0);
+ static void tinyPlanet(QImage& img, double scaleLog, double angle, QSize s, bool invert = false);
+ #endif
diff --git a/graphics/nomacs/missed-includes.patch b/graphics/nomacs/missed-includes.patch
new file mode 100644
index 0000000000..c678b4f2ca
--- /dev/null
+++ b/graphics/nomacs/missed-includes.patch
@@ -0,0 +1,28 @@
+Description: Added missed includes
+ just copied the respective upstream lines
+Author: Alf Gaida <agaida@siduction.org>
+
+Last-Update: 2020-02-08
+
+--- nomacs-3.12.0+dfsg.orig/src/DkCore/DkMetaData.cpp
++++ nomacs-3.12.0+dfsg/src/DkCore/DkMetaData.cpp
+@@ -42,6 +42,8 @@
+ #include <QApplication>
+ #pragma warning(pop) // no warnings from includes - end
+
++#include <iostream>
++
+ namespace nmc {
+
+ // DkMetaDataT --------------------------------------------------------------------
+--- nomacs-3.12.0+dfsg.orig/src/DkGui/DkNoMacs.cpp
++++ nomacs-3.12.0+dfsg/src/DkGui/DkNoMacs.cpp
+@@ -96,6 +96,8 @@
+ #include <QWinTaskbarButton>
+ #endif
+
++#include <iostream>
++
+ namespace nmc {
+
+ DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) {
diff --git a/graphics/nomacs/nomacs.SlackBuild b/graphics/nomacs/nomacs.SlackBuild
index 2d471cc3b4..8d202d0562 100644
--- a/graphics/nomacs/nomacs.SlackBuild
+++ b/graphics/nomacs/nomacs.SlackBuild
@@ -77,6 +77,8 @@ find -L . \
cd ImageLounge
patch -p0 < $CWD/opencv4.diff
+patch -p1 < $CWD/imagestore.patch
+patch -p1 < $CWD/missed-includes.patch
# Fix man pages and plugins installation path
sed -i "s|share\/man|man|" cmake/UnixBuildTarget.cmake || exit 1