root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-02-26 04:00:49 +01:00
Code Issues Projects Releases Activity

Fixed ODR (One Definition Rule) violation

Browse Source
This commit is contained in:
Martin Tůma 2020-10-12 20:05:17 +02:00
parent 5a4de1cef0
commit 3b68f497fe
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/map/geotiff.cpp
View File

@ -61,19 +61,19 @@
((map).contains(key) && (map).value(key).SHORT != 32767) ((map).contains(key) && (map).value(key).SHORT != 32767)
typedef struct { struct TIFFHeader {
quint16 KeyDirectoryVersion; quint16 KeyDirectoryVersion;
quint16 KeyRevision; quint16 KeyRevision;
quint16 MinorRevision; quint16 MinorRevision;
quint16 NumberOfKeys; quint16 NumberOfKeys;
} Header; };
typedef struct { struct KeyEntry {
quint16 KeyID; quint16 KeyID;
quint16 TIFFTagLocation; quint16 TIFFTagLocation;
quint16 Count; quint16 Count;
quint16 ValueOffset; quint16 ValueOffset;
} KeyEntry; };
bool GeoTIFF::readEntry(TIFFFile &file, Ctx &ctx) const bool GeoTIFF::readEntry(TIFFFile &file, Ctx &ctx) const
@ -196,7 +196,7 @@ bool GeoTIFF::readMatrix(TIFFFile &file, quint32 offset, double matrix[16]) cons
bool GeoTIFF::readKeys(TIFFFile &file, Ctx &ctx, QMap<quint16, Value> &kv) const bool GeoTIFF::readKeys(TIFFFile &file, Ctx &ctx, QMap<quint16, Value> &kv) const
{ {
Header header; TIFFHeader header;
KeyEntry entry; KeyEntry entry;
Value value; Value value;

6
src/map/tar.cpp
View File

@ -9,7 +9,7 @@
#define BLOCKCOUNT(size) \ #define BLOCKCOUNT(size) \
((size)/BLOCKSIZE + ((size) % BLOCKSIZE > 0 ? 1 : 0)) ((size)/BLOCKSIZE + ((size) % BLOCKSIZE > 0 ? 1 : 0))
struct Header struct TARHeader
{ {
char name[100]; /* 0 */ char name[100]; /* 0 */
char mode[8]; /* 100 */ char mode[8]; /* 100 */
@ -61,7 +61,7 @@ bool Tar::open()
bool Tar::loadTar() bool Tar::loadTar()
{ {
char buffer[BLOCKSIZE]; char buffer[BLOCKSIZE];
struct Header *hdr = (struct Header*)&buffer; TARHeader *hdr = (TARHeader*)&buffer;
quint64 size; quint64 size;
qint64 ret; qint64 ret;
@ -113,7 +113,7 @@ bool Tar::loadTmi(const QString &path)
QByteArray Tar::file(const QString &name) QByteArray Tar::file(const QString &name)
{ {
char buffer[BLOCKSIZE]; char buffer[BLOCKSIZE];
struct Header *hdr = (struct Header*)&buffer; TARHeader *hdr = (TARHeader*)&buffer;
quint64 size; quint64 size;
QMap<QString, quint64>::const_iterator it(_index.find(name)); QMap<QString, quint64>::const_iterator it(_index.find(name));