40 lines
1.1 KiB
Plaintext
40 lines
1.1 KiB
Plaintext
commit e6d015a953a163f174e09a9b50c9bb8bc19593e4
|
|
Author: Ladislav Láska <krakonos@krakonos.org>
|
|
Date: Mon Jul 27 14:22:37 2015 +0200
|
|
|
|
Fixed compilation issues with GEOIMAGE=1 and Qt5.
|
|
|
|
--- src/Docks/GeoImageDock.cpp.orig 2015-07-19 14:50:09 UTC
|
|
+++ src/Docks/GeoImageDock.cpp
|
|
@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringList fileNames)
|
|
|
|
Exiv2::Image::AutoPtr image;
|
|
Exiv2::ExifData exifData;
|
|
- bool positionValid = FALSE;
|
|
+ bool positionValid = false;
|
|
|
|
Layer *theLayer;
|
|
if (photoLayer == NULL) {
|
|
@@ -894,7 +894,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString
|
|
double lat = 0.0, lon = 0.0;
|
|
Exiv2::Image::AutoPtr image;
|
|
Exiv2::ExifData exifData;
|
|
- bool positionValid = FALSE;
|
|
+ bool positionValid = false;
|
|
|
|
if (!QFile::exists(file)) {
|
|
return pos;
|
|
--- src/Docks/GeoImageDock.h.orig 2015-07-19 14:50:09 UTC
|
|
+++ src/Docks/GeoImageDock.h
|
|
@@ -7,8 +7,8 @@
|
|
#include <QtWidgets/QDockWidget>
|
|
#include <QtGui/QMouseEvent>
|
|
#include <QtWidgets/QShortcut>
|
|
-#include <exiv2/image.hpp>
|
|
-#include <exiv2/exif.hpp>
|
|
+#include <exiv2/exiv2.hpp>
|
|
+#include <QDrag>
|
|
|
|
class ImageView;
|
|
|