src/map/IMG/trefile.cpp

@@ -329,3 +329,13 @@ QList<SubDiv*> TREFile::subdivs(const RectC &rect, int bits,
 
 	return list;
 }
+
+#ifndef QT_NO_DEBUG
+QDebug IMG::operator<<(QDebug dbg, const TREFile::MapLevel &level)
+{
+	dbg.nospace() << "MapLevel(" << level.level << "," << level.bits << ", "
+	  << level.subdivs << ")";
+
+	return dbg.space();
+}
+#endif // QT_NO_DEBUG

src/map/IMG/trefile.h

@@ -42,6 +42,8 @@ private:
 	};
 	typedef RTree<SubDiv*, double, 2> SubDivTree;
 
+	friend QDebug operator<<(QDebug dbg, const MapLevel &level);
+
 	bool load(int idx);
 	int level(int bits, const Range &baseMap);
 	int readExtEntry(Handle &hdl, quint32 &polygons, quint32 &lines,
@@ -57,6 +59,9 @@ private:
 	QMap<int, SubDivTree*> _subdivs;
 };
 
+#ifndef QT_NO_DEBUG
+QDebug operator<<(QDebug dbg, const TREFile::MapLevel &level);
+#endif // QT_NO_DEBUG
 }
 
 #endif // IMG_TREFILE_H

src/map/image.cpp

@@ -1,6 +1,7 @@
 #include <QPainter>
 #include "image.h"
 
+
 #define TILE_SIZE 256
 
 void Image::draw(QPainter *painter, const QRectF &rect, Map::Flags flags)
@@ -16,9 +17,9 @@ void Image::draw(QPainter *painter, const QRectF &rect, Map::Flags flags)
 			for (int j = sr.top()/TILE_SIZE; j <= sr.bottom()/TILE_SIZE; j++) {
 				QPoint tl(i * TILE_SIZE, j * TILE_SIZE);
 				QRect tile(tl, QSize(TILE_SIZE, TILE_SIZE));
-				QImage img(_img.copy(tile));
-				img.setDevicePixelRatio(ratio);
-				painter->drawImage(tl/ratio, img);
+				QPixmap pm(QPixmap::fromImage(_img.copy(tile)));
+				pm.setDevicePixelRatio(ratio);
+				painter->drawPixmap(tl/ratio, pm);
 			}
 		}
 	} else