root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-10-06 14:53:21 +02:00
Code Issues Projects Releases Activity

Code cleanup

Browse Source
This commit is contained in:
Martin Tůma 2019-03-14 08:27:01 +01:00
parent ef011cad67
commit cb9606e057
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/data/exifparser.cpp
View File

@ -149,19 +149,9 @@ bool EXIFParser::readIFD(TIFFFile &file, quint32 offset,
return true; return true;
} }
bool EXIFParser::parseTIFF(QDataStream &stream, QVector<Waypoint> &waypoints) bool EXIFParser::parseTIFF(QFile *file, QVector<Waypoint> &waypoints)
{ {
quint16 size; TIFFFile tiff(file);
char magic[6];
stream >> size;
if (stream.readRawData(magic, sizeof(magic)) != sizeof(magic) ||
memcmp(magic, "Exif\0\0", sizeof(magic))) {
_errorString = "No EXIF data found";
return false;
}
TIFFFile tiff(stream.device());
if (!tiff.isValid()) { if (!tiff.isValid()) {
_errorString = "Invalid EXIF data"; _errorString = "Invalid EXIF data";
return false; return false;
@ -201,7 +191,6 @@ bool EXIFParser::parseTIFF(QDataStream &stream, QVector<Waypoint> &waypoints)
} }
Waypoint wp(c); Waypoint wp(c);
QFile *file = static_cast<QFile*>(stream.device());
wp.setName(QFileInfo(file->fileName()).baseName()); wp.setName(QFileInfo(file->fileName()).baseName());
wp.setImage(file->fileName()); wp.setImage(file->fileName());
wp.setElevation(altitude(tiff, gps.value(GPSAltitude), wp.setElevation(altitude(tiff, gps.value(GPSAltitude),
@ -228,8 +217,16 @@ bool EXIFParser::parse(QFile *file, QList<TrackData> &tracks,
quint16 marker; quint16 marker;
while (!stream.atEnd()) { while (!stream.atEnd()) {
stream >> marker; stream >> marker;
if (marker == 0xFFE1) if (marker == 0xFFE1) {
return parseTIFF(stream, waypoints); quint16 size;
char magic[6];
stream >> size;
if (stream.readRawData(magic, sizeof(magic)) == sizeof(magic) &&
!memcmp(magic, "Exif\0\0", sizeof(magic)))
return parseTIFF(file, waypoints);
else
break;
}
} }
_errorString = "No EXIF data found"; _errorString = "No EXIF data found";

3
src/data/exifparser.h
View File

@ -4,7 +4,6 @@
#include <QDateTime> #include <QDateTime>
#include "parser.h" #include "parser.h"
class QDataStream;
class TIFFFile; class TIFFFile;
class EXIFParser : public Parser class EXIFParser : public Parser
@ -24,7 +23,7 @@ private:
quint32 offset; quint32 offset;
}; };
bool parseTIFF(QDataStream &stream, QVector<Waypoint> &waypoints); bool parseTIFF(QFile *file, QVector<Waypoint> &waypoints);
bool readIFD(TIFFFile &file, quint32 offset, const QSet<quint16> &tags, bool readIFD(TIFFFile &file, quint32 offset, const QSet<quint16> &tags,
QMap<quint16, IFDEntry> &entries) const; QMap<quint16, IFDEntry> &entries) const;
bool readEntry(TIFFFile &file, const QSet<quint16> &tags, bool readEntry(TIFFFile &file, const QSet<quint16> &tags,