Author: mlytwyn
Date: Tue Oct 18 19:55:49 2016
New Revision: 40154
URL: http://svn.gna.org/viewcvs/gnustep?rev=40154&view=rev
Log:
Revert NSBitmapImageRep+PNG.m to prior merge
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/NSBitmapImageRep+PNG.m
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/NSBitmapImageRep+PNG.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSBitmapImageRep%2BPNG.m?rev=40154&r1=40153&r2=40154&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSBitmapImageRep+PNG.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSBitmapImageRep+PNG.m
Tue Oct 18 19:55:49 2016
@@ -55,7 +55,6 @@
#import <Foundation/NSString.h>
#import <Foundation/NSValue.h>
#import "AppKit/NSGraphics.h"
-#import "NSBitmapImageRepPrivate.h"
#import "NSBitmapImageRep+PNG.h"
@@ -321,19 +320,10 @@
NSNumber * gammaNumber = nil;
double gamma = 0.0;
- // Need to convert to non-pre-multiplied format
- if ([self isPlanar] || !(_format & NSAlphaNonpremultipliedBitmapFormat))
- {
- NSBitmapImageRep *converted = [self _convertToFormatBitsPerSample:
_bitsPerSample
- samplesPerPixel:
_numColors
- hasAlpha:
_hasAlpha
- isPlanar: NO
- colorSpaceName:
_colorSpace
- bitmapFormat: _format
| NSAlphaNonpremultipliedBitmapFormat
- bytesPerRow:
_bytesPerRow
- bitsPerPixel:
_bitsPerPixel];
-
- return [converted _PNGRepresentationWithProperties: properties];
+ // FIXME: Need to convert to non-pre-multiplied format
+ if ([self isPlanar]) // don't handle planar yet
+ {
+ return nil;
}
// get the image parameters
width = [self pixelsWide];
_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs
