v2.9.8

amyspark · Jul 20, 2021 · 32dd1b5 · 32dd1b5
1 parent 75bccb5
commit 32dd1b5
Show file tree

Hide file tree

Showing 300 changed files with 52,442 additions and 64,410 deletions.
diff --git a/README b/README
@@ -12,7 +12,7 @@
 
                              ( https://gmic.eu )
 
-                                    2.9.7
+                                    2.9.8
 
 --------------------------------------------------------------------------------
 

diff --git a/gmic-qt/CMakeLists.txt b/gmic-qt/CMakeLists.txt
@@ -338,14 +338,13 @@ set (gmic_qt_SRCS
   src/FilterThread.h
   src/FilterTextTranslator.h
   src/Globals.h
-  src/gmic_qt.h
+  src/GmicQt.h
   src/GmicStdlib.h
   src/GmicProcessor.h
   src/HeadlessProcessor.h
-  src/Host/host.h
+  src/Host/GmicQtHost.h
   src/HtmlTranslator.h
   src/IconLoader.h
-  src/ImageConverter.h
   src/ImageTools.h
   src/InputOutputState.h
   src/KeypointList.h
@@ -357,6 +356,7 @@ set (gmic_qt_SRCS
   src/TimeLogger.h
   src/Updater.h
   src/Utils.h
+  src/Misc.h
   src/FilterSelector/FiltersView/FilterTreeFolder.h
   src/FilterSelector/FiltersView/FilterTreeItem.h
   src/FilterSelector/FavesModel.h
@@ -411,14 +411,13 @@ set (gmic_qt_SRCS
   src/FilterSyncRunner.cpp
   src/FilterThread.cpp
   src/FilterTextTranslator.cpp
-  src/gmic_qt.cpp
+  src/GmicQt.cpp
   src/Globals.cpp
   src/GmicStdlib.cpp
   src/GmicProcessor.cpp
   src/HeadlessProcessor.cpp
   src/HtmlTranslator.cpp
   src/IconLoader.cpp
-  src/ImageConverter.cpp
   src/ImageTools.cpp
   src/InputOutputState.cpp
   src/KeypointList.cpp
@@ -430,6 +429,7 @@ set (gmic_qt_SRCS
   src/TimeLogger.cpp
   src/Updater.cpp
   src/Utils.cpp
+  src/Misc.cpp
   src/FilterSelector/FiltersView/FilterTreeItem.cpp
   src/FilterSelector/FiltersView/FilterTreeFolder.cpp
   src/FilterSelector/FavesModel.cpp
@@ -446,6 +446,20 @@ set (gmic_qt_SRCS
   src/Widgets/ProgressInfoWindow.cpp
 )
 
+set (gmic_qt_FORMS
+  ui/dialogsettings.ui
+  ui/filtersview.ui
+  ui/headlessprogressdialog.ui
+  ui/inoutpanel.ui
+  ui/languageselectionwidget.ui
+  ui/mainwindow.ui
+  ui/multilinetextparameterwidget.ui
+  ui/progressinfowidget.ui
+  ui/progressinfowindow.ui
+  ui/SearchFieldWidget.ui
+  ui/zoomlevelselector.ui
+)
+
 if(ENABLE_DYNAMIC_LINKING)
   set(CMAKE_SKIP_RPATH TRUE)
   set(gmic_qt_LIBRARIES
@@ -460,22 +474,7 @@ else(ENABLE_DYNAMIC_LINKING)
     )
 endif(ENABLE_DYNAMIC_LINKING)
 
-qt5_wrap_ui(gmic_qt_SRCS
-  ui/dialogsettings.ui
-  ui/filtersview.ui
-  ui/headlessprogressdialog.ui
-  ui/inoutpanel.ui
-  ui/languageselectionwidget.ui
-  ui/mainwindow.ui
-  ui/multilinetextparameterwidget.ui
-  ui/progressinfowidget.ui
-  ui/progressinfowindow.ui
-  ui/SearchFieldWidget.ui
-  ui/zoomlevelselector.ui
-)
-
 set(gmic_translation_files
-
     translations/cs.ts
     translations/de.ts
     translations/es.ts
@@ -530,6 +529,7 @@ if (${GMIC_QT_HOST} STREQUAL "gimp" OR ${GMIC_QT_HOST} STREQUAL "gimp3")
     execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} gimp-${TARGET_GIMP_VERSION}.0 --define-variable=prefix=${CMAKE_INSTALL_PREFIX} --variable gimplibdir OUTPUT_VARIABLE GIMP_PKGLIBDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 
     set (gmic_qt_SRCS ${gmic_qt_SRCS} src/Host/Gimp/host_gimp.cpp)
+    qt5_wrap_ui(gmic_qt_SRCS ${gmic_qt_FORMS})
     add_definitions(-DGMIC_HOST=gimp -DGIMP_DISABLE_DEPRECATED)
     add_executable(gmic_gimp_qt ${gmic_qt_SRCS} ${gmic_qt_QRC} ${qmic_qt_QM})
     target_link_libraries(
@@ -543,6 +543,7 @@ if (${GMIC_QT_HOST} STREQUAL "gimp" OR ${GMIC_QT_HOST} STREQUAL "gimp3")
 elseif (${GMIC_QT_HOST} STREQUAL "krita")
 
     set (gmic_qt_SRCS ${gmic_qt_SRCS} src/Host/Krita/host_krita.cpp)
+    qt5_wrap_ui(gmic_qt_SRCS ${gmic_qt_FORMS})
     add_definitions(-DGMIC_HOST=krita)
     add_executable(gmic_krita_qt ${gmic_qt_SRCS} ${gmic_qt_QRC} ${qmic_qt_QM})
     target_link_libraries(
@@ -554,26 +555,37 @@ elseif (${GMIC_QT_HOST} STREQUAL "krita")
 
 elseif (${GMIC_QT_HOST} STREQUAL "none")
 
-    set (gmic_qt_SRCS ${gmic_qt_SRCS} src/Host/None/host_none.cpp src/Host/None/ImageDialog.h src/Host/None/ImageDialog.cpp)
-    add_definitions(-DGMIC_HOST=standalone)
-    add_executable(gmic_qt ${gmic_qt_SRCS} ${gmic_qt_QRC}  ${qmic_qt_QM})
-    target_link_libraries(gmic_qt PRIVATE ${gmic_qt_LIBRARIES})
-    install(TARGETS gmic_qt RUNTIME DESTINATION bin)
+  set (gmic_qt_SRCS ${gmic_qt_SRCS}
+    src/Host/None/host_none.cpp
+    src/Host/None/ImageDialog.h
+    src/Host/None/ImageDialog.cpp
+    src/Host/None/JpegQualityDialog.h
+    src/Host/None/JpegQualityDialog.cpp
+    )
+  set(gmic_qt_FORMS ${gmic_qt_FORMS}
+    src/Host/None/jpegqualitydialog.ui
+    )
+  qt5_wrap_ui(gmic_qt_SRCS ${gmic_qt_FORMS})
+  add_definitions(-DGMIC_HOST=standalone)
+  add_executable(gmic_qt ${gmic_qt_SRCS} ${gmic_qt_QRC}  ${qmic_qt_QM})
+  target_link_libraries(gmic_qt PRIVATE ${gmic_qt_LIBRARIES})
+  install(TARGETS gmic_qt RUNTIME DESTINATION bin)
 
 elseif (${GMIC_QT_HOST} STREQUAL "paintdotnet")
 
-    set (gmic_qt_SRCS ${gmic_qt_SRCS} src/Host/PaintDotNet/host_paintdotnet.cpp)
-    add_definitions(-DGMIC_HOST=paintdotnet)
-    add_executable(gmic_paintdotnet_qt ${gmic_qt_SRCS} ${gmic_qt_QRC} ${qmic_qt_QM})
-    target_link_libraries(
-      gmic_paintdotnet_qt
-      PRIVATE
-      ${gmic_qt_LIBRARIES}
-      )
+  set (gmic_qt_SRCS ${gmic_qt_SRCS} src/Host/PaintDotNet/host_paintdotnet.cpp)
+  qt5_wrap_ui(gmic_qt_SRCS ${gmic_qt_FORMS})
+  add_definitions(-DGMIC_HOST=paintdotnet)
+  add_executable(gmic_paintdotnet_qt ${gmic_qt_SRCS} ${gmic_qt_QRC} ${qmic_qt_QM})
+  target_link_libraries(
+    gmic_paintdotnet_qt
+    PRIVATE ${gmic_qt_LIBRARIES}
+    )
 
 elseif (${GMIC_QT_HOST} STREQUAL "8bf")
 
     set (gmic_qt_SRCS ${gmic_qt_SRCS} src/Host/8bf/host_8bf.cpp)
+    qt5_wrap_ui(gmic_qt_SRCS ${gmic_qt_FORMS})
     add_definitions(-DGMIC_HOST=plugin8bf)
     add_executable(gmic_8bf_qt ${gmic_qt_SRCS} ${gmic_qt_QRC} ${qmic_qt_QM})
     target_link_libraries(

diff --git a/gmic-qt/README.md b/gmic-qt/README.md
@@ -6,7 +6,7 @@
  G'MIC-Qt is a versatile front-end to the image processing framework
  [G'MIC](https://gmic.eu).  It is in fact a plugin for
  [GIMP](http://gimp.org), [Krita](https://krita.org), [Paint.NET](https://www.getpaint.net/),
- [digiKam](https://www.digikam.org) and an 8bf filter plugin for Photoshop-compatible software as well as a standalone application.
+ [digiKam](https://www.digikam.org) and an 8bf filter plugin for Photoshop-compatible software as well as a [standalone application](STANDALONE.md).
 
 ### Authors
 

diff --git a/gmic-qt/gmic_qt.pro b/gmic-qt/gmic_qt.pro
@@ -1,6 +1,6 @@
 #
 # Set HOST variable to define target host software.
-# Possible values are "none", "gimp", "krita" and "paintdotnet"
+# Possible values are "none", "gimp", "gimp3" (experimental) "krita" and "paintdotnet"
 #
 #
 
@@ -60,6 +60,10 @@ equals( HOST, "gimp" ) {
   PKGCONFIG += gimp-2.0
 }
 
+equals( HOST, "gimp3" ) {
+  PKGCONFIG += gimp-3.0
+}
+
 DEFINES += cimg_use_cpp11=1
 DEFINES += cimg_use_fftw3 cimg_use_zlib
 DEFINES += gmic_build cimg_use_abort gmic_is_parallel cimg_use_curl cimg_use_png
@@ -152,7 +156,7 @@ linux {
   message( Linux platform )
 }
 
-equals( HOST, "gimp") {
+equals( HOST, "gimp")|equals( HOST, "gimp3") {
  TARGET = gmic_gimp_qt
  SOURCES += src/Host/Gimp/host_gimp.cpp
  DEFINES += GMIC_HOST=gimp
@@ -161,13 +165,15 @@ equals( HOST, "gimp") {
  message(Target host software is GIMP)
 }
 
-
 equals( HOST, "none") {
  TARGET = gmic_qt
  DEFINES += GMIC_HOST=standalone
- SOURCES += src/Host/None/host_none.cpp
- SOURCES += src/Host/None/ImageDialog.cpp
- HEADERS += src/Host/None/ImageDialog.h
+ HEADERS += src/Host/None/ImageDialog.h \
+            src/Host/None/JpegQualityDialog.h
+ SOURCES += src/Host/None/host_none.cpp \
+            src/Host/None/ImageDialog.cpp \
+            src/Host/None/JpegQualityDialog.cpp
+ FORMS += src/Host/None/jpegqualitydialog.ui
  DEPENDPATH += $$PWD/src/Host/None
  message(Building standalone version)
 }
@@ -248,6 +254,8 @@ HEADERS +=  \
   src/ClickableLabel.h \
   src/Common.h \
   src/FilterParameters/CustomSpinBox.h \
+  src/GmicQt.h \
+  src/Host/GmicQtHost.h \
   src/OverrideCursor.h \
   src/DialogSettings.h \
   src/FilterParameters/AbstractParameter.h \
@@ -278,23 +286,21 @@ HEADERS +=  \
   src/CroppedActiveLayerProxy.h \
   src/FilterSyncRunner.h \
   src/FilterThread.h \
-  src/gmic_qt.h \
   src/FilterTextTranslator.h \
   src/Globals.h \
   src/GmicStdlib.h \
   src/GmicProcessor.h \
   src/HeadlessProcessor.h \
-  src/Host/host.h \
   src/HtmlTranslator.h \
   src/IconLoader.h \
-  src/ImageConverter.h \
   src/ImageTools.h \
   src/InputOutputState.h \
   src/KeypointList.h \
   src/LayersExtentProxy.h \
   src/Logger.h \
   src/LanguageSettings.h \
   src/MainWindow.h \
+  src/Misc.h \
   src/ParametersCache.h \
   src/TimeLogger.h \
   src/Updater.h \
@@ -324,6 +330,7 @@ SOURCES += \
   src/ClickableLabel.cpp \
   src/Common.cpp \
   src/FilterParameters/CustomSpinBox.cpp \
+  src/GmicQt.cpp \
   src/OverrideCursor.cpp \
   src/DialogSettings.cpp \
   src/FilterParameters/AbstractParameter.cpp \
@@ -354,15 +361,13 @@ SOURCES += \
   src/CroppedActiveLayerProxy.cpp \
   src/FilterSyncRunner.cpp \
   src/FilterThread.cpp \
-  src/gmic_qt.cpp \
   src/FilterTextTranslator.cpp \
   src/Globals.cpp \
   src/GmicStdlib.cpp \
   src/GmicProcessor.cpp \
   src/HeadlessProcessor.cpp \
   src/HtmlTranslator.cpp \
   src/IconLoader.cpp \
-  src/ImageConverter.cpp \
   src/ImageTools.cpp \
   src/InputOutputState.cpp \
   src/KeypointList.cpp \
@@ -374,6 +379,7 @@ SOURCES += \
   src/TimeLogger.cpp \
   src/Updater.cpp \
   src/Utils.cpp \
+  src/Misc.cpp \
   src/FilterSelector/FiltersView/FilterTreeItem.cpp \
   src/FilterSelector/FiltersView/FilterTreeFolder.cpp \
   src/FilterSelector/FavesModel.cpp \
@@ -453,6 +459,7 @@ CONFIG(release, debug|release) {
 CONFIG(debug, debug|release) {
     message(Debug build)
     DEFINES += _GMIC_QT_DEBUG_
+#    QMAKE_CXXFLAGS_DEBUG += -Wfatal-errors
 #    QMAKE_CXXFLAGS_DEBUG += -fsanitize=address
 #    QMAKE_LFLAGS_DEBUG += -fsanitize=address
 }

diff --git a/gmic-qt/src/ClickableLabel.cpp b/gmic-qt/src/ClickableLabel.cpp
@@ -25,13 +25,16 @@
 #include "ClickableLabel.h"
 #include <QMouseEvent>
 
-ClickableLabel::ClickableLabel(QWidget * parent) : QLabel(parent)
+namespace GmicQt
 {
-}
+
+ClickableLabel::ClickableLabel(QWidget * parent) : QLabel(parent) {}
 
 void ClickableLabel::mousePressEvent(QMouseEvent * e)
 {
   if (e->buttons() & Qt::LeftButton) {
     emit clicked();
   }
 }
+
+} // namespace GmicQt
diff --git a/gmic-qt/src/ClickableLabel.h b/gmic-qt/src/ClickableLabel.h
@@ -29,6 +29,9 @@
 
 class QMouseEvent;
 
+namespace GmicQt
+{
+
 class ClickableLabel : public QLabel {
   Q_OBJECT
 public:
@@ -38,4 +41,6 @@ class ClickableLabel : public QLabel {
   void clicked();
 };
 
+} // namespace GmicQt
+
 #endif // GMIC_QT_CLICKABLELABEL_H
diff --git a/gmic-qt/src/Common.h b/gmic-qt/src/Common.h
@@ -35,6 +35,7 @@
 #define TRACE qWarning() << "[" << __PRETTY_FUNCTION__ << "]"
 #define TSHOW(V) qWarning() << "[" << __PRETTY_FUNCTION__ << __LINE__ << "]" << #V << "=" << (V)
 #define SHOW(V) qWarning() << #V << "=" << (V)
+#define STDSHOW(V) std::cout << #V << " = " << (V) << std::endl
 #else
 #define ENTERING while (false)
 #define LEAVING while (false)
@@ -47,6 +48,9 @@
 #define SHOW(V)                                                                                                                                                                                        \
   while (false)                                                                                                                                                                                        \
   qWarning() << ""
+#define STDSHOW(V)                                                                                                                                                                                     \
+  while (false)                                                                                                                                                                                        \
+  std::cout << ""
 #endif
 
 template <typename T> inline void unused(const T &, ...) {}

diff --git a/gmic-qt/src/CroppedActiveLayerProxy.cpp b/gmic-qt/src/CroppedActiveLayerProxy.cpp
@@ -26,9 +26,12 @@
 #include "CroppedActiveLayerProxy.h"
 #include <QDebug>
 #include "Common.h"
-#include "Host/host.h"
+#include "Host/GmicQtHost.h"
 #include "gmic.h"
 
+namespace GmicQt
+{
+
 double CroppedActiveLayerProxy::_x = -1.0;
 double CroppedActiveLayerProxy::_y = -1.0;
 double CroppedActiveLayerProxy::_width = -1.0;
@@ -66,11 +69,13 @@ void CroppedActiveLayerProxy::update(double x, double y, double width, double he
 
   cimg_library::CImgList<gmic_pixel_type> images;
   cimg_library::CImgList<char> imageNames;
-  gmic_qt_get_cropped_images(images, imageNames, _x, _y, _width, _height, GmicQt::Active);
+  GmicQtHost::getCroppedImages(images, imageNames, _x, _y, _width, _height, InputMode::Active);
   if (images.size() > 0) {
-    gmic_qt_apply_color_profile(images.front());
+    GmicQtHost::applyColorProfile(images.front());
     _cachedImage->swap(images.front());
   } else {
     clear();
   }
 }
+
+} // namespace GmicQt