Commit c0c9fbfdaca3cbd7e093e2f2e0ad86293ece912f - hdrmerge

Import upstream version 0.5.0+git20201112.1.f5a2538 Debian Janitor 2 years ago

7 changed file(s) with 12 addition(s) and 8 deletion(s). Raw diff Collapse all Expand all

-0

README.md less more

6	6	Find the latest builds on our [releases page](https://github.com/jcelaya/hdrmerge/releases).
7	7
8	8	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.
	9
	10	## Binaries are provided by some distributions
	11
	12	https://repology.org/project/hdrmerge/versions
9	13
10	14	## Compilation
11	15

-1

src/AboutDialog.hpp less more

28	28
29	29	class AboutDialog : public QDialog {
30	30	public:
31		explicit AboutDialog(QWidget * parent = 0, Qt::WindowFlags f = 0);
	31	explicit AboutDialog(QWidget * parent = 0, Qt::WindowFlags f = {});
32	32	void closeEvent(QCloseEvent * event) { accept(); }
33	33
34	34	Q_OBJECT

-2

src/Array2D.hpp less more

114	114	}
115	115	void fillBorders( T val ) {
116	116	if(dy > 0) {
117		for(size_t i = 0; i < dy; ++i)
	117	for(size_t i = 0; i < static_cast<size_t>(dy); ++i)
118	118	for(size_t j = 0; j < width; ++j)
119	119	data[i*width + j] = val;
120	120	}
121	121	if(dx > 0) {
122	122	for(size_t i = 0; i < height; ++i)
123		for(size_t j = 0; j < dx; ++j)
	123	for(size_t j = 0; j < static_cast<size_t>(dx); ++j)
124	124	data[i*width + j] = val;
125	125	}
126	126	}

-1

src/DngPropertiesDialog.hpp less more

31	31
32	32	class DngPropertiesDialog : public QDialog, public SaveOptions {
33	33	public:
34		DngPropertiesDialog(QWidget * parent = 0, Qt::WindowFlags f = 0);
	34	DngPropertiesDialog(QWidget * parent = 0, Qt::WindowFlags f = {});
35	35
36	36	void closeEvent(QCloseEvent * event) { reject(); }
37	37

-1

src/LoadOptionsDialog.hpp less more

32	32
33	33	class LoadOptionsDialog : public QDialog, public LoadOptions {
34	34	public:
35		LoadOptionsDialog(QWidget * parent = 0, Qt::WindowFlags f = 0);
	35	LoadOptionsDialog(QWidget * parent = 0, Qt::WindowFlags f = {});
36	36
37	37	void closeEvent(QCloseEvent * event) { reject(); }
38	38

-1

src/MainWindow.cpp less more

341	341	saveDialog.setOptions(QFileDialog::DontUseNativeDialog);
342	342	saveDialog.setAcceptMode(QFileDialog::AcceptSave);
343	343	saveDialog.setFileMode(QFileDialog::AnyFile);
344		saveDialog.setConfirmOverwrite(true);
	344	saveDialog.setOption(QFileDialog::DontConfirmOverwrite, false);
345	345
346	346	QList<QUrl> urls = getStdUrls(io.getInputPath());
347	347	saveDialog.setSidebarUrls(urls);

-2

src/PreviewWidget.cpp less more

218	218	Qt::KeyboardModifiers mods = QApplication::queryKeyboardModifiers();
219	219	if (mods & Qt::AltModifier) {
220	220	event->accept();
221		int step = event->delta() / 24;
222		if (step == 0) step = event->delta() > 0 ? 1 : -1;
	221	int step = event->angleDelta().y() / 24;
	222	if (step == 0) step = event->angleDelta().y() > 0 ? 1 : -1;
223	223	setRadius(radius - step);
224	224	emit radiusChanged(radius);
225	225	} else {