diff options
| author | nyamatongwe <nyamatongwe@gmail.com> | 2012-07-21 16:57:24 +1000 |
|---|---|---|
| committer | nyamatongwe <nyamatongwe@gmail.com> | 2012-07-21 16:57:24 +1000 |
| commit | 7dcbdef9d6ae95e7c9232418d12195582faaa54b (patch) | |
| tree | dbdbea4b99a427a3dec598bc49247e57b58654fa /src/XPM.cxx | |
| parent | 38dc2df4119595f2a553cec3f9b51adaa160c973 (diff) | |
| download | scintilla-mirror-7dcbdef9d6ae95e7c9232418d12195582faaa54b.tar.gz | |
Scale factor implemented for RGBAImages to allow for high definition markers on retina displays.
Diffstat (limited to 'src/XPM.cxx')
| -rw-r--r-- | src/XPM.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
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++) { |