[packages/luminance-hdr] - updated to 2.5.1 - removed obsolete qprinter patch - added upstream qtwebkit patch (build with Qt5
qboosh
qboosh at pld-linux.org
Sun Jun 25 16:05:43 CEST 2017
commit d8a289900901edb952da7b9e42dce2a8e0cb8265
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jun 25 16:07:08 2017 +0200
- updated to 2.5.1
- removed obsolete qprinter patch
- added upstream qtwebkit patch (build with Qt5WebKit instead of Qt5WebEngine)
- added sse patch (fixes build with sse2 enabled)
luminance-hdr-qprinter.patch | 96 ------------------------
luminance-hdr-qtwebkit.patch | 170 +++++++++++++++++++++++++++++++++++++++++++
luminance-hdr-sse.patch | 68 +++++++++++++++++
luminance-hdr.spec | 44 ++++++-----
4 files changed, 259 insertions(+), 119 deletions(-)
---
diff --git a/luminance-hdr.spec b/luminance-hdr.spec
index f9a9ebd..a7a09fd 100644
--- a/luminance-hdr.spec
+++ b/luminance-hdr.spec
@@ -1,24 +1,22 @@
#
# Conditional build:
-%bcond_with sse # SSE instructions
%bcond_with sse2 # SSE2 instructions
-%ifarch pentium3 pentium4 %{x8664} x32
-%define with_sse 1
-%endif
%ifarch pentium4 %{x8664} x32
%define with_sse2 1
%endif
Summary: Luminance HDR - HDR Image compositor
Summary(pl.UTF-8): Luminance HDR - narzędzie do składania obrazów HDR
Name: luminance-hdr
-Version: 2.4.0
-Release: 2
+Version: 2.5.1
+Release: 1
License: GPL v2+
Group: X11/Applications/Graphics
Source0: http://downloads.sourceforge.net/qtpfsgui/%{name}-%{version}.tar.bz2
-# Source0-md5: b22c9bca0330d80bdec38d37fc94ad93
-Patch0: %{name}-qprinter.patch
+# Source0-md5: 055278df2b370542ea57fcae86455ce5
+# http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-2.5.1-qtwebkit.patch
+Patch0: %{name}-qtwebkit.patch
+Patch1: %{name}-sse.patch
URL: http://qtpfsgui.sourceforge.net/
BuildRequires: CCfits-devel
BuildRequires: OpenEXR-devel >= 2.0.1
@@ -29,6 +27,9 @@ BuildRequires: Qt5Gui-devel >= 5
BuildRequires: Qt5Network-devel >= 5
BuildRequires: Qt5PrintSupport-devel >= 5
BuildRequires: Qt5Sql-devel >= 5
+BuildRequires: Qt5Svg-devel >= 5
+# without qtwebkit patch uses Qt5WebEngine instead of Qt5WebKit
+#BuildRequires: Qt5WebEngine-devel >= 5
BuildRequires: Qt5WebKit-devel >= 5
BuildRequires: Qt5Widgets-devel >= 5
BuildRequires: Qt5Xml-devel >= 5
@@ -69,18 +70,14 @@ Luminance HDR - narzędzie do składania obrazów HDR.
%prep
%setup -q
%patch0 -p1
-
-%if %{without sse2}
-%{__sed} -i -e 's/ -msse2//' cmake/CompilerSettings.cmake
-%endif
-%if %{without sse}
-%{__sed} -i -e 's/ -msse//' cmake/CompilerSettings.cmake
-%endif
+%patch1 -p1
%build
-# "build" dir is already occupied, use other name
-mkdir obj
-cd obj
+mkdir build
+cd build
+%if %{with sse2}
+CXXFLAGS="%{rpmcxxflags} -msse2 -DLUMINANCE_USE_SSE=1"
+%endif
%cmake .. \
-DBUILD_SHARED_LIBS:BOOL=OFF
@@ -89,13 +86,11 @@ cd obj
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} -C obj install \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
# packaged as %doc
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/luminance-hdr/{AUTHORS,Changelog,LICENSE,README}
-# use Qt translations packaged with qt5
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/luminance-hdr/i18n/qt_*.qm
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/luminance-hdr/{AUTHORS,Changelog,LICENSE,README.md}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -108,10 +103,11 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS BUGS Changelog README TODO
+%doc AUTHORS BUGS Changelog README.md TODO
%attr(755,root,root) %{_bindir}/luminance-hdr
%attr(755,root,root) %{_bindir}/luminance-hdr-cli
%dir %{_datadir}/luminance-hdr
+%{_datadir}/luminance-hdr/hdrhtml
%dir %{_datadir}/luminance-hdr/help
%{_datadir}/luminance-hdr/help/en
%dir %{_datadir}/luminance-hdr/i18n
@@ -124,11 +120,13 @@ rm -rf $RPM_BUILD_ROOT
%lang(hu) %{_datadir}/luminance-hdr/i18n/lang_hu.qm
%lang(id) %{_datadir}/luminance-hdr/i18n/lang_id.qm
%lang(it) %{_datadir}/luminance-hdr/i18n/lang_it.qm
+%lang(nl) %{_datadir}/luminance-hdr/i18n/lang_nl.qm
%lang(pl) %{_datadir}/luminance-hdr/i18n/lang_pl.qm
%lang(pt_BR) %{_datadir}/luminance-hdr/i18n/lang_pt_BR.qm
%lang(ro) %{_datadir}/luminance-hdr/i18n/lang_ro.qm
%lang(ru) %{_datadir}/luminance-hdr/i18n/lang_ru.qm
%lang(tr) %{_datadir}/luminance-hdr/i18n/lang_tr.qm
%lang(zh_CN) %{_datadir}/luminance-hdr/i18n/lang_zh.qm
+%{_datadir}/appdata/luminance-hdr.appdata.xml
%{_desktopdir}/luminance-hdr.desktop
%{_iconsdir}/hicolor/48x48/apps/luminance-hdr.png
diff --git a/luminance-hdr-qprinter.patch b/luminance-hdr-qprinter.patch
deleted file mode 100644
index cb076c9..0000000
--- a/luminance-hdr-qprinter.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 07e36ef892343b01bf13545866823e6a55044382 Mon Sep 17 00:00:00 2001
-From: Davide Anastasia <davide.anastasia at gmail.com>
-Date: Mon, 29 Sep 2014 08:06:15 +0100
-Subject: [PATCH] Fix QPrinter support
-
----
- CMakeLists.txt | 25 +++++++++++++------------
- src/HelpBrowser/CMakeLists.txt | 3 +--
- src/HelpBrowser/helpbrowser.cpp | 8 +++++---
- 3 files changed, 19 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1b07692..8a60ad4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,19 +18,20 @@ include(cmake/Internationalization.cmake)
- # to always look for includes there:
- #set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
--find_package(Qt5Core)
--find_package(Qt5Concurrent)
--find_package(Qt5Widgets)
--find_package(Qt5Gui)
--find_package(Qt5Declarative)
--find_package(Qt5WebKit)
--find_package(Qt5WebKitWidgets)
--find_package(Qt5Xml)
--find_package(Qt5Sql)
--find_package(Qt5Network)
--find_package(Qt5LinguistTools)
-+find_package(Qt5Core REQUIRED)
-+find_package(Qt5Concurrent REQUIRED)
-+find_package(Qt5Widgets REQUIRED)
-+find_package(Qt5Gui REQUIRED)
-+find_package(Qt5Declarative REQUIRED)
-+find_package(Qt5WebKit REQUIRED)
-+find_package(Qt5WebKitWidgets REQUIRED)
-+find_package(Qt5Xml REQUIRED)
-+find_package(Qt5Sql REQUIRED)
-+find_package(Qt5Network REQUIRED)
-+find_package(Qt5LinguistTools REQUIRED)
-+find_package(Qt5PrintSupport REQUIRED)
- IF(WIN32)
-- find_package(Qt5WinExtras)
-+ find_package(Qt5WinExtras)
- ENDIF()
-
- # Include the qtmain lib if we are on the windows platform
-diff --git a/src/HelpBrowser/CMakeLists.txt b/src/HelpBrowser/CMakeLists.txt
-index 04319a8..2f4916a 100644
---- a/src/HelpBrowser/CMakeLists.txt
-+++ b/src/HelpBrowser/CMakeLists.txt
-@@ -27,9 +27,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
- QT5_WRAP_CPP(FILES_MOC ${FILES_H})
- QT5_WRAP_UI(FILES_UI_H ${FILES_UI})
-
--
- ADD_LIBRARY(helpbrowser ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H} ${FILES_HXX})
--qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets)
-+qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets PrintSupport)
-
- SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE)
- SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} helpbrowser PARENT_SCOPE)
-diff --git a/src/HelpBrowser/helpbrowser.cpp b/src/HelpBrowser/helpbrowser.cpp
-index bfd2820..ce7f984 100644
---- a/src/HelpBrowser/helpbrowser.cpp
-+++ b/src/HelpBrowser/helpbrowser.cpp
-@@ -30,6 +30,7 @@ for which a new license (GPL+exception) is in place.
- #include "ui_HelpBrowser.h"
- #include "ui_HelpSideBar.h"
-
-+#include <QDebug>
- #include <QAction>
- #include <QBuffer>
- #include <QDir>
-@@ -45,8 +46,6 @@ for which a new license (GPL+exception) is in place.
- #include <QModelIndex>
- #include <QModelIndexList>
- #include <QPainter>
--#include <QPrinter>
--#include <QPrintDialog>
- #include <QProcess>
- #include <QPushButton>
- #include <QString>
-@@ -56,7 +55,10 @@ for which a new license (GPL+exception) is in place.
- #include <QXmlDefaultHandler>
- #include <QDesktopServices>
-
--#include <QDebug>
-+#include <QtPrintSupport/QPrinter>
-+#include <QtPrintSupport/QPrintDialog>
-+
-+
-
- #include "Common/global.h"
- #include "HelpBrowser/schelptreemodel.h"
diff --git a/luminance-hdr-qtwebkit.patch b/luminance-hdr-qtwebkit.patch
new file mode 100644
index 0000000..19935a6
--- /dev/null
+++ b/luminance-hdr-qtwebkit.patch
@@ -0,0 +1,170 @@
+diff -rupN luminance-hdr-2.5.1/CMakeLists.txt luminance-hdr-2.5.1-new/CMakeLists.txt
+--- luminance-hdr-2.5.1/CMakeLists.txt 2017-05-10 21:14:06.000000000 +0200
++++ luminance-hdr-2.5.1-new/CMakeLists.txt 2017-05-11 00:30:33.387938670 +0200
+@@ -38,8 +38,8 @@ find_package(Qt5Core REQUIRED)
+ find_package(Qt5Concurrent REQUIRED)
+ find_package(Qt5Widgets REQUIRED)
+ find_package(Qt5Gui REQUIRED)
+-find_package(Qt5WebEngineCore REQUIRED)
+-find_package(Qt5WebEngineWidgets REQUIRED)
++find_package(Qt5WebKit REQUIRED)
++find_package(Qt5WebKitWidgets REQUIRED)
+ find_package(Qt5Xml REQUIRED)
+ find_package(Qt5Sql REQUIRED)
+ find_package(Qt5Svg REQUIRED)
+@@ -57,7 +57,7 @@ ENDIF(WIN32)
+
+ set(LIBS ${LIBS}
+ ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES}
+- ${QT_QTWEBENGINE_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})
++ ${QT_QTWEBKIT_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})
+
+ FIND_PACKAGE(Git)
+ IF(GIT_FOUND)
+diff -rupN luminance-hdr-2.5.1/src/HelpBrowser/CMakeLists.txt luminance-hdr-2.5.1-new/src/HelpBrowser/CMakeLists.txt
+--- luminance-hdr-2.5.1/src/HelpBrowser/CMakeLists.txt 2017-05-10 21:14:06.000000000 +0200
++++ luminance-hdr-2.5.1-new/src/HelpBrowser/CMakeLists.txt 2017-05-11 00:30:33.387938670 +0200
+@@ -28,7 +28,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H})
+ QT5_WRAP_UI(FILES_UI_H ${FILES_UI})
+
+ ADD_LIBRARY(helpbrowser ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H} ${FILES_HXX})
+-qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebEngineCore WebEngineWidgets PrintSupport)
++qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets PrintSupport)
+
+ SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE)
+ SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} helpbrowser PARENT_SCOPE)
+diff -rupN luminance-hdr-2.5.1/src/HelpBrowser/helpbrowser.cpp luminance-hdr-2.5.1-new/src/HelpBrowser/helpbrowser.cpp
+--- luminance-hdr-2.5.1/src/HelpBrowser/helpbrowser.cpp 2017-05-10 21:14:06.000000000 +0200
++++ luminance-hdr-2.5.1-new/src/HelpBrowser/helpbrowser.cpp 2017-05-11 00:32:39.449108102 +0200
+@@ -166,8 +166,6 @@ HelpBrowser::HelpBrowser(QWidget* parent
+ HelpBrowser::HelpBrowser( QWidget* parent, const QString& /*caption*/, const QString& guiLanguage, const QString& jumpToSection, const QString& jumpToFile):
+ QMainWindow( parent ),
+ zoomFactor(1.0),
+- //m_textBrowser(new QTextDocument),
+- m_textBrowser(new QTextBrowser),
+ m_Ui(new Ui::HelpBrowser)
+ {
+ m_Ui->setupUi(this);
+@@ -347,13 +345,6 @@ void HelpBrowser::languageChange()
+
+ void HelpBrowser::print()
+ {
+- /* TODO With this method images aren't loaded so I'm passing the html page to a QTextBrowser
+- m_Ui->htmlPage->page()->toHtml([this](const QString &result){
+- this->m_textBrowser->setHtml(result);
+- this->printAvailable();
+- });
+- */
+- m_textBrowser->setSource(m_Ui->htmlPage->page()->url());
+ this->printAvailable();
+ }
+
+@@ -365,19 +356,12 @@ void HelpBrowser::printAvailable()
+ if (dialog.exec())
+ {
+
+- m_textBrowser->print(&printer);
++ m_Ui->htmlPage->print(&printer);
+ }
+ }
+
+ void HelpBrowser::printPreview()
+ {
+- /* TODO With this method images aren't loaded so I'm passing the html page to a QTextBrowser
+- m_Ui->htmlPage->page()->toHtml([this](const QString &result){
+- this->m_textBrowser->setHtml(result);
+- this->printPreviewAvailable();
+- });
+- */
+- m_textBrowser->setSource(m_Ui->htmlPage->page()->url());
+ this->printPreviewAvailable();
+ }
+
+@@ -392,7 +376,7 @@ void HelpBrowser::printPreviewAvailable(
+
+ void HelpBrowser::paintRequested(QPrinter *printer)
+ {
+- m_textBrowser->print(printer);
++ m_Ui->htmlPage->print(printer);
+ }
+
+ void HelpBrowser::searchingButton_clicked()
+@@ -789,6 +773,6 @@ void HelpBrowser::loadFinished(bool) {
+ statusBar()->showMessage("");
+ }
+
+-void HelpBrowser::linkHovered (const QString &url) {
++void HelpBrowser::linkHovered (const QString &url, const QString &, const QString &) {
+ statusBar()->showMessage(url);
+ }
+diff -rupN luminance-hdr-2.5.1/src/HelpBrowser/helpbrowser.h luminance-hdr-2.5.1-new/src/HelpBrowser/helpbrowser.h
+--- luminance-hdr-2.5.1/src/HelpBrowser/helpbrowser.h 2017-05-10 21:14:06.000000000 +0200
++++ luminance-hdr-2.5.1-new/src/HelpBrowser/helpbrowser.h 2017-05-11 00:40:22.531057038 +0200
+@@ -64,8 +64,6 @@
+ #include <QXmlInputSource>
+ #include <QEvent>
+ #include <QTreeWidgetItem>
+-//#include <QTextEdit>
+-#include <QTextBrowser>
+
+ class ScHelpTreeModel;
+ class QPrinter;
+@@ -132,10 +130,6 @@ protected:
+ QMap<QString, QString> quickHelpIndex;
+ QMap<QString, QPair<QString, QString> > bookmarkIndex;
+
+- // I need to keep this around because page()->toHtml( <callback> ) is asynchronous
+- //QSharedPointer<QTextDocument> m_textDocument;
+- QSharedPointer<QTextBrowser> m_textBrowser;
+-
+ protected slots:
+ virtual void languageChange();
+ void histChosen(QAction* i);
+@@ -215,7 +209,7 @@ protected slots:
+
+ /*! \brief Restore Default Cursor */
+ void loadFinished(bool);
+- void linkHovered (const QString &);
++ void linkHovered (const QString &, const QString &, const QString &);
+ signals:
+ void closed();
+
+diff -rupN luminance-hdr-2.5.1/src/HelpBrowser/sctextbrowser.cpp luminance-hdr-2.5.1-new/src/HelpBrowser/sctextbrowser.cpp
+--- luminance-hdr-2.5.1/src/HelpBrowser/sctextbrowser.cpp 2017-05-10 21:14:06.000000000 +0200
++++ luminance-hdr-2.5.1-new/src/HelpBrowser/sctextbrowser.cpp 2017-05-11 00:33:42.085695414 +0200
+@@ -57,7 +57,7 @@ for which a new license (GPL+exception)
+ #include "sctextbrowser.h"
+
+ ScTextBrowser::ScTextBrowser( QWidget * parent )
+- : QWebEngineView(parent)
++ : QWebView(parent)
+ {
+ }
+
+diff -rupN luminance-hdr-2.5.1/src/HelpBrowser/sctextbrowser.h luminance-hdr-2.5.1-new/src/HelpBrowser/sctextbrowser.h
+--- luminance-hdr-2.5.1/src/HelpBrowser/sctextbrowser.h 2017-05-10 21:14:06.000000000 +0200
++++ luminance-hdr-2.5.1-new/src/HelpBrowser/sctextbrowser.h 2017-05-11 00:30:33.390938650 +0200
+@@ -45,9 +45,9 @@ for which a new license (GPL+exception)
+ #define SCTEXTBROWSER_H
+
+ #include <QUrl>
+-#include <QWebEngineView>
++#include <QWebView>
+
+-class ScTextBrowser : public QWebEngineView
++class ScTextBrowser : public QWebView
+ {
+ Q_OBJECT
+ QUrl m_home;
+diff -rupN luminance-hdr-2.5.1/src/UI/CMakeLists.txt luminance-hdr-2.5.1-new/src/UI/CMakeLists.txt
+--- luminance-hdr-2.5.1/src/UI/CMakeLists.txt 2017-05-10 21:14:06.000000000 +0200
++++ luminance-hdr-2.5.1-new/src/UI/CMakeLists.txt 2017-05-11 00:30:33.391938643 +0200
+@@ -47,7 +47,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H})
+ QT5_WRAP_UI(FILES_UI_H ${FILES_UI})
+
+ ADD_LIBRARY(ui ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H})
+-qt5_use_modules(ui Core Concurrent Gui Widgets WebEngineWidgets)
++qt5_use_modules(ui Core Concurrent Gui Widgets WebKitWidgets)
+
+ SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} PARENT_SCOPE)
+ SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} ui PARENT_SCOPE)
diff --git a/luminance-hdr-sse.patch b/luminance-hdr-sse.patch
new file mode 100644
index 0000000..94778f2
--- /dev/null
+++ b/luminance-hdr-sse.patch
@@ -0,0 +1,68 @@
+--- luminance-hdr-2.5.1/src/TonemappingOperators/mantiuk08/display_function.h.orig 2017-05-10 21:14:06.000000000 +0200
++++ luminance-hdr-2.5.1/src/TonemappingOperators/mantiuk08/display_function.h 2017-06-25 08:34:32.605245903 +0200
+@@ -38,6 +38,10 @@
+ #include "Libpfs/utils/sse.h"
+ #include <Libpfs/exception.h>
+
++#ifdef LUMINANCE_USE_SSE
++using pfs::utils::v4sf;
++#endif
++
+ class DisplayFunction
+ {
+ public:
+--- luminance-hdr-2.5.1/src/Libpfs/utils/sse.cpp.orig 2017-05-10 21:14:06.000000000 +0200
++++ luminance-hdr-2.5.1/src/Libpfs/utils/sse.cpp 2017-06-25 09:17:55.551882851 +0200
+@@ -23,6 +23,7 @@
+ //! @author Davide Anastasia, <davideanastasia at users.sourceforge.net>
+
+ #include <Libpfs/utils/numeric.h>
++#include <Libpfs/utils/sse.h>
+
+ namespace pfs {
+ namespace utils {
+--- luminance-hdr-2.5.1/src/Libpfs/utils/sse.h.orig 2017-05-10 21:14:06.000000000 +0200
++++ luminance-hdr-2.5.1/src/Libpfs/utils/sse.h 2017-06-25 09:32:27.331872888 +0200
+@@ -25,9 +25,6 @@
+ #ifndef PFS_UTILS_SSE_H
+ #define PFS_UTILS_SSE_H
+
+-namespace pfs {
+-namespace utils {
+-
+ #ifdef __SSE__
+
+ //#if __ppc__ || __ppc7400__ || __ppc64__ || __ppc970__
+@@ -46,6 +43,9 @@
+
+ #endif // __SSE__
+
++namespace pfs {
++namespace utils {
++
+ #ifdef LUMINANCE_USE_SSE
+ typedef __v4sf v4sf;
+ v4sf _mm_log2_ps(v4sf);
+--- luminance-hdr-2.5.1/src/TonemappingOperators/mantiuk08/display_adaptive_tmo.cpp.orig 2017-05-10 21:14:06.000000000 +0200
++++ luminance-hdr-2.5.1/src/TonemappingOperators/mantiuk08/display_adaptive_tmo.cpp 2017-06-25 09:43:53.761865057 +0200
+@@ -156,6 +156,9 @@
+
+ #ifdef LUMINANCE_USE_SSE
+
++using pfs::utils::_mm_log2_ps;
++using pfs::utils::_mm_pow_ps;
++
+ #define LOG2_10 3.3219280948874f
+ #define LOG2_10__1 (1.0f/LOG2_10)
+ static inline v4sf safe_log10( v4sf x, const float min_x = MIN_PHVAL, const float max_x = MAX_PHVAL )
+--- luminance-hdr-2.5.1/src/TonemappingOperators/mantiuk08/display_function.cpp.orig 2017-05-10 21:14:06.000000000 +0200
++++ luminance-hdr-2.5.1/src/TonemappingOperators/mantiuk08/display_function.cpp 2017-06-25 09:44:55.215197686 +0200
+@@ -95,6 +95,8 @@
+
+ #ifdef LUMINANCE_USE_SSE
+
++using pfs::utils::_mm_pow_ps;
++
+ v4sf DisplayFunctionGGBA::inv_display( v4sf L )
+ {
+ const v4sf voffset = _mm_set1_ps(L_offset);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/luminance-hdr.git/commitdiff/d8a289900901edb952da7b9e42dce2a8e0cb8265
More information about the pld-cvs-commit
mailing list