github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-06-03 06:12:43 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlCore: Cocoa Null Image fix

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@14155 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-03-12 09:32:30 +00:00
parent c6af358d0e
commit 2709e233b8
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
uppsrc/CtrlCore/CocoImage.mm
View file

@ -8,9 +8,12 @@ namespace Upp {
CGImageRef createCGImage(const Image& img)
{
if(IsNull(img))
return NULL;
CGDataProvider *dataProvider = CGDataProviderCreateWithData(NULL, ~img, img.GetLength() * sizeof(RGBA), NULL);
static CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); // TODO: This is probably wrong...
Upp::Size isz = img.GetSize();
ASSERT(isz.cx * isz.cy);
CGImageRef cg_img = CGImageCreate(isz.cx, isz.cy, 8, 32, isz.cx * sizeof(RGBA),
colorSpace, kCGImageAlphaPremultipliedFirst,
dataProvider, 0, false, kCGRenderingIntentDefault);
@ -76,13 +79,15 @@ void SystemDraw::SysDrawImageOp(int x, int y, const Image& img, Color color)
LLOG("SysImage cache pixels " << cache.GetSize() << ", count " << cache.GetCount());
m.img = IsNull(color) ? img : CachedSetColorKeepAlpha(img, color); // TODO: Can setcolor be optimized out? By masks e.g.?
ImageSysData& sd = cg_image_cache.Get(m);
Size isz = img.GetSize();
CGContextSaveGState(cgHandle);
Point off = GetOffset();
CGContextTranslateCTM(cgHandle, x + off.x, y + off.y);
CGContextScaleCTM(cgHandle, 1.0, -1.0);
CGContextDrawImage(cgHandle, CGRectMake(0, -isz.cy, isz.cx, isz.cy), sd.cgimg);
CGContextRestoreGState(cgHandle);
if(sd.cgimg) {
Size isz = img.GetSize();
CGContextSaveGState(cgHandle);
Point off = GetOffset();
CGContextTranslateCTM(cgHandle, x + off.x, y + off.y);
CGContextScaleCTM(cgHandle, 1.0, -1.0);
CGContextDrawImage(cgHandle, CGRectMake(0, -isz.cy, isz.cx, isz.cy), sd.cgimg);
CGContextRestoreGState(cgHandle);
}
cg_image_cache.Shrink(4 * 1024 * 768, 1000); // Cache must be after Paint because of PaintOnly!
}