root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-27 08:54:23 +02:00
Code Issues Projects Releases Activity

Fixed GeoTIFF on platforms where qreal != double

Browse Source
This commit is contained in:
Martin Tůma
2018-04-15 16:27:47 +02:00
parent 4b776c8cc1
commit f2b72ec1b5
27 changed files with 192 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/map/mapfile.cpp
View File

@ -84,7 +84,7 @@ int MapFile::parse(QIODevice &device, QList<CalibrationPoint> &points,
if (list.at(16).trimmed() == "S")
p.zone = -p.zone;
p.rp.xy = QPoint(x, y);
p.rp.setXY(PointD(x, y));
if (ll) {
p.ll = Coordinates(lond + lonm/60.0, latd + latm/60.0);
if (p.ll.isValid())
@ -92,7 +92,7 @@ int MapFile::parse(QIODevice &device, QList<CalibrationPoint> &points,
else
return ln;
} else if (pp) {
p.rp.pp = QPointF(ppx, ppy);
p.rp.setPP(PointD(ppx, ppy));
points.append(p);
} else
return ln;
@ -238,8 +238,8 @@ bool MapFile::computeTransformation(QList<CalibrationPoint> &points)
QList<ReferencePoint> rp;
for (int i = 0; i < points.size(); i++) {
if (points.at(i).rp.pp.isNull())
points[i].rp.pp = _projection.ll2xy(points.at(i).ll);
if (points.at(i).rp.pp().isNull())
points[i].rp.setPP(_projection.ll2xy(points.at(i).ll));
rp.append(points.at(i).rp);
}