darlinghq/darling-cocotron
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-cocotron.git synced 2024-12-18 01:06:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[NSImage tiffRepresentation] is broken

Browse Source
This commit is contained in:
Airy ANDRE 2012-09-27 18:56:17 +02:00
parent bfb8c263ba
commit b5c9559f26
2 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AppKit/NSCachedImageRep.m
View File

@ -79,4 +79,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
return YES;
}
- (void)draw
{
[self drawInRect:[self rect]];
}
@end

48
AppKit/NSImage.m
View File

@ -598,24 +598,33 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
-(NSData *)TIFFRepresentationUsingCompression:(NSTIFFCompression)compression factor:(float)factor {
NSMutableArray *bitmaps=[NSMutableArray array];
for(NSImageRep *check in _representations){
if([check isKindOfClass:[NSBitmapImageRep class]])
[bitmaps addObject:check];
else {
NSSize size=[check size];
NSBitmapImageRep *image=[[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL pixelsWide:size.width pixelsHigh:size.height bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:0 bitsPerPixel:32];
[self lockFocusOnRepresentation:image];
[check draw];
[self unlockFocus];
[bitmaps addObject:image];
}
}
return [NSBitmapImageRep TIFFRepresentationOfImageRepsInArray:bitmaps usingCompression:compression factor:factor];
for(NSImageRep *check in _representations){
if([check isKindOfClass:[NSBitmapImageRep class]]) {
[bitmaps addObject:check];
} else if([check isKindOfClass:[NSCachedImageRep class]]) {
// We don't use the general case else we get flipped results for flipped images since lockFocusOnRepresention is flipping and the Cache content
// is already flipped
NSRect r = { .origin = NSZeroPoint, .size = check.size };
[self lockFocus];
NSBitmapImageRep *image = [[NSBitmapImageRep alloc] initWithFocusedViewRect: r];
[self unlockFocus];
[bitmaps addObject:image];
[image release];
} else {
NSSize size=[check size];
NSBitmapImageRep *image=[[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL pixelsWide:size.width pixelsHigh:size.height bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:0 bitsPerPixel:32];
[self lockFocusOnRepresentation:image];
[check draw];
[self unlockFocus];
[bitmaps addObject:image];
[image release];
}
}
return [NSBitmapImageRep TIFFRepresentationOfImageRepsInArray:bitmaps usingCompression:compression factor:factor];
}
-(void)lockFocus {
@ -668,13 +677,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
// Some fake view, just so the context knows if it's flipped or not
NSView *view = [[[NSImageCacheView alloc] initWithFlipped:[self isFlipped]] autorelease];
[[context focusStack] addObject:self];
[[context focusStack] addObject:self];
if([self isFlipped]){
CGAffineTransform flip={1,0,0,-1,0,[self size].height};
CGContextConcatCTM(graphicsPort,flip);
}
}
-(void)unlockFocus {