Commit fec9f0479a494f01343c4be2117883e9e5d966ba
1 parent
3d52092c
Fixed windows heatmapdistance bug
Showing
2 changed files
with
4 additions
and
1 deletions
openbr/gui/imageviewer.cpp
| @@ -36,7 +36,8 @@ void br::ImageViewer::setDefaultText(const QString &text) | @@ -36,7 +36,8 @@ void br::ImageViewer::setDefaultText(const QString &text) | ||
| 36 | 36 | ||
| 37 | void br::ImageViewer::setImage(const QString &file, bool async) | 37 | void br::ImageViewer::setImage(const QString &file, bool async) |
| 38 | { | 38 | { |
| 39 | - src = QImage(file); | 39 | + if(file.isNull()) src = QImage(); // Gets rid of runtime FileEngine::open warning |
| 40 | + else src = QImage(file); | ||
| 40 | updatePixmap(async); | 41 | updatePixmap(async); |
| 41 | } | 42 | } |
| 42 | 43 |
openbr/plugins/quality.cpp
| @@ -269,6 +269,8 @@ class HeatMapDistance : public Distance | @@ -269,6 +269,8 @@ class HeatMapDistance : public Distance | ||
| 269 | (void) target; | 269 | (void) target; |
| 270 | (void) query; | 270 | (void) query; |
| 271 | qFatal("You did this wrong"); | 271 | qFatal("You did this wrong"); |
| 272 | + | ||
| 273 | + return 0; | ||
| 272 | } | 274 | } |
| 273 | 275 | ||
| 274 | // Switch this to template list version, use compare(template, template) in | 276 | // Switch this to template list version, use compare(template, template) in |