From 7dcbdef9d6ae95e7c9232418d12195582faaa54b Mon Sep 17 00:00:00 2001
From: nyamatongwe <nyamatongwe@gmail.com>
Date: Sat, 21 Jul 2012 16:57:24 +1000
Subject: Scale factor implemented for RGBAImages to allow for high definition
 markers on retina displays.

---
 src/XPM.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/XPM.cxx')

diff --git a/src/XPM.cxx b/src/XPM.cxx
index db48ea227..7188c2465 100644
--- a/src/XPM.cxx
+++ b/src/XPM.cxx
@@ -319,8 +319,8 @@ int XPMSet::GetWidth() {
 	return (width > 0) ? width : 0;
 }
 
-RGBAImage::RGBAImage(int width_, int height_, const unsigned char *pixels_) :
-	height(height_), width(width_) {
+RGBAImage::RGBAImage(int width_, int height_, float scale_, const unsigned char *pixels_) :
+	height(height_), width(width_), scale(scale_) {
 	if (pixels_) {
 		pixelBytes.assign(pixels_, pixels_ + CountBytes());
 	} else {
@@ -331,6 +331,7 @@ RGBAImage::RGBAImage(int width_, int height_, const unsigned char *pixels_) :
 RGBAImage::RGBAImage(const XPM &xpm) {
 	height = xpm.GetHeight();
 	width = xpm.GetWidth();
+	scale = 1;
 	pixelBytes.resize(CountBytes());
 	for (int y=0; y<height; y++) {
 		for (int x=0; x<width; x++) {
-- 
cgit v1.2.3