gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 23:42:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support for images in NSCalibratedRGBColorSpace for windows.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@21292 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2005-06-07 19:38:54 +00:00
parent 7a3f75f9ac
commit 62356b3c4f
2 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-06-07 Fred Kiefer <FredKiefer@gmx.de>
* Source/winlib/Win32GState.m (GSCreateBitmap): Allow
NSCalibratedRGBColorSpace as well.
(-_compositeGState:fromRect:toPoint:op:fraction:) Removed the
leading underscore of the method name.
2005-05-26 Adam Fedor <fedor@gnu.org>
* Update FSF Address.

33
Source/winlib/WIN32GState.m
View file

@ -200,11 +200,11 @@ RECT GSXWindowRectToMS(WIN32GState *s, NSRect r)
return r1;
}
- (void) _compositeGState: (WIN32GState *) source
fromRect: (NSRect) sourceRect
toPoint: (NSPoint) destPoint
op: (NSCompositingOperation) op
fraction: (float)delta
- (void) compositeGState: (WIN32GState *) source
fromRect: (NSRect) sourceRect
toPoint: (NSPoint) destPoint
op: (NSCompositingOperation) op
fraction: (float)delta
{
HDC sourceDC;
HDC hDC;
@ -297,11 +297,11 @@ RECT GSXWindowRectToMS(WIN32GState *s, NSRect r)
toPoint: (NSPoint)aPoint
op: (NSCompositingOperation)op
{
[self _compositeGState: (WIN32GState *) source
fromRect: aRect
toPoint: aPoint
op: op
fraction: 1];
[self compositeGState: (WIN32GState *) source
fromRect: aRect
toPoint: aPoint
op: op
fraction: 1];
}
- (void) dissolveGState: (GSGState *)source
@ -309,11 +309,11 @@ RECT GSXWindowRectToMS(WIN32GState *s, NSRect r)
toPoint: (NSPoint)aPoint
delta: (float)delta
{
[self _compositeGState: (WIN32GState *) source
fromRect: aRect
toPoint: aPoint
op: NSCompositeSourceOver
fraction: delta];
[self compositeGState: (WIN32GState *) source
fromRect: aRect
toPoint: aPoint
op: NSCompositeSourceOver
fraction: delta];
}
- (void) compositerect: (NSRect)aRect
@ -382,7 +382,8 @@ HBITMAP GSCreateBitmap(HDC hDC, int pixelsWide, int pixelsHigh,
int xres, yres;
UINT fuColorUse;
if (isPlanar || ![colorSpaceName isEqualToString: NSDeviceRGBColorSpace])
if (isPlanar || !([colorSpaceName isEqualToString: NSDeviceRGBColorSpace] ||
[colorSpaceName isEqualToString: NSCalibratedRGBColorSpace]))
{
NSLog(@"Bitmap type currently not supported %d %@", isPlanar, colorSpaceName);
return NULL;