Run of fresh-snapshots for hdrmerge

Merge these changes:

git pull https://janitor.debian.net/git/hdrmerge fresh-snapshots/main
git pull https://janitor.debian.net/git/hdrmerge fresh-snapshots/upstream

Summary

Merged new upstream version: 0.5.0+git20201112.1.f5a2538 (was: 0.5+git20200117).

Diff

Branch: main

diff --git a/README.md b/README.md
index c3767c5..49a7f1e 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,10 @@ Find the latest builds on our [releases page](https://github.com/jcelaya/hdrmerg
 
 Linux users can get HDRMerge from their package manager. If your package manager does not ship the latest version of HDRMerge, file a bug report using your distribution's bug tracker asking them to ship the latest version.
 
+## Binaries are provided by some distributions
+
+https://repology.org/project/hdrmerge/versions
+
 ## Compilation
 
 If you would like to compile HDRMerge yourself, follow the instructions in the `INSTALL.md` file.
diff --git a/debian/changelog b/debian/changelog
index 38cf054..4082d86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hdrmerge (0.5.0+git20201112.1.f5a2538-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Fri, 01 Apr 2022 00:26:39 -0000
+
 hdrmerge (0.5+git20200117-2) unstable; urgency=medium
 
   * Add Vcs fields.
diff --git a/src/AboutDialog.hpp b/src/AboutDialog.hpp
index 0995180..e6843d5 100644
--- a/src/AboutDialog.hpp
+++ b/src/AboutDialog.hpp
@@ -29,7 +29,7 @@ namespace hdrmerge {
 
 class AboutDialog : public QDialog {
 public:
-    explicit AboutDialog(QWidget * parent = 0, Qt::WindowFlags f = 0);
+    explicit AboutDialog(QWidget * parent = 0, Qt::WindowFlags f = {});
     void closeEvent(QCloseEvent * event) { accept(); }
 
     Q_OBJECT
diff --git a/src/Array2D.hpp b/src/Array2D.hpp
index 932d5c4..dc29e42 100644
--- a/src/Array2D.hpp
+++ b/src/Array2D.hpp
@@ -115,13 +115,13 @@ public:
     }
     void fillBorders( T val ) {
         if(dy > 0) {
-            for(size_t i = 0; i < dy; ++i)
+            for(size_t i = 0; i < static_cast<size_t>(dy); ++i)
                 for(size_t j = 0; j < width; ++j)
                     data[i*width + j] = val;
         }
         if(dx > 0) {
             for(size_t i = 0; i < height; ++i)
-                for(size_t j = 0; j < dx; ++j)
+                for(size_t j = 0; j < static_cast<size_t>(dx); ++j)
                     data[i*width + j] = val;
         }
     }
diff --git a/src/DngPropertiesDialog.hpp b/src/DngPropertiesDialog.hpp
index a4af772..68d2a96 100644
--- a/src/DngPropertiesDialog.hpp
+++ b/src/DngPropertiesDialog.hpp
@@ -32,7 +32,7 @@ namespace hdrmerge {
 
 class DngPropertiesDialog : public QDialog, public SaveOptions {
 public:
-    DngPropertiesDialog(QWidget * parent = 0, Qt::WindowFlags f = 0);
+    DngPropertiesDialog(QWidget * parent = 0, Qt::WindowFlags f = {});
 
     void closeEvent(QCloseEvent * event) { reject(); }
 
diff --git a/src/LoadOptionsDialog.hpp b/src/LoadOptionsDialog.hpp
index be7b92d..313f3eb 100644
--- a/src/LoadOptionsDialog.hpp
+++ b/src/LoadOptionsDialog.hpp
@@ -33,7 +33,7 @@ namespace hdrmerge {
 
 class LoadOptionsDialog : public QDialog, public LoadOptions {
 public:
-    LoadOptionsDialog(QWidget * parent = 0, Qt::WindowFlags f = 0);
+    LoadOptionsDialog(QWidget * parent = 0, Qt::WindowFlags f = {});
 
     void closeEvent(QCloseEvent * event) { reject(); }
 
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index a0d327d..d777a34 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -342,7 +342,7 @@ void MainWindow::saveResult() {
         saveDialog.setOptions(QFileDialog::DontUseNativeDialog);
         saveDialog.setAcceptMode(QFileDialog::AcceptSave);
         saveDialog.setFileMode(QFileDialog::AnyFile);
-        saveDialog.setConfirmOverwrite(true);
+        saveDialog.setOption(QFileDialog::DontConfirmOverwrite, false);
 
         QList<QUrl> urls = getStdUrls(io.getInputPath());
         saveDialog.setSidebarUrls(urls);
diff --git a/src/PreviewWidget.cpp b/src/PreviewWidget.cpp
index 5e035f3..f847d32 100644
--- a/src/PreviewWidget.cpp
+++ b/src/PreviewWidget.cpp
@@ -219,8 +219,8 @@ void PreviewWidget::wheelEvent(QWheelEvent * event) {
     Qt::KeyboardModifiers mods = QApplication::queryKeyboardModifiers();
     if (mods & Qt::AltModifier) {
         event->accept();
-        int step = event->delta() / 24;
-        if (step == 0) step = event->delta() > 0 ? 1 : -1;
+        int step = event->angleDelta().y() / 24;
+        if (step == 0) step = event->angleDelta().y() > 0 ? 1 : -1;
         setRadius(radius - step);
         emit radiusChanged(radius);
     } else {

Branch: upstream

Tag: upstream/0.5.0+git20201112.1.f5a2538
diff --git a/README.md b/README.md
index c3767c5..49a7f1e 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,10 @@ Find the latest builds on our [releases page](https://github.com/jcelaya/hdrmerg
 
 Linux users can get HDRMerge from their package manager. If your package manager does not ship the latest version of HDRMerge, file a bug report using your distribution's bug tracker asking them to ship the latest version.
 
+## Binaries are provided by some distributions
+
+https://repology.org/project/hdrmerge/versions
+
 ## Compilation
 
 If you would like to compile HDRMerge yourself, follow the instructions in the `INSTALL.md` file.
diff --git a/src/AboutDialog.hpp b/src/AboutDialog.hpp
index 0995180..e6843d5 100644
--- a/src/AboutDialog.hpp
+++ b/src/AboutDialog.hpp
@@ -29,7 +29,7 @@ namespace hdrmerge {
 
 class AboutDialog : public QDialog {
 public:
-    explicit AboutDialog(QWidget * parent = 0, Qt::WindowFlags f = 0);
+    explicit AboutDialog(QWidget * parent = 0, Qt::WindowFlags f = {});
     void closeEvent(QCloseEvent * event) { accept(); }
 
     Q_OBJECT
diff --git a/src/Array2D.hpp b/src/Array2D.hpp
index 932d5c4..dc29e42 100644
--- a/src/Array2D.hpp
+++ b/src/Array2D.hpp
@@ -115,13 +115,13 @@ public:
     }
     void fillBorders( T val ) {
         if(dy > 0) {
-            for(size_t i = 0; i < dy; ++i)
+            for(size_t i = 0; i < static_cast<size_t>(dy); ++i)
                 for(size_t j = 0; j < width; ++j)
                     data[i*width + j] = val;
         }
         if(dx > 0) {
             for(size_t i = 0; i < height; ++i)
-                for(size_t j = 0; j < dx; ++j)
+                for(size_t j = 0; j < static_cast<size_t>(dx); ++j)
                     data[i*width + j] = val;
         }
     }
diff --git a/src/DngPropertiesDialog.hpp b/src/DngPropertiesDialog.hpp
index a4af772..68d2a96 100644
--- a/src/DngPropertiesDialog.hpp
+++ b/src/DngPropertiesDialog.hpp
@@ -32,7 +32,7 @@ namespace hdrmerge {
 
 class DngPropertiesDialog : public QDialog, public SaveOptions {
 public:
-    DngPropertiesDialog(QWidget * parent = 0, Qt::WindowFlags f = 0);
+    DngPropertiesDialog(QWidget * parent = 0, Qt::WindowFlags f = {});
 
     void closeEvent(QCloseEvent * event) { reject(); }
 
diff --git a/src/LoadOptionsDialog.hpp b/src/LoadOptionsDialog.hpp
index be7b92d..313f3eb 100644
--- a/src/LoadOptionsDialog.hpp
+++ b/src/LoadOptionsDialog.hpp
@@ -33,7 +33,7 @@ namespace hdrmerge {
 
 class LoadOptionsDialog : public QDialog, public LoadOptions {
 public:
-    LoadOptionsDialog(QWidget * parent = 0, Qt::WindowFlags f = 0);
+    LoadOptionsDialog(QWidget * parent = 0, Qt::WindowFlags f = {});
 
     void closeEvent(QCloseEvent * event) { reject(); }
 
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index a0d327d..d777a34 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -342,7 +342,7 @@ void MainWindow::saveResult() {
         saveDialog.setOptions(QFileDialog::DontUseNativeDialog);
         saveDialog.setAcceptMode(QFileDialog::AcceptSave);
         saveDialog.setFileMode(QFileDialog::AnyFile);
-        saveDialog.setConfirmOverwrite(true);
+        saveDialog.setOption(QFileDialog::DontConfirmOverwrite, false);
 
         QList<QUrl> urls = getStdUrls(io.getInputPath());
         saveDialog.setSidebarUrls(urls);
diff --git a/src/PreviewWidget.cpp b/src/PreviewWidget.cpp
index 5e035f3..f847d32 100644
--- a/src/PreviewWidget.cpp
+++ b/src/PreviewWidget.cpp
@@ -219,8 +219,8 @@ void PreviewWidget::wheelEvent(QWheelEvent * event) {
     Qt::KeyboardModifiers mods = QApplication::queryKeyboardModifiers();
     if (mods & Qt::AltModifier) {
         event->accept();
-        int step = event->delta() / 24;
-        if (step == 0) step = event->delta() > 0 ? 1 : -1;
+        int step = event->angleDelta().y() / 24;
+        if (step == 0) step = event->angleDelta().y() > 0 ? 1 : -1;
         setRadius(radius - step);
         emit radiusChanged(radius);
     } else {

Publish Blockers

  • ☑ run was successful
  • ☑ package has not been removed from the archive
  • ☑ command has not changed
  • ☒ not yet reviewed, but review needed
  • ☑ 0 publish attempts so far.not currently attempting to back off
  • ☒ merge proposals for the package maintainer are currently being rate-limited (open: 529, max open: 300)
  • ☑ change set 93c68c48-5774-4e2e-a74d-54869d17d45f is ready

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-snapshots hdrmerge-dbgsymapt install -t fresh-snapshots hdrmerge

Lintian Result

Full worker log Full build log