2001-12-17 16:51:51 +00:00
|
|
|
/** <title>NSBitmapImageRep.m</title>
|
1996-05-30 20:03:15 +00:00
|
|
|
|
2001-12-17 16:51:51 +00:00
|
|
|
<abstract>Bitmap image representation.</abstract>
|
1996-05-30 20:03:15 +00:00
|
|
|
|
2004-01-07 23:53:15 +00:00
|
|
|
Copyright (C) 1996, 2003, 2004 Free Software Foundation, Inc.
|
1996-08-22 18:51:08 +00:00
|
|
|
|
2001-12-17 16:51:51 +00:00
|
|
|
Author: Adam Fedor <fedor@gnu.org>
|
1996-08-22 18:51:08 +00:00
|
|
|
Date: Feb 1996
|
1996-05-30 20:03:15 +00:00
|
|
|
|
|
|
|
This file is part of the GNUstep GUI Library.
|
|
|
|
|
|
|
|
This library is free software; you can redistribute it and/or
|
2007-10-29 21:16:17 +00:00
|
|
|
modify it under the terms of the GNU Lesser General Public
|
1996-05-30 20:03:15 +00:00
|
|
|
License as published by the Free Software Foundation; either
|
2008-06-10 04:01:49 +00:00
|
|
|
version 2 of the License, or (at your option) any later version.
|
2007-10-29 21:16:17 +00:00
|
|
|
|
1996-05-30 20:03:15 +00:00
|
|
|
This library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2007-10-29 21:16:17 +00:00
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Lesser General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
1996-10-18 17:14:13 +00:00
|
|
|
License along with this library; see the file COPYING.LIB.
|
2007-10-29 21:16:17 +00:00
|
|
|
If not, see <http://www.gnu.org/licenses/> or write to the
|
|
|
|
Free Software Foundation, 51 Franklin Street, Fifth Floor,
|
|
|
|
Boston, MA 02110-1301, USA.
|
1996-08-22 18:51:08 +00:00
|
|
|
*/
|
|
|
|
|
2003-07-31 23:52:10 +00:00
|
|
|
#include "config.h"
|
1996-08-22 18:51:08 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <math.h>
|
1997-02-18 00:29:25 +00:00
|
|
|
#include <tiff.h>
|
|
|
|
|
2004-01-07 23:53:15 +00:00
|
|
|
#include "AppKit/NSBitmapImageRep.h"
|
|
|
|
|
2004-01-08 18:43:49 +00:00
|
|
|
#include "NSBitmapImageRep+GIF.h"
|
2004-01-07 23:53:15 +00:00
|
|
|
#include "NSBitmapImageRep+JPEG.h"
|
|
|
|
#include "NSBitmapImageRep+PNG.h"
|
|
|
|
#include "NSBitmapImageRep+PNM.h"
|
2008-08-12 04:58:04 +00:00
|
|
|
#include "NSBitmapImageRep+ICNS.h"
|
2004-01-07 23:53:15 +00:00
|
|
|
|
1996-08-22 18:51:08 +00:00
|
|
|
#include <Foundation/NSArray.h>
|
2008-02-25 15:35:57 +00:00
|
|
|
#include <Foundation/NSAutoreleasePool.h>
|
1996-08-22 18:51:08 +00:00
|
|
|
#include <Foundation/NSData.h>
|
2001-07-30 21:30:51 +00:00
|
|
|
#include <Foundation/NSDebug.h>
|
2003-09-01 16:58:27 +00:00
|
|
|
#include <Foundation/NSException.h>
|
|
|
|
#include <Foundation/NSFileManager.h>
|
2003-09-20 02:57:45 +00:00
|
|
|
#include <Foundation/NSValue.h>
|
2003-09-01 16:58:27 +00:00
|
|
|
#include "AppKit/AppKitExceptions.h"
|
2003-06-13 15:01:12 +00:00
|
|
|
#include "AppKit/NSGraphics.h"
|
2003-09-20 02:57:45 +00:00
|
|
|
#include "AppKit/NSGraphicsContext.h"
|
2003-06-13 15:01:12 +00:00
|
|
|
#include "AppKit/NSPasteboard.h"
|
2003-09-01 16:58:27 +00:00
|
|
|
#include "AppKit/NSView.h"
|
2003-09-08 02:07:53 +00:00
|
|
|
#include "GSGuiPrivate.h"
|
1997-08-27 21:20:19 +00:00
|
|
|
|
2003-07-31 23:52:10 +00:00
|
|
|
#include "nsimage-tiff.h"
|
1996-08-22 18:51:08 +00:00
|
|
|
|
|
|
|
/* Maximum number of planes */
|
|
|
|
#define MAX_PLANES 5
|
|
|
|
|
2000-04-18 16:58:14 +00:00
|
|
|
/* Backend methods (optional) */
|
2004-02-03 22:42:15 +00:00
|
|
|
@interface NSBitmapImageRep (GSPrivate)
|
2001-06-08 16:44:05 +00:00
|
|
|
// GNUstep extension
|
|
|
|
- _initFromTIFFImage: (TIFF *)image number: (int)imageNumber;
|
2003-09-08 02:07:53 +00:00
|
|
|
|
|
|
|
// Internal
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
+ (int) _localFromCompressionType: (NSTIFFCompression)type;
|
|
|
|
+ (NSTIFFCompression) _compressionTypeFromLocal: (int)type;
|
2008-03-11 20:11:53 +00:00
|
|
|
- (void) _premultiply;
|
|
|
|
- (void) _unpremultiply;
|
|
|
|
- (NSBitmapImageRep *) _convertToFormatBitsPerSample: (int)bps
|
|
|
|
samplesPerPixel: (int)spp
|
|
|
|
hasAlpha: (BOOL)alpha
|
|
|
|
isPlanar: (BOOL)isPlanar
|
|
|
|
colorSpaceName: (NSString*)colorSpaceName
|
|
|
|
bitmapFormat: (NSBitmapFormat)bitmapFormat
|
|
|
|
bytesPerRow: (int)rowBytes
|
|
|
|
bitsPerPixel: (int)pixelBits;
|
1996-08-22 18:51:08 +00:00
|
|
|
@end
|
1996-05-30 20:03:15 +00:00
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
/**
|
|
|
|
<unit>
|
|
|
|
<heading>Class Description</heading>
|
|
|
|
<p>
|
|
|
|
NSBitmapImageRep is an image representation for handling images composed
|
|
|
|
of pixels. The standard image format for NSBitmapImageRep is the TIFF
|
|
|
|
format. However, through the use of image filters and other methods, many
|
|
|
|
other standard image formats can be handled by NSBitmapImageRep.
|
|
|
|
|
|
|
|
Images are typically handled through the NSImage class and there is often
|
|
|
|
no need to use the NSBitmapImageRep class directly. However there may
|
|
|
|
be cases where you want to manipulate the image bitmap data directly.
|
|
|
|
</p>
|
|
|
|
</unit>
|
|
|
|
*/
|
1996-08-22 18:51:08 +00:00
|
|
|
@implementation NSBitmapImageRep
|
1996-05-30 20:03:15 +00:00
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Returns YES if the image stored in data can be read and decoded */
|
2001-06-08 16:44:05 +00:00
|
|
|
+ (BOOL) canInitWithData: (NSData *)data
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
2001-06-08 16:44:05 +00:00
|
|
|
TIFF *image = NULL;
|
2003-09-01 16:58:27 +00:00
|
|
|
|
|
|
|
if (data == nil)
|
|
|
|
{
|
|
|
|
return NO;
|
|
|
|
}
|
|
|
|
|
2004-01-07 23:53:15 +00:00
|
|
|
if ([self _bitmapIsPNG: data])
|
|
|
|
return YES;
|
|
|
|
|
|
|
|
if ([self _bitmapIsPNM: data])
|
|
|
|
return YES;
|
|
|
|
|
|
|
|
if ([self _bitmapIsJPEG: data])
|
|
|
|
return YES;
|
|
|
|
|
2004-01-08 18:43:49 +00:00
|
|
|
if ([self _bitmapIsGIF: data])
|
|
|
|
return YES;
|
|
|
|
|
2008-08-12 04:58:04 +00:00
|
|
|
if ([self _bitmapIsICNS: data])
|
|
|
|
return YES;
|
|
|
|
|
2001-08-30 17:26:47 +00:00
|
|
|
image = NSTiffOpenDataRead ((char *)[data bytes], [data length]);
|
1996-08-22 18:51:08 +00:00
|
|
|
|
2001-08-30 17:26:47 +00:00
|
|
|
if (image != NULL)
|
|
|
|
{
|
|
|
|
NSTiffClose (image);
|
|
|
|
return YES;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return NO;
|
|
|
|
}
|
2001-06-08 16:44:05 +00:00
|
|
|
}
|
1996-08-22 18:51:08 +00:00
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Returns a list of image filename extensions that are understood by
|
|
|
|
NSBitmapImageRep. */
|
2001-06-08 16:44:05 +00:00
|
|
|
+ (NSArray *) imageUnfilteredFileTypes
|
|
|
|
{
|
|
|
|
static NSArray *types = nil;
|
|
|
|
|
|
|
|
if (types == nil)
|
1996-08-22 18:51:08 +00:00
|
|
|
{
|
2004-02-03 22:42:15 +00:00
|
|
|
types = [[NSArray alloc] initWithObjects:
|
2004-01-07 23:53:15 +00:00
|
|
|
@"tiff", @"tif",
|
|
|
|
@"pnm", @"ppm",
|
2005-03-21 16:12:02 +00:00
|
|
|
#if HAVE_LIBUNGIF || HAVE_LIBGIF
|
2004-01-08 18:43:49 +00:00
|
|
|
@"gif",
|
|
|
|
#endif
|
2004-01-07 23:53:15 +00:00
|
|
|
#if HAVE_LIBJPEG
|
|
|
|
@"jpeg", @"jpg",
|
|
|
|
#endif
|
|
|
|
#if HAVE_LIBPNG
|
|
|
|
@"png",
|
2008-08-12 04:58:04 +00:00
|
|
|
#endif
|
|
|
|
@"icns",
|
2004-01-07 23:53:15 +00:00
|
|
|
nil];
|
1996-08-22 18:51:08 +00:00
|
|
|
}
|
|
|
|
|
2001-06-08 16:44:05 +00:00
|
|
|
return types;
|
|
|
|
}
|
1996-08-22 18:51:08 +00:00
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Returns a list of image pasteboard types that are understood by
|
|
|
|
NSBitmapImageRep. */
|
2001-06-08 16:44:05 +00:00
|
|
|
+ (NSArray *) imageUnfilteredPasteboardTypes
|
|
|
|
{
|
|
|
|
static NSArray *types = nil;
|
|
|
|
|
|
|
|
if (types == nil)
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
2001-06-08 16:44:05 +00:00
|
|
|
types = [[NSArray alloc] initWithObjects: NSTIFFPboardType, nil];
|
1996-05-30 20:03:15 +00:00
|
|
|
}
|
2001-06-08 16:44:05 +00:00
|
|
|
|
|
|
|
return types;
|
1996-05-30 20:03:15 +00:00
|
|
|
}
|
|
|
|
|
2005-11-18 14:38:23 +00:00
|
|
|
/** <p>Returns a newly allocated NSBitmapImageRep object representing the
|
|
|
|
image stored in imageData. If the image data contains more than one
|
2006-12-10 09:46:21 +00:00
|
|
|
image, the first one is choosen.</p><p>See Also: +imageRepsWithData:</p>
|
2005-11-18 14:38:23 +00:00
|
|
|
*/
|
2003-09-08 02:07:53 +00:00
|
|
|
+ (id) imageRepWithData: (NSData *)imageData
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
1996-08-22 18:51:08 +00:00
|
|
|
NSArray* array;
|
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
array = [self imageRepsWithData: imageData];
|
1996-08-22 18:51:08 +00:00
|
|
|
if ([array count])
|
2001-06-12 22:15:49 +00:00
|
|
|
{
|
|
|
|
return [array objectAtIndex: 0];
|
|
|
|
}
|
1996-05-30 20:03:15 +00:00
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
2005-11-18 14:38:23 +00:00
|
|
|
/**<p>Returns an array containing newly allocated NSBitmapImageRep
|
|
|
|
objects representing the images stored in imageData.</p>
|
|
|
|
<p>See Also: +imageRepWithData:</p>
|
|
|
|
*/
|
2003-09-08 02:07:53 +00:00
|
|
|
+ (NSArray*) imageRepsWithData: (NSData *)imageData
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
2000-04-13 19:23:16 +00:00
|
|
|
int i, images;
|
|
|
|
TIFF *image;
|
|
|
|
NSMutableArray *array;
|
1996-08-22 18:51:08 +00:00
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
if (imageData == nil)
|
2003-09-01 16:58:27 +00:00
|
|
|
{
|
2003-09-08 02:07:53 +00:00
|
|
|
NSLog(@"NSBitmapImageRep: nil image data");
|
|
|
|
return [NSArray array];
|
2003-09-01 16:58:27 +00:00
|
|
|
}
|
|
|
|
|
2004-01-07 23:53:15 +00:00
|
|
|
if ([self _bitmapIsPNG: imageData])
|
|
|
|
{
|
|
|
|
NSBitmapImageRep *rep;
|
|
|
|
NSArray *a;
|
|
|
|
|
|
|
|
rep=[[self alloc] _initBitmapFromPNG: imageData];
|
|
|
|
if (!rep)
|
|
|
|
return [NSArray array];
|
|
|
|
a = [NSArray arrayWithObject: rep];
|
|
|
|
DESTROY(rep);
|
|
|
|
return a;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ([self _bitmapIsPNM: imageData])
|
|
|
|
{
|
|
|
|
NSBitmapImageRep *rep;
|
|
|
|
NSArray *a;
|
|
|
|
|
|
|
|
rep=[[self alloc] _initBitmapFromPNM: imageData
|
|
|
|
errorMessage: NULL];
|
|
|
|
if (!rep)
|
|
|
|
return [NSArray array];
|
|
|
|
a = [NSArray arrayWithObject: rep];
|
|
|
|
DESTROY(rep);
|
|
|
|
return a;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ([self _bitmapIsJPEG: imageData])
|
|
|
|
{
|
|
|
|
NSBitmapImageRep *rep;
|
|
|
|
NSArray *a;
|
|
|
|
|
|
|
|
rep=[[self alloc] _initBitmapFromJPEG: imageData
|
|
|
|
errorMessage: NULL];
|
|
|
|
if (!rep)
|
|
|
|
return [NSArray array];
|
|
|
|
a = [NSArray arrayWithObject: rep];
|
|
|
|
DESTROY(rep);
|
|
|
|
return a;
|
|
|
|
}
|
|
|
|
|
2004-01-08 18:43:49 +00:00
|
|
|
if ([self _bitmapIsGIF: imageData])
|
|
|
|
{
|
|
|
|
NSBitmapImageRep *rep;
|
|
|
|
NSArray *a;
|
|
|
|
|
|
|
|
rep=[[self alloc] _initBitmapFromGIF: imageData
|
|
|
|
errorMessage: NULL];
|
|
|
|
if (!rep)
|
|
|
|
return [NSArray array];
|
|
|
|
a = [NSArray arrayWithObject: rep];
|
|
|
|
DESTROY(rep);
|
|
|
|
return a;
|
|
|
|
}
|
|
|
|
|
2008-08-12 04:58:04 +00:00
|
|
|
if ([self _bitmapIsICNS: imageData])
|
|
|
|
{
|
|
|
|
NSBitmapImageRep *rep;
|
|
|
|
NSArray *a;
|
|
|
|
|
|
|
|
rep=[[self alloc] _initBitmapFromICNS: imageData];
|
|
|
|
if (!rep)
|
|
|
|
return [NSArray array];
|
|
|
|
a = [NSArray arrayWithObject: rep];
|
|
|
|
DESTROY(rep);
|
|
|
|
return a;
|
|
|
|
}
|
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
image = NSTiffOpenDataRead((char *)[imageData bytes], [imageData length]);
|
2000-04-13 19:23:16 +00:00
|
|
|
if (image == NULL)
|
1996-08-22 18:51:08 +00:00
|
|
|
{
|
2003-09-08 02:07:53 +00:00
|
|
|
NSLog(@"NSBitmapImageRep: unable to parse TIFF data");
|
|
|
|
return [NSArray array];
|
1996-08-22 18:51:08 +00:00
|
|
|
}
|
|
|
|
|
2000-04-13 19:23:16 +00:00
|
|
|
images = NSTiffGetImageCount(image);
|
|
|
|
NSDebugLLog(@"NSImage", @"Image contains %d directories", images);
|
|
|
|
array = [NSMutableArray arrayWithCapacity: images];
|
|
|
|
for (i = 0; i < images; i++)
|
1996-08-22 18:51:08 +00:00
|
|
|
{
|
|
|
|
NSBitmapImageRep* imageRep;
|
2001-06-12 22:15:49 +00:00
|
|
|
imageRep = [[self alloc] _initFromTIFFImage: image number: i];
|
2000-04-13 19:23:16 +00:00
|
|
|
if (imageRep)
|
2001-06-12 22:15:49 +00:00
|
|
|
{
|
|
|
|
[array addObject: AUTORELEASE(imageRep)];
|
|
|
|
}
|
1996-08-22 18:51:08 +00:00
|
|
|
}
|
|
|
|
NSTiffClose(image);
|
|
|
|
|
|
|
|
return array;
|
1996-05-30 20:03:15 +00:00
|
|
|
}
|
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Loads only the default (first) image from the TIFF image contained in
|
1996-08-22 18:51:08 +00:00
|
|
|
data. */
|
2003-09-08 02:07:53 +00:00
|
|
|
- (id) initWithData: (NSData *)imageData
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
1996-08-22 18:51:08 +00:00
|
|
|
TIFF *image;
|
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
if (imageData == nil)
|
2003-09-01 16:58:27 +00:00
|
|
|
{
|
|
|
|
RELEASE(self);
|
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
2004-01-07 23:53:15 +00:00
|
|
|
if ([isa _bitmapIsPNG: imageData])
|
|
|
|
return [self _initBitmapFromPNG: imageData];
|
|
|
|
|
|
|
|
if ([isa _bitmapIsPNM: imageData])
|
|
|
|
return [self _initBitmapFromPNM: imageData
|
|
|
|
errorMessage: NULL];
|
|
|
|
|
|
|
|
if ([isa _bitmapIsJPEG: imageData])
|
|
|
|
return [self _initBitmapFromJPEG: imageData
|
|
|
|
errorMessage: NULL];
|
|
|
|
|
2004-01-08 18:43:49 +00:00
|
|
|
if ([isa _bitmapIsGIF: imageData])
|
|
|
|
return [self _initBitmapFromGIF: imageData
|
|
|
|
errorMessage: NULL];
|
|
|
|
|
2008-08-12 04:58:04 +00:00
|
|
|
if ([isa _bitmapIsICNS: imageData])
|
|
|
|
return [self _initBitmapFromICNS: imageData];
|
|
|
|
|
2004-01-07 23:53:15 +00:00
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
image = NSTiffOpenDataRead((char *)[imageData bytes], [imageData length]);
|
2003-09-01 16:58:27 +00:00
|
|
|
if (image == NULL)
|
1996-08-22 18:51:08 +00:00
|
|
|
{
|
2000-04-18 16:58:14 +00:00
|
|
|
RELEASE(self);
|
|
|
|
NSLog(@"Tiff read invalid TIFF info from data");
|
|
|
|
return nil;
|
1996-08-22 18:51:08 +00:00
|
|
|
}
|
|
|
|
|
2000-04-18 16:58:14 +00:00
|
|
|
[self _initFromTIFFImage:image number: -1];
|
1996-08-22 18:51:08 +00:00
|
|
|
NSTiffClose(image);
|
|
|
|
return self;
|
1996-05-30 20:03:15 +00:00
|
|
|
}
|
|
|
|
|
2006-12-10 09:46:21 +00:00
|
|
|
/** Initialize with bitmap data from a rect within the focused view */
|
1996-08-22 18:51:08 +00:00
|
|
|
- (id) initWithFocusedViewRect: (NSRect)rect
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
2008-02-08 22:40:38 +00:00
|
|
|
int bps, spp, alpha, format;
|
2003-09-20 02:57:45 +00:00
|
|
|
NSSize size;
|
|
|
|
NSString *space;
|
|
|
|
unsigned char *planes[4];
|
|
|
|
NSDictionary *dict;
|
|
|
|
|
|
|
|
dict = [GSCurrentContext() GSReadRect: rect];
|
|
|
|
if (dict == nil)
|
|
|
|
{
|
|
|
|
NSLog(@"NSBitmapImageRep initWithFocusedViewRect: failed");
|
|
|
|
RELEASE(self);
|
|
|
|
return nil;
|
|
|
|
}
|
2004-07-30 13:58:03 +00:00
|
|
|
_imageData = RETAIN([dict objectForKey: @"Data"]);
|
2003-09-20 02:57:45 +00:00
|
|
|
if (_imageData == nil)
|
|
|
|
{
|
|
|
|
NSLog(@"NSBitmapImageRep initWithFocusedViewRect: failed");
|
|
|
|
RELEASE(self);
|
|
|
|
return nil;
|
|
|
|
}
|
2004-07-30 13:58:03 +00:00
|
|
|
bps = [[dict objectForKey: @"BitsPerSample"] intValue];
|
2003-09-20 02:57:45 +00:00
|
|
|
if (bps == 0)
|
|
|
|
bps = 8;
|
2004-07-30 13:58:03 +00:00
|
|
|
spp = [[dict objectForKey: @"SamplesPerPixel"] intValue];
|
|
|
|
alpha = [[dict objectForKey: @"HasAlpha"] intValue];
|
|
|
|
size = [[dict objectForKey: @"Size"] sizeValue];
|
|
|
|
space = [dict objectForKey: @"ColorSpace"];
|
2008-02-08 22:40:38 +00:00
|
|
|
format = [[dict objectForKey: @"BitmapFormat"] intValue];
|
2004-07-30 13:58:03 +00:00
|
|
|
planes[0] = (unsigned char *)[_imageData bytes];
|
2003-09-20 02:57:45 +00:00
|
|
|
self = [self initWithBitmapDataPlanes: planes
|
2008-02-08 22:40:38 +00:00
|
|
|
pixelsWide: size.width
|
|
|
|
pixelsHigh: size.height
|
|
|
|
bitsPerSample: bps
|
|
|
|
samplesPerPixel: spp
|
|
|
|
hasAlpha: (alpha) ? YES : NO
|
|
|
|
isPlanar: NO
|
|
|
|
colorSpaceName: space
|
|
|
|
bitmapFormat: format
|
|
|
|
bytesPerRow: 0
|
|
|
|
bitsPerPixel: 0];
|
2003-09-20 02:57:45 +00:00
|
|
|
return self;
|
1996-05-30 20:03:15 +00:00
|
|
|
}
|
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
/**
|
|
|
|
<init />
|
|
|
|
<p>
|
|
|
|
Initializes a newly created NSBitmapImageRep object to hold image data
|
|
|
|
specified in the planes buffer and organized according to the
|
|
|
|
additional arguments passed into the method.
|
|
|
|
</p>
|
|
|
|
<p>
|
|
|
|
The planes argument is an array of char pointers where each array
|
|
|
|
holds a single component or plane of data. Note that if data is
|
|
|
|
passed into the method via planes, the data is NOT copied and not
|
|
|
|
freed when the object is deallocated. It is assumed that the data
|
|
|
|
will always be available. If planes is NULL, then a suitable amount
|
|
|
|
of memory will be allocated to store the information needed. One can
|
|
|
|
then obtain a pointer to the planes data using the -bitmapData or
|
|
|
|
-getBitmapDataPlanes: method.
|
|
|
|
</p>
|
|
|
|
<p>
|
|
|
|
Each component of the data is in "standard" order, such as red, green,
|
|
|
|
blue for RGB color images. The transparency component, if these is one, should
|
|
|
|
always be last.
|
|
|
|
</p>
|
|
|
|
<p>
|
|
|
|
The other arguments to the method consist of:
|
|
|
|
</p>
|
|
|
|
<deflist>
|
|
|
|
<term>width and height</term>
|
|
|
|
<desc>The width and height of the image in pixels</desc>
|
|
|
|
<term>bps</term>
|
|
|
|
<desc>
|
|
|
|
The bits per sample or the number of bits used to store a number in
|
|
|
|
one component of one pixel of the image. Typically this is 8 (bits)
|
|
|
|
but can be 2 or 4, although not all values are supported.
|
|
|
|
</desc>
|
|
|
|
<term>spp</term>
|
|
|
|
<desc>
|
|
|
|
Samples per pixel, or the number of components of color in the pixel.
|
|
|
|
For instance this would be 4 for an RGB image with transparency.
|
|
|
|
</desc>
|
|
|
|
<term>alpha</term>
|
|
|
|
<desc>
|
|
|
|
Set to YES if the image has a transparency component.
|
|
|
|
</desc>
|
|
|
|
<term>isPlanar</term>
|
|
|
|
<desc>
|
|
|
|
Set to YES if the data is arranged in planes, i.e. one component
|
|
|
|
per buffer as stored in the planes array. If NO, then the image data
|
|
|
|
is mixed in one buffer. For instance, for RGB data, the first sample
|
|
|
|
would contain red, then next green, then blue, followed by red for the
|
|
|
|
next pixel.
|
|
|
|
</desc>
|
|
|
|
<term>colorSpaceName</term>
|
|
|
|
<desc>
|
|
|
|
This argument specifies how the data values are to be interpreted.
|
|
|
|
Possible values include the typical colorspace names (although
|
|
|
|
not all values are currently supported)
|
|
|
|
</desc>
|
|
|
|
<term>rowBytes</term>
|
|
|
|
<desc>
|
|
|
|
Specifies the number of bytes contained in a single scan line of the
|
|
|
|
data. Normally this can be computed from the width of the image,
|
|
|
|
the samples per pixel and the bits per sample. However, if the data
|
|
|
|
is aligned along word boundaries, this value may differ from this.
|
|
|
|
If rowBytes is 0, the method will calculate the value assuming there
|
|
|
|
are no extra bytes at the end of the scan line.
|
|
|
|
</desc>
|
|
|
|
<term>pixelBits</term>
|
|
|
|
<desc>
|
|
|
|
This is normally bps for planar data and bps times spp for non-planar
|
|
|
|
data, but sometimes images have extra bits. If pixelBits is 0 it
|
|
|
|
will be calculated as described above.
|
|
|
|
</desc>
|
|
|
|
</deflist>
|
1996-09-08 14:32:34 +00:00
|
|
|
*/
|
1996-08-22 18:51:08 +00:00
|
|
|
- (id) initWithBitmapDataPlanes: (unsigned char **)planes
|
2007-07-26 17:55:36 +00:00
|
|
|
pixelsWide: (int)width
|
|
|
|
pixelsHigh: (int)height
|
|
|
|
bitsPerSample: (int)bitsPerSample
|
|
|
|
samplesPerPixel: (int)samplesPerPixel
|
|
|
|
hasAlpha: (BOOL)alpha
|
|
|
|
isPlanar: (BOOL)isPlanar
|
|
|
|
colorSpaceName: (NSString *)colorSpaceName
|
|
|
|
bytesPerRow: (int)rowBytes
|
|
|
|
bitsPerPixel: (int)pixelBits
|
|
|
|
{
|
|
|
|
return [self initWithBitmapDataPlanes: planes
|
|
|
|
pixelsWide: width
|
|
|
|
pixelsHigh: height
|
|
|
|
bitsPerSample: bitsPerSample
|
|
|
|
samplesPerPixel: samplesPerPixel
|
|
|
|
hasAlpha: alpha
|
|
|
|
isPlanar: isPlanar
|
|
|
|
colorSpaceName: colorSpaceName
|
|
|
|
bitmapFormat: 0
|
|
|
|
bytesPerRow: rowBytes
|
|
|
|
bitsPerPixel: pixelBits];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (id) initWithBitmapDataPlanes: (unsigned char**)planes
|
|
|
|
pixelsWide: (int)width
|
|
|
|
pixelsHigh: (int)height
|
|
|
|
bitsPerSample: (int)bps
|
|
|
|
samplesPerPixel: (int)spp
|
|
|
|
hasAlpha: (BOOL)alpha
|
|
|
|
isPlanar: (BOOL)isPlanar
|
|
|
|
colorSpaceName: (NSString*)colorSpaceName
|
|
|
|
bitmapFormat: (NSBitmapFormat)bitmapFormat
|
|
|
|
bytesPerRow: (int)rowBytes
|
2008-02-25 15:35:57 +00:00
|
|
|
bitsPerPixel: (int)pixelBits
|
1996-08-22 18:51:08 +00:00
|
|
|
{
|
|
|
|
if (!bps || !spp || !width || !height)
|
|
|
|
{
|
|
|
|
[NSException raise: NSInvalidArgumentException
|
|
|
|
format: @"Required arguments not specified creating NSBitmapImageRep"];
|
|
|
|
}
|
1996-05-30 20:03:15 +00:00
|
|
|
|
1996-08-22 18:51:08 +00:00
|
|
|
_pixelsWide = width;
|
|
|
|
_pixelsHigh = height;
|
2000-12-23 14:21:34 +00:00
|
|
|
_size.width = width;
|
|
|
|
_size.height = height;
|
|
|
|
_bitsPerSample = bps;
|
2007-07-26 17:55:36 +00:00
|
|
|
_numColors = spp;
|
2000-12-23 14:21:34 +00:00
|
|
|
_hasAlpha = alpha;
|
1996-09-08 14:32:34 +00:00
|
|
|
_isPlanar = isPlanar;
|
1999-12-28 16:02:01 +00:00
|
|
|
_colorSpace = RETAIN(colorSpaceName);
|
2007-07-26 17:55:36 +00:00
|
|
|
_format = bitmapFormat;
|
1996-08-22 18:51:08 +00:00
|
|
|
if (!pixelBits)
|
1996-09-08 14:32:34 +00:00
|
|
|
pixelBits = bps * ((_isPlanar) ? 1 : spp);
|
2007-07-26 17:55:36 +00:00
|
|
|
_bitsPerPixel = pixelBits;
|
1996-08-22 18:51:08 +00:00
|
|
|
if (!rowBytes)
|
2000-12-23 14:21:34 +00:00
|
|
|
rowBytes = ceil((float)width * _bitsPerPixel / 8);
|
2007-07-26 17:55:36 +00:00
|
|
|
_bytesPerRow = rowBytes;
|
1996-08-22 18:51:08 +00:00
|
|
|
|
2001-06-08 16:44:05 +00:00
|
|
|
_imagePlanes = NSZoneMalloc([self zone], sizeof(unsigned char*) * MAX_PLANES);
|
1996-08-22 18:51:08 +00:00
|
|
|
if (planes)
|
|
|
|
{
|
2003-06-08 00:26:18 +00:00
|
|
|
unsigned int i;
|
2001-06-08 16:44:05 +00:00
|
|
|
|
1996-09-08 14:32:34 +00:00
|
|
|
for (i = 0; i < MAX_PLANES; i++)
|
2000-12-23 14:21:34 +00:00
|
|
|
_imagePlanes[i] = NULL;
|
|
|
|
for (i = 0; i < ((_isPlanar) ? _numColors : 1); i++)
|
|
|
|
_imagePlanes[i] = planes[i];
|
1996-08-22 18:51:08 +00:00
|
|
|
}
|
2001-06-08 16:44:05 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
unsigned char* bits;
|
|
|
|
long length;
|
2003-06-08 00:26:18 +00:00
|
|
|
unsigned int i;
|
2001-06-08 16:44:05 +00:00
|
|
|
|
|
|
|
// No image data was given, allocate it.
|
|
|
|
length = (long)((_isPlanar) ? _numColors : 1) * _bytesPerRow *
|
|
|
|
_pixelsHigh * sizeof(unsigned char);
|
|
|
|
_imageData = [[NSMutableData alloc] initWithLength: length];
|
|
|
|
bits = [_imageData mutableBytes];
|
|
|
|
_imagePlanes[0] = bits;
|
|
|
|
if (_isPlanar)
|
|
|
|
{
|
|
|
|
for (i=1; i < _numColors; i++)
|
|
|
|
_imagePlanes[i] = bits + i*_bytesPerRow * _pixelsHigh;
|
|
|
|
for (i= _numColors; i < MAX_PLANES; i++)
|
|
|
|
_imagePlanes[i] = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (i= 1; i < MAX_PLANES; i++)
|
|
|
|
_imagePlanes[i] = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-12-28 20:26:07 +00:00
|
|
|
if (alpha)
|
|
|
|
{
|
|
|
|
unsigned char *bData = (unsigned char*)[self bitmapData];
|
|
|
|
BOOL allOpaque = YES;
|
2000-12-23 14:21:34 +00:00
|
|
|
unsigned offset = _numColors - 1;
|
|
|
|
unsigned limit = _size.height * _size.width;
|
1999-12-28 20:26:07 +00:00
|
|
|
unsigned i;
|
|
|
|
|
|
|
|
for (i = 0; i < limit; i++)
|
|
|
|
{
|
|
|
|
unsigned a;
|
|
|
|
|
|
|
|
bData += offset;
|
|
|
|
a = *bData++;
|
|
|
|
if (a != 255)
|
|
|
|
{
|
|
|
|
allOpaque = NO;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
[self setOpaque: allOpaque];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
[self setOpaque: YES];
|
|
|
|
}
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
_properties = [[NSMutableDictionary alloc] init];
|
2008-03-11 20:11:53 +00:00
|
|
|
|
1996-08-22 18:51:08 +00:00
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2000-12-24 14:06:06 +00:00
|
|
|
- (void)colorizeByMappingGray:(float)midPoint
|
|
|
|
toColor:(NSColor *)midPointColor
|
|
|
|
blackMapping:(NSColor *)shadowColor
|
|
|
|
whiteMapping:(NSColor *)lightColor
|
|
|
|
{
|
|
|
|
// TODO
|
|
|
|
}
|
|
|
|
|
|
|
|
- (id)initWithBitmapHandle:(void *)bitmap
|
|
|
|
{
|
|
|
|
// TODO Only needed on MS Windows
|
|
|
|
RELEASE(self);
|
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (id)initWithIconHandle:(void *)icon
|
|
|
|
{
|
|
|
|
// TODO Only needed on MS Windows
|
|
|
|
RELEASE(self);
|
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
2007-07-26 17:55:36 +00:00
|
|
|
- (id) initForIncrementalLoad
|
|
|
|
{
|
|
|
|
// FIXME
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (int) incrementalLoadFromData: (NSData *)data complete: (BOOL)complete
|
|
|
|
{
|
|
|
|
if (!complete)
|
|
|
|
{
|
|
|
|
// we don't implement it really
|
|
|
|
return NSImageRepLoadStatusWillNeedAllData;
|
|
|
|
}
|
|
|
|
return [self initWithData:data] ? NSImageRepLoadStatusCompleted : NSImageRepLoadStatusUnexpectedEOF;
|
|
|
|
}
|
|
|
|
|
1996-08-22 18:51:08 +00:00
|
|
|
- (void) dealloc
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
2001-06-08 16:44:05 +00:00
|
|
|
NSZoneFree([self zone],_imagePlanes);
|
2000-12-23 14:21:34 +00:00
|
|
|
RELEASE(_imageData);
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
RELEASE(_properties);
|
1996-08-22 18:51:08 +00:00
|
|
|
[super dealloc];
|
1996-05-30 20:03:15 +00:00
|
|
|
}
|
|
|
|
|
1997-01-31 20:14:40 +00:00
|
|
|
//
|
1996-05-30 20:03:15 +00:00
|
|
|
// Getting Information about the Image
|
1997-01-31 20:14:40 +00:00
|
|
|
//
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Returns the number of bits need to contain one pixels worth of data.
|
|
|
|
This is normally the number of samples per pixel times the number of
|
|
|
|
bits in one sample. */
|
1996-08-22 18:51:08 +00:00
|
|
|
- (int) bitsPerPixel
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
2000-12-23 14:21:34 +00:00
|
|
|
return _bitsPerPixel;
|
1996-05-30 20:03:15 +00:00
|
|
|
}
|
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Returns the number of samples in a pixel. For instance, a normal RGB
|
|
|
|
image with transparency would have a samplesPerPixel of 4. */
|
1996-08-22 18:51:08 +00:00
|
|
|
- (int) samplesPerPixel
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
2000-12-23 14:21:34 +00:00
|
|
|
return _numColors;
|
1996-05-30 20:03:15 +00:00
|
|
|
}
|
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Returns YES if the image components are stored separately. Returns
|
|
|
|
NO if the components are meshed (i.e. all the samples for one pixel
|
|
|
|
come before the next pixel). */
|
1996-08-22 18:51:08 +00:00
|
|
|
- (BOOL) isPlanar
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
1996-09-08 14:32:34 +00:00
|
|
|
return _isPlanar;
|
1996-05-30 20:03:15 +00:00
|
|
|
}
|
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Returns the number of planes in an image. Typically this is
|
|
|
|
equal to the number of samples in a planar image or 1 for a non-planar
|
|
|
|
image. */
|
1996-08-22 18:51:08 +00:00
|
|
|
- (int) numberOfPlanes
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
2000-12-23 14:21:34 +00:00
|
|
|
return (_isPlanar) ? _numColors : 1;
|
1996-05-30 20:03:15 +00:00
|
|
|
}
|
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Returns the number of bytes in a plane. This is the number of bytes
|
|
|
|
in a row times tne height of the image. */
|
1996-08-22 18:51:08 +00:00
|
|
|
- (int) bytesPerPlane
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
2000-12-23 14:21:34 +00:00
|
|
|
return _bytesPerRow*_pixelsHigh;
|
1996-05-30 20:03:15 +00:00
|
|
|
}
|
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Returns the number of bytes in a row. This is typically based on the
|
|
|
|
width of the image and the bits per sample and samples per pixel (if
|
|
|
|
in medhed configuration). However it may differ from this if set
|
|
|
|
explicitly in -initWithBitmapDataPlanes:pixelsWide:pixelsHigh:bitsPerSample:samplesPerPixel:hasAlpha:isPlanar:colorSpaceName:bytesPerRow:bitsPerPixel:.
|
|
|
|
*/
|
1996-08-22 18:51:08 +00:00
|
|
|
- (int) bytesPerRow
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
2000-12-23 14:21:34 +00:00
|
|
|
return _bytesPerRow;
|
1996-05-30 20:03:15 +00:00
|
|
|
}
|
|
|
|
|
1997-01-31 20:14:40 +00:00
|
|
|
//
|
1996-05-30 20:03:15 +00:00
|
|
|
// Getting Image Data
|
1997-01-31 20:14:40 +00:00
|
|
|
//
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Returns the first plane of data representing the image. */
|
1996-08-22 18:51:08 +00:00
|
|
|
- (unsigned char *) bitmapData
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
1996-08-22 18:51:08 +00:00
|
|
|
unsigned char *planes[MAX_PLANES];
|
|
|
|
[self getBitmapDataPlanes: planes];
|
1997-01-31 13:40:15 +00:00
|
|
|
return planes[0];
|
1996-05-30 20:03:15 +00:00
|
|
|
}
|
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Files the array data with pointers to each of the data planes
|
|
|
|
representing the image. The data array must be allocated to contain
|
|
|
|
at least -samplesPerPixel pointers. */
|
1996-08-22 18:51:08 +00:00
|
|
|
- (void) getBitmapDataPlanes: (unsigned char **)data
|
|
|
|
{
|
2003-06-08 00:26:18 +00:00
|
|
|
unsigned int i;
|
1996-08-22 18:51:08 +00:00
|
|
|
|
|
|
|
if (data)
|
2001-06-08 22:51:11 +00:00
|
|
|
{
|
|
|
|
for (i = 0; i < _numColors; i++)
|
2007-07-26 17:55:36 +00:00
|
|
|
{
|
|
|
|
data[i] = _imagePlanes[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- (NSBitmapFormat) bitmapFormat
|
|
|
|
{
|
|
|
|
return _format;
|
|
|
|
}
|
|
|
|
|
2008-02-08 22:40:38 +00:00
|
|
|
/*
|
|
|
|
* This code was copied over from XGBitmap.m
|
|
|
|
* Here we extract a value a given number of bits wide from a bit
|
|
|
|
* offset into a block of memory starting at "base". The bit numbering
|
|
|
|
* is assumed to be such that a bit offset of zero and a width of 4 gives
|
|
|
|
* the upper 4 bits of the first byte, *not* the lower 4 bits. We do allow
|
|
|
|
* the value to cross a byte boundary, though it is unclear as to whether
|
|
|
|
* this is strictly necessary for OpenStep tiffs.
|
|
|
|
*/
|
|
|
|
static unsigned int
|
|
|
|
_get_bit_value(unsigned char *base, long msb_off, int bit_width)
|
|
|
|
{
|
|
|
|
long lsb_off, byte1, byte2;
|
|
|
|
int shift, value;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Firstly we calculate the position of the msb and lsb in terms
|
|
|
|
* of bit offsets and thus byte offsets. The shift is the number of
|
|
|
|
* spare bits left in the byte containing the lsb
|
|
|
|
*/
|
|
|
|
lsb_off= msb_off+bit_width-1;
|
|
|
|
byte1= msb_off/8;
|
|
|
|
byte2= lsb_off/8;
|
|
|
|
shift= 7-(lsb_off%8);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We now get the value from the byte array, possibly using two bytes if
|
|
|
|
* the required set of bits crosses the byte boundary. This is then shifted
|
|
|
|
* down to it's correct position and extraneous bits masked off before
|
|
|
|
* being returned.
|
|
|
|
*/
|
|
|
|
value=base[byte2];
|
|
|
|
if (byte1!=byte2)
|
|
|
|
value|= base[byte1]<<8;
|
|
|
|
value >>= shift;
|
|
|
|
|
|
|
|
return value & ((1<<bit_width)-1);
|
|
|
|
}
|
|
|
|
|
2009-12-14 13:26:26 +00:00
|
|
|
/**
|
|
|
|
* Returns the values of the components of pixel (x,y), where (0,0) is the
|
|
|
|
* top-left pixel in the image, by storing them in the array pixelData.
|
|
|
|
*/
|
2007-07-26 17:55:36 +00:00
|
|
|
- (void) getPixel: (unsigned int[])pixelData atX: (int)x y: (int)y
|
|
|
|
{
|
|
|
|
int i;
|
2008-02-08 22:40:38 +00:00
|
|
|
long int offset;
|
|
|
|
long int line_offset;
|
2007-07-26 17:55:36 +00:00
|
|
|
|
|
|
|
if (x < 0 || y < 0 || x >= _pixelsWide || y >= _pixelsHigh)
|
|
|
|
{
|
|
|
|
// outside
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-12-14 13:26:26 +00:00
|
|
|
line_offset = _bytesPerRow * y;
|
2007-07-26 17:55:36 +00:00
|
|
|
if (_isPlanar)
|
|
|
|
{
|
2008-02-08 22:40:38 +00:00
|
|
|
if (_bitsPerSample == 8)
|
2007-07-26 17:55:36 +00:00
|
|
|
{
|
2008-02-08 22:40:38 +00:00
|
|
|
offset = x + line_offset;
|
|
|
|
for (i = 0; i < _numColors; i++)
|
|
|
|
{
|
|
|
|
pixelData[i] = _imagePlanes[i][offset];
|
|
|
|
}
|
2007-07-26 17:55:36 +00:00
|
|
|
}
|
2008-02-08 22:40:38 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
offset = _bitsPerPixel * x;
|
|
|
|
for (i = 0; i < _numColors; i++)
|
|
|
|
{
|
|
|
|
pixelData[i] = _get_bit_value(_imagePlanes[i] + line_offset,
|
|
|
|
offset, _bitsPerSample);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2007-07-26 17:55:36 +00:00
|
|
|
else
|
|
|
|
{
|
2008-02-08 22:40:38 +00:00
|
|
|
if (_bitsPerSample == 8)
|
2007-07-26 17:55:36 +00:00
|
|
|
{
|
2008-02-08 22:40:38 +00:00
|
|
|
offset = (_bitsPerPixel * x) / 8 + line_offset;
|
|
|
|
for (i = 0; i < _numColors; i++)
|
|
|
|
{
|
|
|
|
pixelData[i] = _imagePlanes[0][offset + i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
offset = _bitsPerPixel * x;
|
|
|
|
for (i = 0; i < _numColors; i++)
|
|
|
|
{
|
|
|
|
pixelData[i] = _get_bit_value(_imagePlanes[0] + line_offset,
|
|
|
|
offset, _bitsPerSample);
|
|
|
|
offset += _bitsPerSample;
|
|
|
|
}
|
2007-07-26 17:55:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-08 22:40:38 +00:00
|
|
|
static void
|
|
|
|
_set_bit_value(unsigned char *base, long msb_off, int bit_width,
|
|
|
|
unsigned int value)
|
|
|
|
{
|
|
|
|
long lsb_off, byte1, byte2;
|
|
|
|
int shift;
|
|
|
|
int all;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Firstly we calculate the position of the msb and lsb in terms
|
|
|
|
* of bit offsets and thus byte offsets. The shift is the number of
|
|
|
|
* spare bits left in the byte containing the lsb
|
|
|
|
*/
|
|
|
|
lsb_off= msb_off+bit_width-1;
|
|
|
|
byte1= msb_off/8;
|
|
|
|
byte2= lsb_off/8;
|
|
|
|
shift= 7-(lsb_off%8);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We now set the value in the byte array, possibly using two bytes if
|
|
|
|
* the required set of bits crosses the byte boundary. This value is
|
|
|
|
* first shifted up to it's correct position and extraneous bits are
|
|
|
|
* masked off.
|
|
|
|
*/
|
|
|
|
value &= ((1<<bit_width)-1);
|
|
|
|
value <<= shift;
|
|
|
|
all = ((1<<bit_width)-1) << shift;
|
|
|
|
|
|
|
|
if (byte1 != byte2)
|
|
|
|
base[byte1] = (value >> 8) | (base[byte1] ^ (all >> 8));
|
|
|
|
base[byte2] = (value & 255) | (base[byte2] ^ (all & 255));
|
|
|
|
}
|
|
|
|
|
2009-12-14 13:26:26 +00:00
|
|
|
/**
|
|
|
|
* Sets the components of pixel (x,y), where (0,0) is the top-left pixel in
|
|
|
|
* the image, to the given array of pixel components.
|
|
|
|
*/
|
2007-07-26 17:55:36 +00:00
|
|
|
- (void) setPixel: (unsigned int[])pixelData atX: (int)x y: (int)y
|
|
|
|
{
|
|
|
|
int i;
|
2008-02-08 22:40:38 +00:00
|
|
|
long int offset;
|
|
|
|
long int line_offset;
|
2007-07-26 17:55:36 +00:00
|
|
|
|
|
|
|
if (x < 0 || y < 0 || x >= _pixelsWide || y >= _pixelsHigh)
|
|
|
|
{
|
|
|
|
// outside
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!_imagePlanes || !_imagePlanes[0])
|
|
|
|
{
|
|
|
|
// allocate plane memory
|
|
|
|
[self bitmapData];
|
2001-06-08 22:51:11 +00:00
|
|
|
}
|
2008-02-08 22:40:38 +00:00
|
|
|
|
2009-12-14 13:26:26 +00:00
|
|
|
line_offset = _bytesPerRow * y;
|
2007-07-26 17:55:36 +00:00
|
|
|
if(_isPlanar)
|
|
|
|
{
|
2008-02-08 22:40:38 +00:00
|
|
|
if (_bitsPerSample == 8)
|
2007-07-26 17:55:36 +00:00
|
|
|
{
|
2008-02-08 22:40:38 +00:00
|
|
|
offset = x + line_offset;
|
|
|
|
for (i = 0; i < _numColors; i++)
|
|
|
|
{
|
|
|
|
_imagePlanes[i][offset] = pixelData[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
offset = _bitsPerPixel * x;
|
|
|
|
for (i = 0; i < _numColors; i++)
|
|
|
|
{
|
|
|
|
_set_bit_value(_imagePlanes[i] + line_offset,
|
|
|
|
offset, _bitsPerSample, pixelData[i]);
|
|
|
|
}
|
2007-07-26 17:55:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-02-08 22:40:38 +00:00
|
|
|
if (_bitsPerSample == 8)
|
2007-07-26 17:55:36 +00:00
|
|
|
{
|
2008-02-08 22:40:38 +00:00
|
|
|
offset = (_bitsPerPixel * x) / 8 + line_offset;
|
|
|
|
for (i = 0; i < _numColors; i++)
|
|
|
|
{
|
|
|
|
_imagePlanes[0][offset + i] = pixelData[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
offset = _bitsPerPixel * x;
|
|
|
|
for (i = 0; i < _numColors; i++)
|
|
|
|
{
|
|
|
|
_set_bit_value(_imagePlanes[0] + line_offset,
|
|
|
|
offset, _bitsPerSample, pixelData[i]);
|
|
|
|
offset += _bitsPerSample;
|
|
|
|
}
|
2007-07-26 17:55:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-12-14 13:26:26 +00:00
|
|
|
/**
|
|
|
|
* Returns an NSColor object representing the color of the pixel (x,y), where
|
|
|
|
* (0,0) is the top-left pixel in the image.
|
|
|
|
*/
|
2007-07-26 17:55:36 +00:00
|
|
|
- (NSColor*) colorAtX: (int)x y: (int)y
|
|
|
|
{
|
|
|
|
unsigned int pixelData[5];
|
|
|
|
|
|
|
|
if (x < 0 || y < 0 || x >= _pixelsWide || y >= _pixelsHigh)
|
|
|
|
{
|
|
|
|
// outside
|
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
|
|
|
[self getPixel: pixelData atX: x y: y];
|
|
|
|
if ([_colorSpace isEqualToString: NSCalibratedRGBColorSpace]
|
|
|
|
|| [_colorSpace isEqualToString: NSDeviceRGBColorSpace])
|
|
|
|
{
|
|
|
|
unsigned int ir, ig, ib, ia;
|
|
|
|
float fr, fg, fb, fa;
|
|
|
|
float scale;
|
|
|
|
|
|
|
|
scale = (float)((1 << _bitsPerSample) - 1);
|
|
|
|
if (_hasAlpha)
|
|
|
|
{
|
2008-02-08 22:40:38 +00:00
|
|
|
// This order depends on the bitmap format
|
|
|
|
if (_format & NSAlphaFirstBitmapFormat)
|
|
|
|
{
|
|
|
|
ia = pixelData[0];
|
|
|
|
ir = pixelData[1];
|
|
|
|
ig = pixelData[2];
|
|
|
|
ib = pixelData[3];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ir = pixelData[0];
|
|
|
|
ig = pixelData[1];
|
|
|
|
ib = pixelData[2];
|
|
|
|
ia = pixelData[3];
|
|
|
|
}
|
|
|
|
|
2007-07-26 17:55:36 +00:00
|
|
|
// Scale to [0.0 ... 1.0] and undo premultiplication
|
|
|
|
fa = ia / scale;
|
2008-02-08 22:40:38 +00:00
|
|
|
if (_format & NSAlphaNonpremultipliedBitmapFormat)
|
|
|
|
{
|
|
|
|
fr = ir / scale;
|
|
|
|
fg = ig / scale;
|
|
|
|
fb = ib / scale;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fr = ir / (scale * fa);
|
|
|
|
fg = ig / (scale * fa);
|
|
|
|
fb = ib / (scale * fa);
|
|
|
|
}
|
2007-07-26 17:55:36 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ir = pixelData[0];
|
|
|
|
ig = pixelData[1];
|
|
|
|
ib = pixelData[2];
|
|
|
|
// Scale to [0.0 ... 1.0]
|
|
|
|
fr = ir / scale;
|
|
|
|
fg = ig / scale;
|
|
|
|
fb = ib / scale;
|
|
|
|
fa = 1.0;
|
|
|
|
}
|
|
|
|
if ([_colorSpace isEqualToString: NSCalibratedRGBColorSpace])
|
|
|
|
{
|
|
|
|
return [NSColor colorWithCalibratedRed: fr
|
|
|
|
green: fg
|
|
|
|
blue: fb
|
|
|
|
alpha: fa];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return [NSColor colorWithDeviceRed: fr
|
|
|
|
green: fg
|
|
|
|
blue: fb
|
|
|
|
alpha: fa];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if ([_colorSpace isEqual: NSDeviceWhiteColorSpace]
|
|
|
|
|| [_colorSpace isEqual: NSCalibratedWhiteColorSpace])
|
|
|
|
{
|
|
|
|
unsigned int iw, ia;
|
|
|
|
float fw, fa;
|
|
|
|
float scale;
|
|
|
|
|
|
|
|
scale = (float)((1 << _bitsPerSample) - 1);
|
|
|
|
if (_hasAlpha)
|
|
|
|
{
|
|
|
|
// FIXME: This order depends on the bitmap format
|
2008-02-08 22:40:38 +00:00
|
|
|
if (_format & NSAlphaFirstBitmapFormat)
|
|
|
|
{
|
|
|
|
ia = pixelData[0];
|
|
|
|
iw = pixelData[1];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
iw = pixelData[0];
|
|
|
|
ia = pixelData[1];
|
|
|
|
}
|
|
|
|
|
2007-07-26 17:55:36 +00:00
|
|
|
// Scale to [0.0 ... 1.0] and undo premultiplication
|
|
|
|
fa = ia / scale;
|
2008-02-08 22:40:38 +00:00
|
|
|
if (_format & NSAlphaNonpremultipliedBitmapFormat)
|
|
|
|
{
|
|
|
|
fw = iw / scale;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fw = iw / (scale * fa);
|
|
|
|
}
|
2007-07-26 17:55:36 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// FIXME: This order depends on the bitmap format
|
|
|
|
iw = pixelData[0];
|
|
|
|
// Scale to [0.0 ... 1.0]
|
|
|
|
fw = iw / scale;
|
|
|
|
fa = 1.0;
|
|
|
|
}
|
|
|
|
if ([_colorSpace isEqualToString: NSCalibratedWhiteColorSpace])
|
|
|
|
{
|
|
|
|
return [NSColor colorWithCalibratedWhite: fw
|
|
|
|
alpha: fa];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return [NSColor colorWithDeviceWhite: fw
|
|
|
|
alpha: fa];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if ([_colorSpace isEqual: NSDeviceBlackColorSpace]
|
|
|
|
|| [_colorSpace isEqual: NSCalibratedBlackColorSpace])
|
|
|
|
{
|
|
|
|
unsigned int ib, ia;
|
|
|
|
float fw, fa;
|
|
|
|
float scale;
|
|
|
|
|
|
|
|
scale = (float)((1 << _bitsPerSample) - 1);
|
|
|
|
if (_hasAlpha)
|
|
|
|
{
|
2008-02-08 22:40:38 +00:00
|
|
|
// This order depends on the bitmap format
|
|
|
|
if (_format & NSAlphaFirstBitmapFormat)
|
|
|
|
{
|
|
|
|
ia = pixelData[0];
|
|
|
|
ib = pixelData[1];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ib = pixelData[0];
|
|
|
|
ia = pixelData[1];
|
|
|
|
}
|
2007-07-26 17:55:36 +00:00
|
|
|
// Scale to [0.0 ... 1.0] and undo premultiplication
|
|
|
|
fa = ia / scale;
|
2008-02-08 22:40:38 +00:00
|
|
|
if (_format & NSAlphaNonpremultipliedBitmapFormat)
|
|
|
|
{
|
|
|
|
fw = 1.0 - ib / scale;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fw = 1.0 - ib / (scale * fa);
|
|
|
|
}
|
2007-07-26 17:55:36 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ib = pixelData[0];
|
|
|
|
// Scale to [0.0 ... 1.0]
|
|
|
|
fw = 1.0 - ib / scale;
|
|
|
|
fa = 1.0;
|
|
|
|
}
|
|
|
|
if ([_colorSpace isEqualToString: NSCalibratedBlackColorSpace])
|
|
|
|
{
|
|
|
|
return [NSColor colorWithCalibratedWhite: fw
|
|
|
|
alpha: fa];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return [NSColor colorWithDeviceWhite: fw
|
|
|
|
alpha: fa];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if ([_colorSpace isEqual: NSDeviceCMYKColorSpace])
|
|
|
|
{
|
|
|
|
unsigned int ic, im, iy, ib, ia;
|
|
|
|
float fc, fm, fy, fb, fa;
|
|
|
|
float scale;
|
|
|
|
|
|
|
|
scale = (float)((1 << _bitsPerSample) - 1);
|
|
|
|
if (_hasAlpha)
|
|
|
|
{
|
2008-02-08 22:40:38 +00:00
|
|
|
// This order depends on the bitmap format
|
|
|
|
if (_format & NSAlphaFirstBitmapFormat)
|
|
|
|
{
|
|
|
|
ia = pixelData[0];
|
|
|
|
ic = pixelData[1];
|
|
|
|
im = pixelData[2];
|
|
|
|
iy = pixelData[3];
|
|
|
|
ib = pixelData[4];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ic = pixelData[0];
|
|
|
|
im = pixelData[1];
|
|
|
|
iy = pixelData[2];
|
|
|
|
ib = pixelData[3];
|
|
|
|
ia = pixelData[4];
|
|
|
|
}
|
|
|
|
|
2007-07-26 17:55:36 +00:00
|
|
|
// Scale to [0.0 ... 1.0] and undo premultiplication
|
|
|
|
fa = ia / scale;
|
2008-02-08 22:40:38 +00:00
|
|
|
if (_format & NSAlphaNonpremultipliedBitmapFormat)
|
|
|
|
{
|
|
|
|
fc = ic / scale;
|
|
|
|
fm = im / scale;
|
|
|
|
fy = iy / scale;
|
|
|
|
fb = ib / scale;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fc = ic / (scale * fa);
|
|
|
|
fm = im / (scale * fa);
|
|
|
|
fy = iy / (scale * fa);
|
|
|
|
fb = ib / (scale * fa);
|
|
|
|
}
|
2007-07-26 17:55:36 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ic = pixelData[0];
|
|
|
|
im = pixelData[1];
|
|
|
|
iy = pixelData[2];
|
|
|
|
ib = pixelData[3];
|
|
|
|
// Scale to [0.0 ... 1.0]
|
|
|
|
fc = ic / scale;
|
|
|
|
fm = im / scale;
|
|
|
|
fy = iy / scale;
|
|
|
|
fb = ib / scale;
|
|
|
|
fa = 1.0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return [NSColor colorWithDeviceCyan: fc
|
|
|
|
magenta: fm
|
|
|
|
yellow: fy
|
|
|
|
black: fb
|
|
|
|
alpha: fa];
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
2009-12-14 13:26:26 +00:00
|
|
|
/**
|
|
|
|
* Sets the color of pixel (x,y), where (0,0) is the top-left pixel in the
|
|
|
|
* image.
|
|
|
|
*/
|
2007-07-26 17:55:36 +00:00
|
|
|
- (void) setColor: (NSColor*)color atX: (int)x y: (int)y
|
|
|
|
{
|
|
|
|
unsigned int pixelData[5];
|
|
|
|
NSColor *conv;
|
|
|
|
|
|
|
|
if (x < 0 || y < 0 || x >= _pixelsWide || y >= _pixelsHigh)
|
|
|
|
{
|
|
|
|
// outside
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
conv = [color colorUsingColorSpaceName: _colorSpace];
|
|
|
|
if (!conv)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ([_colorSpace isEqualToString: NSCalibratedRGBColorSpace]
|
|
|
|
|| [_colorSpace isEqualToString: NSDeviceRGBColorSpace])
|
|
|
|
{
|
|
|
|
unsigned int ir, ig, ib, ia;
|
|
|
|
float fr, fg, fb, fa;
|
|
|
|
float scale;
|
|
|
|
|
|
|
|
scale = (float)((1 << _bitsPerSample) - 1);
|
|
|
|
[conv getRed: &fr green: &fg blue: &fb alpha: &fa];
|
|
|
|
if(_hasAlpha)
|
|
|
|
{
|
|
|
|
// Scale and premultiply alpha
|
2008-02-08 22:40:38 +00:00
|
|
|
if (_format & NSAlphaNonpremultipliedBitmapFormat)
|
|
|
|
{
|
|
|
|
ir = scale * fr;
|
|
|
|
ig = scale * fg;
|
|
|
|
ib = scale * fb;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ir = scale * fr * fa;
|
|
|
|
ig = scale * fg * fa;
|
|
|
|
ib = scale * fb * fa;
|
|
|
|
}
|
2007-07-26 17:55:36 +00:00
|
|
|
ia = scale * fa;
|
2008-02-08 22:40:38 +00:00
|
|
|
|
|
|
|
// This order depends on the bitmap format
|
|
|
|
if (_format & NSAlphaFirstBitmapFormat)
|
|
|
|
{
|
|
|
|
pixelData[0] = ia;
|
|
|
|
pixelData[1] = ir;
|
|
|
|
pixelData[2] = ig;
|
|
|
|
pixelData[3] = ib;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pixelData[0] = ir;
|
|
|
|
pixelData[1] = ig;
|
|
|
|
pixelData[2] = ib;
|
|
|
|
pixelData[3] = ia;
|
|
|
|
}
|
2007-07-26 17:55:36 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Scale
|
|
|
|
ir = scale * fr;
|
|
|
|
ig = scale * fg;
|
|
|
|
ib = scale * fb;
|
2008-02-08 22:40:38 +00:00
|
|
|
// This order depends on the bitmap format
|
2007-07-26 17:55:36 +00:00
|
|
|
pixelData[0] = ir;
|
|
|
|
pixelData[1] = ig;
|
|
|
|
pixelData[2] = ib;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if ([_colorSpace isEqual: NSDeviceWhiteColorSpace]
|
|
|
|
|| [_colorSpace isEqual: NSCalibratedWhiteColorSpace])
|
|
|
|
{
|
|
|
|
unsigned int iw, ia;
|
|
|
|
float fw, fa;
|
|
|
|
float scale;
|
|
|
|
|
|
|
|
scale = (float)((1 << _bitsPerSample) - 1);
|
|
|
|
[conv getWhite: &fw alpha: &fa];
|
|
|
|
if (_hasAlpha)
|
|
|
|
{
|
2008-02-08 22:40:38 +00:00
|
|
|
if (_format & NSAlphaNonpremultipliedBitmapFormat)
|
|
|
|
{
|
|
|
|
iw = scale * fw;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
iw = scale * fw * fa;
|
|
|
|
}
|
2007-07-26 17:55:36 +00:00
|
|
|
ia = scale * fa;
|
2008-02-08 22:40:38 +00:00
|
|
|
|
|
|
|
// This order depends on the bitmap format
|
|
|
|
if (_format & NSAlphaFirstBitmapFormat)
|
|
|
|
{
|
|
|
|
pixelData[0] = ia;
|
|
|
|
pixelData[1] = iw;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pixelData[0] = iw;
|
|
|
|
pixelData[1] = ia;
|
|
|
|
}
|
2007-07-26 17:55:36 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
iw = scale * fw;
|
|
|
|
pixelData[0] = iw;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if ([_colorSpace isEqual: NSDeviceBlackColorSpace]
|
|
|
|
|| [_colorSpace isEqual: NSCalibratedBlackColorSpace])
|
|
|
|
{
|
|
|
|
unsigned int iw, ia;
|
|
|
|
float fw, fa;
|
|
|
|
float scale;
|
|
|
|
|
|
|
|
scale = (float)((1 << _bitsPerSample) - 1);
|
|
|
|
[conv getWhite: &fw alpha: &fa];
|
|
|
|
if (_hasAlpha)
|
|
|
|
{
|
2008-02-08 22:40:38 +00:00
|
|
|
if (_format & NSAlphaNonpremultipliedBitmapFormat)
|
|
|
|
{
|
|
|
|
iw = scale * (1 - fw);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
iw = scale * (1 - fw) * fa;
|
|
|
|
}
|
2007-07-26 17:55:36 +00:00
|
|
|
ia = scale * fa;
|
2008-02-08 22:40:38 +00:00
|
|
|
|
|
|
|
// This order depends on the bitmap format
|
|
|
|
if (_format & NSAlphaFirstBitmapFormat)
|
|
|
|
{
|
|
|
|
pixelData[0] = ia;
|
|
|
|
pixelData[1] = iw;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pixelData[0] = iw;
|
|
|
|
pixelData[1] = ia;
|
|
|
|
}
|
2007-07-26 17:55:36 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
iw = scale * (1 - fw);
|
|
|
|
pixelData[0] = iw;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if ([_colorSpace isEqual: NSDeviceCMYKColorSpace])
|
|
|
|
{
|
|
|
|
unsigned int ic, im, iy, ib, ia;
|
|
|
|
float fc, fm, fy, fb, fa;
|
|
|
|
float scale;
|
|
|
|
|
|
|
|
scale = (float)((1 << _bitsPerSample) - 1);
|
|
|
|
[conv getCyan: &fc magenta: &fm yellow: &fy black: &fb alpha: &fa];
|
|
|
|
if(_hasAlpha)
|
|
|
|
{
|
2008-02-08 22:40:38 +00:00
|
|
|
if (_format & NSAlphaNonpremultipliedBitmapFormat)
|
|
|
|
{
|
|
|
|
ic = scale * fc;
|
|
|
|
im = scale * fm;
|
|
|
|
iy = scale * fy;
|
|
|
|
ib = scale * fb;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ic = scale * fc * fa;
|
|
|
|
im = scale * fm * fa;
|
|
|
|
iy = scale * fy * fa;
|
|
|
|
ib = scale * fb * fa;
|
|
|
|
}
|
2007-07-26 17:55:36 +00:00
|
|
|
ia = scale * fa;
|
2008-02-08 22:40:38 +00:00
|
|
|
|
|
|
|
// This order depends on the bitmap format
|
|
|
|
if (_format & NSAlphaFirstBitmapFormat)
|
|
|
|
{
|
|
|
|
pixelData[0] = ia;
|
|
|
|
pixelData[1] = ic;
|
|
|
|
pixelData[2] = im;
|
|
|
|
pixelData[3] = iy;
|
|
|
|
pixelData[4] = ib;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pixelData[0] = ic;
|
|
|
|
pixelData[1] = im;
|
|
|
|
pixelData[2] = iy;
|
|
|
|
pixelData[3] = ib;
|
|
|
|
pixelData[4] = ia;
|
|
|
|
}
|
2007-07-26 17:55:36 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ic = scale * fc;
|
|
|
|
im = scale * fm;
|
|
|
|
iy = scale * fy;
|
|
|
|
ib = scale * fb;
|
2008-02-08 22:40:38 +00:00
|
|
|
// This order depends on the bitmap format
|
2007-07-26 17:55:36 +00:00
|
|
|
pixelData[0] = ic;
|
|
|
|
pixelData[1] = im;
|
|
|
|
pixelData[2] = iy;
|
|
|
|
pixelData[3] = ib;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// FIXME: Other colour spaces not implemented
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
[self setPixel: pixelData atX: x y: y];
|
1996-08-22 18:51:08 +00:00
|
|
|
}
|
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Draws the image in the current window according the information
|
|
|
|
from the current gState, including information about the current
|
|
|
|
point, scaling, etc. */
|
1996-08-22 18:51:08 +00:00
|
|
|
- (BOOL) draw
|
|
|
|
{
|
2000-12-23 14:21:34 +00:00
|
|
|
NSRect irect = NSMakeRect(0, 0, _size.width, _size.height);
|
2007-11-22 10:47:33 +00:00
|
|
|
NSGraphicsContext *ctxt = GSCurrentContext();
|
2000-12-23 14:21:34 +00:00
|
|
|
|
2008-03-11 20:11:53 +00:00
|
|
|
[self _premultiply];
|
2007-11-22 10:47:33 +00:00
|
|
|
[ctxt GSDrawImage: irect : self];
|
1999-12-28 19:20:45 +00:00
|
|
|
return YES;
|
1996-08-22 18:51:08 +00:00
|
|
|
}
|
1996-05-30 20:03:15 +00:00
|
|
|
|
1997-01-31 20:14:40 +00:00
|
|
|
//
|
1996-05-30 20:03:15 +00:00
|
|
|
// Producing a TIFF Representation of the Image
|
1997-01-31 20:14:40 +00:00
|
|
|
//
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Produces an NSData object containing a TIFF representation of all
|
|
|
|
the images stored in anArray. BUGS: Currently this only works if the
|
|
|
|
images are NSBitmapImageRep objects, and it only creates an TIFF from the
|
|
|
|
first image in the array. */
|
1999-12-28 16:02:01 +00:00
|
|
|
+ (NSData*) TIFFRepresentationOfImageRepsInArray: (NSArray *)anArray
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
2001-08-11 18:33:40 +00:00
|
|
|
//FIXME: This only outputs one of the ImageReps
|
|
|
|
NSEnumerator *enumerator = [anArray objectEnumerator];
|
|
|
|
NSImageRep *rep;
|
|
|
|
|
|
|
|
while ((rep = [enumerator nextObject]) != nil)
|
|
|
|
{
|
|
|
|
if ([rep isKindOfClass: self])
|
|
|
|
{
|
|
|
|
return [(NSBitmapImageRep*)rep TIFFRepresentation];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1996-05-30 20:03:15 +00:00
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Produces an NSData object containing a TIFF representation of all
|
|
|
|
the images stored in anArray. The image is compressed according to
|
|
|
|
the compression type and factor. BUGS: Currently this only works if
|
|
|
|
the images are NSBitmapImageRep objects, and it only creates an
|
|
|
|
TIFF from the first image in the array. */
|
1999-12-28 16:02:01 +00:00
|
|
|
+ (NSData*) TIFFRepresentationOfImageRepsInArray: (NSArray *)anArray
|
|
|
|
usingCompression: (NSTIFFCompression)type
|
|
|
|
factor: (float)factor
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
2001-08-11 18:33:40 +00:00
|
|
|
//FIXME: This only outputs one of the ImageReps
|
|
|
|
NSEnumerator *enumerator = [anArray objectEnumerator];
|
|
|
|
NSImageRep *rep;
|
|
|
|
|
|
|
|
while ((rep = [enumerator nextObject]) != nil)
|
|
|
|
{
|
|
|
|
if ([rep isKindOfClass: self])
|
|
|
|
{
|
|
|
|
return [(NSBitmapImageRep*)rep TIFFRepresentationUsingCompression: type
|
|
|
|
factor: factor];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1996-05-30 20:03:15 +00:00
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Returns an NSData object containing a TIFF representation of the
|
|
|
|
receiver. */
|
1999-12-28 16:02:01 +00:00
|
|
|
- (NSData*) TIFFRepresentation
|
2000-12-23 14:21:34 +00:00
|
|
|
{
|
2003-09-08 02:07:53 +00:00
|
|
|
if ([self canBeCompressedUsing: _compression] == NO)
|
|
|
|
{
|
|
|
|
[self setCompression: NSTIFFCompressionNone factor: 0];
|
|
|
|
}
|
|
|
|
return [self TIFFRepresentationUsingCompression: _compression
|
2000-12-23 14:21:34 +00:00
|
|
|
factor: _comp_factor];
|
|
|
|
}
|
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Returns an NSData object containing a TIFF representation of the
|
|
|
|
receiver. The TIFF data is compressed using compresssion type
|
|
|
|
and factor. */
|
2000-12-23 14:21:34 +00:00
|
|
|
- (NSData*) TIFFRepresentationUsingCompression: (NSTIFFCompression)type
|
|
|
|
factor: (float)factor
|
1999-12-28 16:02:01 +00:00
|
|
|
{
|
|
|
|
NSTiffInfo info;
|
|
|
|
TIFF *image;
|
|
|
|
char *bytes = 0;
|
|
|
|
long length = 0;
|
|
|
|
|
|
|
|
info.imageNumber = 0;
|
|
|
|
info.subfileType = 255;
|
|
|
|
info.width = _pixelsWide;
|
|
|
|
info.height = _pixelsHigh;
|
2000-12-23 14:21:34 +00:00
|
|
|
info.bitsPerSample = _bitsPerSample;
|
|
|
|
info.samplesPerPixel = _numColors;
|
1999-12-28 16:02:01 +00:00
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
if ([self canBeCompressedUsing: type] == NO)
|
|
|
|
{
|
|
|
|
type = NSTIFFCompressionNone;
|
|
|
|
factor = 0;
|
|
|
|
}
|
|
|
|
|
1999-12-28 16:02:01 +00:00
|
|
|
if (_isPlanar)
|
|
|
|
info.planarConfig = PLANARCONFIG_SEPARATE;
|
|
|
|
else
|
|
|
|
info.planarConfig = PLANARCONFIG_CONTIG;
|
|
|
|
|
2005-01-18 15:35:51 +00:00
|
|
|
if ([_colorSpace isEqual: NSDeviceRGBColorSpace]
|
|
|
|
|| [_colorSpace isEqual: NSCalibratedRGBColorSpace])
|
1999-12-28 16:02:01 +00:00
|
|
|
info.photoInterp = PHOTOMETRIC_RGB;
|
2005-01-18 15:35:51 +00:00
|
|
|
else if ([_colorSpace isEqual: NSDeviceWhiteColorSpace]
|
|
|
|
|| [_colorSpace isEqual: NSCalibratedWhiteColorSpace])
|
1999-12-28 16:02:01 +00:00
|
|
|
info.photoInterp = PHOTOMETRIC_MINISBLACK;
|
2005-01-18 15:35:51 +00:00
|
|
|
else if ([_colorSpace isEqual: NSDeviceBlackColorSpace]
|
|
|
|
|| [_colorSpace isEqual: NSCalibratedBlackColorSpace])
|
1999-12-28 16:02:01 +00:00
|
|
|
info.photoInterp = PHOTOMETRIC_MINISWHITE;
|
|
|
|
else
|
2005-01-18 15:35:51 +00:00
|
|
|
{
|
|
|
|
NSWarnMLog(@"Unknown colorspace %@.", _colorSpace);
|
|
|
|
info.photoInterp = PHOTOMETRIC_RGB;
|
|
|
|
}
|
1999-12-28 16:02:01 +00:00
|
|
|
|
2002-12-05 00:37:01 +00:00
|
|
|
info.extraSamples = (_hasAlpha) ? 1 : 0;
|
2008-02-08 22:40:38 +00:00
|
|
|
info.assocAlpha = (_format & NSAlphaNonpremultipliedBitmapFormat) ? 0 : 1;
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
info.compression = [NSBitmapImageRep _localFromCompressionType: type];
|
2003-09-08 02:07:53 +00:00
|
|
|
if (factor < 0)
|
|
|
|
factor = 0;
|
|
|
|
if (factor > 255)
|
|
|
|
factor = 255;
|
2000-12-23 14:21:34 +00:00
|
|
|
info.quality = (1 - ((float)factor)/255.0) * 100;
|
1999-12-28 16:02:01 +00:00
|
|
|
info.numImages = 1;
|
|
|
|
info.error = 0;
|
|
|
|
|
|
|
|
image = NSTiffOpenDataWrite(&bytes, &length);
|
|
|
|
if (image == 0)
|
|
|
|
{
|
2003-09-08 02:07:53 +00:00
|
|
|
[NSException raise: NSTIFFException
|
|
|
|
format: @"Opening data stream for writting"];
|
1999-12-28 16:02:01 +00:00
|
|
|
}
|
|
|
|
if (NSTiffWrite(image, &info, [self bitmapData]) != 0)
|
|
|
|
{
|
2003-09-08 02:07:53 +00:00
|
|
|
[NSException raise: NSTIFFException format: @"Writing data"];
|
1999-12-28 16:02:01 +00:00
|
|
|
}
|
|
|
|
NSTiffClose(image);
|
|
|
|
return [NSData dataWithBytesNoCopy: bytes length: length];
|
1996-08-22 18:51:08 +00:00
|
|
|
}
|
|
|
|
|
2007-01-15 10:18:24 +00:00
|
|
|
/** <p> Returns a data object in the selected format with multiple images.</p>
|
|
|
|
<p> See Also: -setProperty:withValue: for the options supported in the properties.</p>
|
2006-12-10 09:46:21 +00:00
|
|
|
<p> FIXME: returns only the first image in the array, and only works for
|
|
|
|
NSBitmapImageRep or subclasses thereof. </p>
|
|
|
|
*/
|
2000-12-24 14:06:06 +00:00
|
|
|
+ (NSData *)representationOfImageRepsInArray:(NSArray *)imageReps
|
|
|
|
usingType:(NSBitmapImageFileType)storageType
|
|
|
|
properties:(NSDictionary *)properties
|
|
|
|
{
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
// Partial implementation only returns data for the first imageRep in the array
|
|
|
|
// and only works for NSBitmapImageRep or subclasses thereof.
|
|
|
|
//FIXME: This only outputs one of the ImageReps
|
|
|
|
NSEnumerator *enumerator = [imageReps objectEnumerator];
|
|
|
|
NSImageRep *rep;
|
|
|
|
|
|
|
|
while ((rep = [enumerator nextObject]) != nil)
|
|
|
|
{
|
|
|
|
if ([rep isKindOfClass: self])
|
|
|
|
{
|
|
|
|
return [(NSBitmapImageRep*)rep representationUsingType: storageType
|
|
|
|
properties: properties];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-12-24 14:06:06 +00:00
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
2006-12-10 09:46:21 +00:00
|
|
|
/** <p> Returns a data object in one of the supported bitmap graphics file types.
|
|
|
|
A limited set of options may be passed via the properties. If the passed in properties is nil,
|
2007-01-15 10:18:24 +00:00
|
|
|
it falls back to the options set with -setProperty:withValue:. File types not yet
|
|
|
|
implemented return nil and log an error message.</p>
|
2006-12-10 09:46:21 +00:00
|
|
|
<p> See Also: -setProperty:withValue: for supported options in the properties. </p>
|
|
|
|
*/
|
2000-12-24 14:06:06 +00:00
|
|
|
- (NSData *)representationUsingType:(NSBitmapImageFileType)storageType
|
|
|
|
properties:(NSDictionary *)properties
|
|
|
|
{
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
// if it exists, the passed in properties takes precedence over the internal _properties
|
|
|
|
NSDictionary * __properties;
|
|
|
|
__properties = (properties)? properties : (NSDictionary *)_properties;
|
|
|
|
|
|
|
|
switch (storageType)
|
|
|
|
{
|
|
|
|
case NSTIFFFileType:
|
|
|
|
{
|
|
|
|
NSNumber * property;
|
|
|
|
float factor = _comp_factor;
|
|
|
|
NSTIFFCompression compression = _compression;
|
|
|
|
if ((property = [__properties objectForKey: NSImageCompressionMethod]))
|
|
|
|
compression = [property unsignedShortValue];
|
|
|
|
if ((property = [__properties objectForKey: NSImageCompressionFactor]))
|
|
|
|
factor = [property floatValue];
|
|
|
|
if ([self canBeCompressedUsing: compression] == NO)
|
|
|
|
{
|
|
|
|
factor = 0.0;
|
|
|
|
compression = NSTIFFCompressionNone;
|
|
|
|
}
|
|
|
|
return [self TIFFRepresentationUsingCompression: compression factor: factor];
|
|
|
|
}
|
|
|
|
|
|
|
|
case NSBMPFileType:
|
|
|
|
NSLog(@"BMP representation is not yet implemented");
|
|
|
|
return nil;
|
|
|
|
|
|
|
|
case NSGIFFileType:
|
|
|
|
return [self _GIFRepresentationWithProperties: __properties
|
|
|
|
errorMessage: NULL];
|
|
|
|
|
|
|
|
case NSJPEGFileType:
|
|
|
|
return [self _JPEGRepresentationWithProperties: __properties
|
|
|
|
errorMessage: NULL];
|
|
|
|
|
|
|
|
case NSPNGFileType:
|
|
|
|
return [self _PNGRepresentationWithProperties: __properties];
|
|
|
|
|
|
|
|
case NSJPEG2000FileType:
|
|
|
|
NSLog(@"JPEG2000 representation is not yet implemented");
|
|
|
|
return nil;
|
|
|
|
}
|
2000-12-24 14:06:06 +00:00
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
1997-01-31 20:14:40 +00:00
|
|
|
//
|
1996-05-30 20:03:15 +00:00
|
|
|
// Setting and Checking Compression Types
|
1997-01-31 20:14:40 +00:00
|
|
|
//
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
/** Returns a C-array of available TIFF compression types.
|
|
|
|
*/
|
1996-08-22 18:51:08 +00:00
|
|
|
+ (void) getTIFFCompressionTypes: (const NSTIFFCompression **)list
|
1999-12-28 16:02:01 +00:00
|
|
|
count: (int *)numTypes
|
1996-08-22 18:51:08 +00:00
|
|
|
{
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
// the GNUstep supported types
|
1999-12-28 16:02:01 +00:00
|
|
|
static NSTIFFCompression types[] = {
|
|
|
|
NSTIFFCompressionNone,
|
|
|
|
NSTIFFCompressionCCITTFAX3,
|
|
|
|
NSTIFFCompressionCCITTFAX4,
|
|
|
|
NSTIFFCompressionLZW,
|
|
|
|
NSTIFFCompressionJPEG,
|
2003-09-08 02:07:53 +00:00
|
|
|
NSTIFFCompressionNEXT,
|
|
|
|
NSTIFFCompressionPackBits,
|
|
|
|
NSTIFFCompressionOldJPEG
|
1999-12-28 16:02:01 +00:00
|
|
|
};
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
|
|
|
|
// check with libtiff to see what is really available
|
|
|
|
int i, j;
|
|
|
|
static NSTIFFCompression checkedTypes[8];
|
|
|
|
for (i = 0, j = 0; i < 8; i++)
|
|
|
|
{
|
|
|
|
if (NSTiffIsCodecConfigured([NSBitmapImageRep _localFromCompressionType: types[i]]))
|
|
|
|
{
|
|
|
|
checkedTypes[j] = types[i];
|
|
|
|
j++;
|
|
|
|
}
|
|
|
|
}
|
2003-09-08 02:07:53 +00:00
|
|
|
if (list)
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
*list = checkedTypes;
|
2003-09-08 02:07:53 +00:00
|
|
|
if (numTypes)
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
*numTypes = j;
|
1996-08-22 18:51:08 +00:00
|
|
|
}
|
|
|
|
|
2006-12-10 09:46:21 +00:00
|
|
|
/** Returns a localized string describing a TIFF compression type. */
|
1999-12-28 16:02:01 +00:00
|
|
|
+ (NSString*) localizedNameForTIFFCompressionType: (NSTIFFCompression)type
|
1996-08-22 18:51:08 +00:00
|
|
|
{
|
1999-12-28 16:02:01 +00:00
|
|
|
switch (type)
|
|
|
|
{
|
2003-09-08 02:07:53 +00:00
|
|
|
case NSTIFFCompressionNone: return _(@"No Compression");
|
|
|
|
case NSTIFFCompressionCCITTFAX3: return _(@"CCITTFAX3 Compression");
|
|
|
|
case NSTIFFCompressionCCITTFAX4: return _(@"CCITTFAX4 Compression");
|
|
|
|
case NSTIFFCompressionLZW: return _(@"LZW Compression");
|
|
|
|
case NSTIFFCompressionJPEG: return _(@"JPEG Compression");
|
|
|
|
case NSTIFFCompressionNEXT: return _(@"NEXT Compression");
|
|
|
|
case NSTIFFCompressionPackBits: return _(@"PackBits Compression");
|
|
|
|
case NSTIFFCompressionOldJPEG: return _(@"Old JPEG Compression");
|
1999-12-28 16:02:01 +00:00
|
|
|
default: return nil;
|
|
|
|
}
|
1996-08-22 18:51:08 +00:00
|
|
|
}
|
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Returns YES if the receiver can be stored in a representation
|
|
|
|
compressed using the compression type. */
|
2002-01-26 04:14:38 +00:00
|
|
|
- (BOOL) canBeCompressedUsing: (NSTIFFCompression)compression
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
2003-09-08 02:07:53 +00:00
|
|
|
BOOL does;
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
int codecConf =
|
|
|
|
NSTiffIsCodecConfigured([NSBitmapImageRep _localFromCompressionType: compression]);
|
2002-01-26 04:14:38 +00:00
|
|
|
switch (compression)
|
1999-12-28 16:02:01 +00:00
|
|
|
{
|
|
|
|
case NSTIFFCompressionCCITTFAX3:
|
|
|
|
case NSTIFFCompressionCCITTFAX4:
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
if (_numColors == 1 && _bitsPerSample == 1 && codecConf != 0)
|
2003-09-08 02:07:53 +00:00
|
|
|
does = YES;
|
1999-12-28 16:02:01 +00:00
|
|
|
else
|
2003-09-08 02:07:53 +00:00
|
|
|
does = NO;
|
|
|
|
break;
|
1999-12-28 16:02:01 +00:00
|
|
|
|
|
|
|
case NSTIFFCompressionLZW:
|
2003-09-08 02:07:53 +00:00
|
|
|
case NSTIFFCompressionNone:
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
case NSTIFFCompressionJPEG: // this is a GNUstep extension; Cocoa does not support
|
1999-12-28 16:02:01 +00:00
|
|
|
case NSTIFFCompressionPackBits:
|
2003-09-08 02:07:53 +00:00
|
|
|
case NSTIFFCompressionOldJPEG:
|
1999-12-28 16:02:01 +00:00
|
|
|
case NSTIFFCompressionNEXT:
|
|
|
|
default:
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
does = (codecConf != 0);
|
1999-12-28 16:02:01 +00:00
|
|
|
}
|
2003-09-08 02:07:53 +00:00
|
|
|
return does;
|
1996-05-30 20:03:15 +00:00
|
|
|
}
|
|
|
|
|
2003-09-08 02:07:53 +00:00
|
|
|
/** Returns the receivers compression and compression factor, which is
|
|
|
|
set either when the image is read in or by -setCompression:factor:.
|
|
|
|
Factor is ignored in many compression schemes. For JPEG compression,
|
|
|
|
factor can be any value from 0 to 255, with 255 being the maximum
|
|
|
|
compression. */
|
2002-01-26 04:14:38 +00:00
|
|
|
- (void) getCompression: (NSTIFFCompression*)compression
|
1999-12-28 16:02:01 +00:00
|
|
|
factor: (float*)factor
|
1996-08-22 18:51:08 +00:00
|
|
|
{
|
2002-01-26 04:14:38 +00:00
|
|
|
*compression = _compression;
|
2000-12-23 14:21:34 +00:00
|
|
|
*factor = _comp_factor;
|
1996-08-22 18:51:08 +00:00
|
|
|
}
|
|
|
|
|
2002-01-26 04:14:38 +00:00
|
|
|
- (void) setCompression: (NSTIFFCompression)compression
|
1999-12-28 16:02:01 +00:00
|
|
|
factor: (float)factor
|
1996-08-22 18:51:08 +00:00
|
|
|
{
|
2002-01-26 04:14:38 +00:00
|
|
|
_compression = compression;
|
2000-12-23 14:21:34 +00:00
|
|
|
_comp_factor = factor;
|
1996-08-22 18:51:08 +00:00
|
|
|
}
|
1996-05-30 20:03:15 +00:00
|
|
|
|
2006-12-10 09:46:21 +00:00
|
|
|
/** <p> Properties are key-value pairs associated with the representation. Arbitrary
|
|
|
|
key-value pairs may be set. If the value is nil, the key is erased from properties.
|
|
|
|
There are standard keys that are used to pass information
|
|
|
|
and options related to the standard file types that may be read from or written to.
|
|
|
|
Certain properties are automatically set when reading in image data.
|
|
|
|
Certain properties may be set by the user prior to writing image data in order to set options
|
|
|
|
for the data format. </p>
|
|
|
|
<deflist>
|
|
|
|
<term> NSImageCompressionMethod </term>
|
|
|
|
<desc> NSNumber; automatically set when reading TIFF data; writing TIFF data </desc>
|
|
|
|
<term> NSImageCompressionFactor </term>
|
|
|
|
<desc> NSNumber 0.0 to 255.0; writing JPEG data
|
|
|
|
(GNUstep extension: JPEG-compressed TIFFs too) </desc>
|
|
|
|
<term> NSImageProgressive </term>
|
|
|
|
<desc> NSNumber boolean; automatically set when reading JPEG data; writing JPEG data.
|
|
|
|
Note: progressive display is not supported in GNUstep at this time. </desc>
|
|
|
|
<term> NSImageInterlaced </term>
|
|
|
|
<desc> NSNumber boolean; only for writing PNG data </desc>
|
|
|
|
<term> NSImageGamma </term>
|
|
|
|
<desc> NSNumber 0.0 to 1.0; only for reading or writing PNG data </desc>
|
|
|
|
<term> NSImageRGBColorTable </term>
|
|
|
|
<desc> NSData; automatically set when reading GIF data; writing GIF data </desc>
|
|
|
|
<term> NSImageFrameCount </term>
|
|
|
|
<desc> NSNumber integer; automatically set when reading animated GIF data.
|
|
|
|
Not currently implemented. </desc>
|
|
|
|
<term> NSImageCurrentFrame </term>
|
|
|
|
<desc> NSNumber integer; only for animated GIF files. Not currently implemented. </desc>
|
|
|
|
<term> NSImageCurrentFrameDuration </term>
|
|
|
|
<desc> NSNumber float; automatically set when reading animated GIF data </desc>
|
|
|
|
<term> NSImageLoopCount </term>
|
|
|
|
<desc> NSNumber integer; automatically set when reading animated GIF data </desc>
|
|
|
|
<term> NSImageDitherTranparency </term>
|
|
|
|
<desc> NSNumber boolean; only for writing GIF data. Not currently supported. </desc>
|
|
|
|
</deflist>
|
|
|
|
*/
|
2000-12-24 14:06:06 +00:00
|
|
|
- (void)setProperty:(NSString *)property withValue:(id)value
|
|
|
|
{
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
if (value)
|
|
|
|
{
|
|
|
|
[_properties setObject: value forKey: property];
|
|
|
|
}
|
|
|
|
else // clear the property
|
|
|
|
{
|
|
|
|
[_properties removeObjectForKey: property];
|
|
|
|
}
|
2000-12-24 14:06:06 +00:00
|
|
|
}
|
|
|
|
|
2006-12-10 09:46:21 +00:00
|
|
|
/** Returns the value of a property */
|
2000-12-24 14:06:06 +00:00
|
|
|
- (id)valueForProperty:(NSString *)property
|
|
|
|
{
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
return [_properties objectForKey: property];
|
2000-12-24 14:06:06 +00:00
|
|
|
}
|
|
|
|
|
2001-06-07 21:56:19 +00:00
|
|
|
// NSCopying protocol
|
|
|
|
- (id) copyWithZone: (NSZone *)zone
|
|
|
|
{
|
|
|
|
NSBitmapImageRep *copy;
|
|
|
|
|
|
|
|
copy = (NSBitmapImageRep*)[super copyWithZone: zone];
|
|
|
|
|
|
|
|
copy->_imageData = [_imageData copyWithZone: zone];
|
2001-06-08 16:44:05 +00:00
|
|
|
copy->_imagePlanes = NSZoneMalloc(zone, sizeof(unsigned char*) * MAX_PLANES);
|
|
|
|
if (_imageData == nil)
|
|
|
|
{
|
|
|
|
memcpy(copy->_imagePlanes, _imagePlanes, sizeof(unsigned char*) * MAX_PLANES);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
unsigned char* bits;
|
2003-06-08 00:26:18 +00:00
|
|
|
unsigned int i;
|
2001-06-08 16:44:05 +00:00
|
|
|
|
|
|
|
bits = [copy->_imageData mutableBytes];
|
|
|
|
copy->_imagePlanes[0] = bits;
|
|
|
|
if (_isPlanar)
|
|
|
|
{
|
|
|
|
for (i=1; i < _numColors; i++)
|
|
|
|
copy->_imagePlanes[i] = bits + i*_bytesPerRow * _pixelsHigh;
|
|
|
|
for (i= _numColors; i < MAX_PLANES; i++)
|
|
|
|
copy->_imagePlanes[i] = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (i= 1; i < MAX_PLANES; i++)
|
|
|
|
copy->_imagePlanes[i] = NULL;
|
|
|
|
}
|
|
|
|
}
|
2001-06-07 21:56:19 +00:00
|
|
|
|
|
|
|
return copy;
|
|
|
|
}
|
|
|
|
|
1997-01-31 20:14:40 +00:00
|
|
|
//
|
1996-05-30 20:03:15 +00:00
|
|
|
// NSCoding protocol
|
1997-01-31 20:14:40 +00:00
|
|
|
//
|
1999-03-02 08:58:30 +00:00
|
|
|
- (void) encodeWithCoder: (NSCoder*)aCoder
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
2003-09-08 02:07:53 +00:00
|
|
|
NSData *data = [self TIFFRepresentation];
|
1999-12-28 16:02:01 +00:00
|
|
|
|
|
|
|
[super encodeWithCoder: aCoder];
|
2006-10-15 08:34:47 +00:00
|
|
|
if ([aCoder allowsKeyedCoding])
|
2006-08-09 01:37:32 +00:00
|
|
|
{
|
|
|
|
[aCoder encodeObject: data forKey: @"NSTIFFRepresentation"];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
[aCoder encodeObject: data];
|
|
|
|
}
|
1996-05-30 20:03:15 +00:00
|
|
|
}
|
|
|
|
|
1999-03-02 08:58:30 +00:00
|
|
|
- (id) initWithCoder: (NSCoder*)aDecoder
|
1996-05-30 20:03:15 +00:00
|
|
|
{
|
1999-12-28 16:02:01 +00:00
|
|
|
NSData *data;
|
|
|
|
|
|
|
|
self = [super initWithCoder: aDecoder];
|
2004-10-10 22:36:02 +00:00
|
|
|
if ([aDecoder allowsKeyedCoding])
|
|
|
|
{
|
|
|
|
data = [aDecoder decodeObjectForKey: @"NSTIFFRepresentation"];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
data = [aDecoder decodeObject];
|
|
|
|
}
|
1999-12-28 16:02:01 +00:00
|
|
|
return [self initWithData: data];
|
1996-05-30 20:03:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
@end
|
2000-12-24 14:06:06 +00:00
|
|
|
|
2004-02-03 22:42:15 +00:00
|
|
|
@implementation NSBitmapImageRep (GSPrivate)
|
2000-12-24 14:06:06 +00:00
|
|
|
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
+ (int) _localFromCompressionType: (NSTIFFCompression)type
|
2003-09-08 02:07:53 +00:00
|
|
|
{
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case NSTIFFCompressionNone: return COMPRESSION_NONE;
|
|
|
|
case NSTIFFCompressionCCITTFAX3: return COMPRESSION_CCITTFAX3;
|
|
|
|
case NSTIFFCompressionCCITTFAX4: return COMPRESSION_CCITTFAX4;
|
|
|
|
case NSTIFFCompressionLZW: return COMPRESSION_LZW;
|
|
|
|
case NSTIFFCompressionJPEG: return COMPRESSION_JPEG;
|
|
|
|
case NSTIFFCompressionNEXT: return COMPRESSION_NEXT;
|
|
|
|
case NSTIFFCompressionPackBits: return COMPRESSION_PACKBITS;
|
|
|
|
case NSTIFFCompressionOldJPEG: return COMPRESSION_OJPEG;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return COMPRESSION_NONE;
|
|
|
|
}
|
|
|
|
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
+ (NSTIFFCompression) _compressionTypeFromLocal: (int)type
|
2003-09-08 02:07:53 +00:00
|
|
|
{
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case COMPRESSION_NONE: return NSTIFFCompressionNone;
|
|
|
|
case COMPRESSION_CCITTFAX3: return NSTIFFCompressionCCITTFAX3;
|
|
|
|
case COMPRESSION_CCITTFAX4: return NSTIFFCompressionCCITTFAX4;
|
|
|
|
case COMPRESSION_LZW: return NSTIFFCompressionLZW;
|
|
|
|
case COMPRESSION_JPEG: return NSTIFFCompressionJPEG;
|
|
|
|
case COMPRESSION_NEXT: return NSTIFFCompressionNEXT;
|
|
|
|
case COMPRESSION_PACKBITS: return NSTIFFCompressionPackBits;
|
|
|
|
case COMPRESSION_OJPEG: return NSTIFFCompressionOldJPEG;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return NSTIFFCompressionNone;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-08 16:44:05 +00:00
|
|
|
/* Given a TIFF image (from the libtiff library), load the image information
|
|
|
|
into our data structure. Reads the specified image. */
|
|
|
|
- _initFromTIFFImage: (TIFF *)image number: (int)imageNumber
|
|
|
|
{
|
|
|
|
NSString* space;
|
|
|
|
NSTiffInfo* info;
|
|
|
|
|
|
|
|
/* Seek to the correct image and get the dictionary information */
|
|
|
|
info = NSTiffGetInfo(imageNumber, image);
|
|
|
|
if (!info)
|
|
|
|
{
|
|
|
|
RELEASE(self);
|
|
|
|
NSLog(@"Tiff read invalid TIFF info in directory %d", imageNumber);
|
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 8-bit RGB will be converted to 24-bit by the tiff routines, so account
|
|
|
|
for this. */
|
|
|
|
space = nil;
|
|
|
|
switch(info->photoInterp)
|
|
|
|
{
|
|
|
|
case PHOTOMETRIC_MINISBLACK: space = NSDeviceWhiteColorSpace; break;
|
|
|
|
case PHOTOMETRIC_MINISWHITE: space = NSDeviceBlackColorSpace; break;
|
|
|
|
case PHOTOMETRIC_RGB: space = NSDeviceRGBColorSpace; break;
|
|
|
|
case PHOTOMETRIC_PALETTE:
|
|
|
|
space = NSDeviceRGBColorSpace;
|
|
|
|
info->samplesPerPixel = 3;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
[self initWithBitmapDataPlanes: NULL
|
2008-02-08 22:40:38 +00:00
|
|
|
pixelsWide: info->width
|
|
|
|
pixelsHigh: info->height
|
|
|
|
bitsPerSample: info->bitsPerSample
|
|
|
|
samplesPerPixel: info->samplesPerPixel
|
|
|
|
hasAlpha: (info->extraSamples > 0)
|
|
|
|
isPlanar: (info->planarConfig == PLANARCONFIG_SEPARATE)
|
|
|
|
colorSpaceName: space
|
|
|
|
bitmapFormat: (info->assocAlpha ? 0 :
|
|
|
|
NSAlphaNonpremultipliedBitmapFormat)
|
|
|
|
bytesPerRow: 0
|
|
|
|
bitsPerPixel: 0];
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
_compression = [NSBitmapImageRep _compressionTypeFromLocal: info->compression];
|
2001-06-08 16:44:05 +00:00
|
|
|
_comp_factor = 255 * (1 - ((float)info->quality)/100.0);
|
|
|
|
|
Change Log
Mon. 20-Nov-2006 Mark Tracy <tracy454 at concentric dot net>
Many changes related to bitmap images
1. NSBitmapImateRep attribute global strings were not defined
Fix: add definitions to externs.h, and declarations to NSBitmapImageRep.h
Comment: Two strings defined in Cocoa were commented out: NSImageColorSyncData
is proprietary to Apple, and NSImageEXIFData has no support elsewhere in
GNUstep. I propose adding GSImageICCProfileData if and when color management
is added to GNUstep.
2. LZW compression in TIFF was disabled for lack of a test of its availability
Fix: Implement NSTiffIsCodecConfigured(codec) in tiff.m
Comment: As of libtiff-3.7.0, there is a function call in the API to test
availability at runtime. For libtiff-3.6.0 (earlier?) there are macros
#defined in tiffconf.h. The implementation check the library version at
compile time, and uses one of the two methods. I have not tested the
second method for lack of an installation of an old libtiff.
3. -canCompressUsing: relied on a static list of capabilities
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: The static list could be wrong, as it was on my system. Also
eliminate the supports_lzw_compression flag.
4. +getTIFFCompressionTypes:count: relied on a static list of compressors.
Fix: Use the new NSTiffIsCodecConfigured(codec) in NSBitmapImageRep.m
Comment: Compares GNUstep supported compressors against actual availability.
Also change the private instance methods _localFromCompressionType and
_compressionTypeFromLocal to private class methods so that they can be used
in -initWithTIFFImage:number: and -TIFFRepresentationUsingCompression:factor:
and +getTIFFCompressionTypes:count: This is probably a clumsy implementation
but it works.
5. -setProperty:toValue: and -valueForProperty: were not implemented
Fix: Add a new instance variable NSMutableDictionary * _properties to
NSBitmapImageRep.h and implemented accessors in NSBitmapImageRep.m. Patch
-_initFromTIFFImage to set compression type and factor in _properties.
Comment: This feature is used to pass options to and from JPEG, PNG, TIFF, and
GIF in Cocoa, although the docs are kind of vague. In one case the Cocoa docs
said the properties were set when reading a TIFF, but the implementation
didn't; I chose to implement the docs. Cocoa does use properties when
exporting bitmaps, so I implemented that.
6. Checked and updated NSBitmapImageFileType in NSBitmapImageRep.h
Fix: confirmed the enumeration values against Cocoa, and added
NSJPEG2000FileType = 5
Comment: JPEG-2000 is not implemented, just reserved a space for it.
7. -representationUsingType:properties: was not implemented
Fix: Implement export of TIFF, JPEG, GIF and PNG in NSBitmapImage.m
Comment: See the change notes for JPEG, GIF, and PNG for more. BMP and JPEG-2000
are not implemented; they just log a message to that effect. As apparently
Cocoa does it this way, if you pass nil for properties, it falls back to
the internal _properties, and if that is empty, there are some safe defaults.
8. +representationfOfImageRepsInArray:UsingType:properties: was not implemented
Fix: Partially implement in NSBitmapImageRep.m
Comment: I just stole the incomplete code from
+TIFFRepresentationOfImageRepsInArray: since I have yet to find an explanation
of how this really ought to work.
9. JPEG export didn't handle alpha channel, properties or errors.
Fix: Add -_JPEGRepresentationWithProperties:errorMessage: to
NSBitmapImageRep+JPEG.h and greatly rework Nicolas Roard's code in
NSBitmapImageRep+JPEG.m. Patch -_initBitmapFromJPEG:errorMessage to
write properties.
Comment: Major rewrite of Nicolas Roard's JPEG export code.
To do: Support for planar bitmaps and support for colorspaces other than
RGB(A).
10. PNG export not implemented
Fix: Add -_PNGRepresentationWithProperties: to
NSBitmapImageRep+PNG.h and implement NSBitmapImageRep+PNG.m
Comment: No support yet for planar bitmaps. Only supports
NS*WhiteColorSpace and NS*RGBColorSpace. Does support alpha. Support for
reading and writing NSImageGamma is experimental. In keeping with Cocoa,
the property NSImageGamma ranges from 0.0 to 1.0; representing the range
of minimum supported gamma to maximum supported gamma, in this case 1.0
to 2.5. This is in contrast to GNUstep where by convention the property
would range from 0.0 to 255.0.
To do: proper error message support
11. GIF export not implemented
Fix: Add -_GIFRepresentationWithPropterties:errorMessage: to
NSBitmapImageRep+GIF.h and implement in NSBitmapImageRep+GIF.m
Comments: Supports only RGB(A) colorspaces, but ignores alpha. Supports
planar or interleaved bitmaps. Supports properties NSImageRGBColorTable.
12. -_initBitmapFromGIF:errorMessage: did not support transparency
Fix: Don't ignore control blocks in NSBitmapImageRep+GIF.m; check for
transparency.
Comment: If a transparent color is found, it adds an alpha channel to the
bitmap. Also, save the color table in properties.
13. -_initBitmapFromGIF:errorMessage: would show the last image in a
multi-image GIF file
Fix: Break the parsing loop after the first image in NSBitmapImageRep+GIF.m
Comment: Also check for frame duration, and set that property. There is not
yet any support for animated GIF. This will require some additional
infrastructure, and I won't do it unless asked.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24140 72102866-910b-0410-8b05-ffd578937521
2006-11-21 06:36:26 +00:00
|
|
|
// Note that Cocoa does not do this, even though the docs say it should
|
|
|
|
[_properties setObject: [NSNumber numberWithUnsignedShort: _compression]
|
|
|
|
forKey: NSImageCompressionMethod];
|
|
|
|
[_properties setObject: [NSNumber numberWithFloat: _comp_factor]
|
|
|
|
forKey: NSImageCompressionFactor];
|
|
|
|
|
2001-06-08 16:44:05 +00:00
|
|
|
if (NSTiffRead(image, info, [self bitmapData]))
|
|
|
|
{
|
2003-07-25 22:54:28 +00:00
|
|
|
OBJC_FREE(info);
|
2001-06-08 16:44:05 +00:00
|
|
|
RELEASE(self);
|
|
|
|
NSLog(@"Tiff read invalid TIFF image data in directory %d", imageNumber);
|
|
|
|
return nil;
|
|
|
|
}
|
2003-07-25 22:54:28 +00:00
|
|
|
OBJC_FREE(info);
|
2001-06-08 16:44:05 +00:00
|
|
|
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2008-02-08 22:40:38 +00:00
|
|
|
- (void) _premultiply
|
|
|
|
{
|
|
|
|
int x, y;
|
|
|
|
unsigned int pixelData[5];
|
|
|
|
int start, end, i, ai;
|
|
|
|
SEL getPSel = @selector(getPixel:atX:y:);
|
|
|
|
SEL setPSel = @selector(setPixel:atX:y:);
|
|
|
|
IMP getP = [self methodForSelector: getPSel];
|
|
|
|
IMP setP = [self methodForSelector: setPSel];
|
|
|
|
|
|
|
|
if (!_hasAlpha || !(_format & NSAlphaNonpremultipliedBitmapFormat))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (_format & NSAlphaFirstBitmapFormat)
|
|
|
|
{
|
|
|
|
ai = 0;
|
|
|
|
start = 1;
|
|
|
|
end = _numColors;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ai = _numColors - 1;
|
|
|
|
start = 0;
|
|
|
|
end = _numColors - 1;
|
|
|
|
}
|
|
|
|
|
2008-02-25 15:35:57 +00:00
|
|
|
if (_bitsPerSample == 8)
|
|
|
|
{
|
|
|
|
unsigned int a;
|
|
|
|
|
|
|
|
for (y = 0; y < _pixelsHigh; y++)
|
|
|
|
{
|
|
|
|
for (x = 0; x < _pixelsWide; x++)
|
|
|
|
{
|
|
|
|
//[self getPixel: pixelData atX: x y: y];
|
|
|
|
getP(self, getPSel, pixelData, x, y);
|
|
|
|
a = pixelData[ai];
|
2008-03-11 20:11:53 +00:00
|
|
|
if (a != 255)
|
2008-02-25 15:35:57 +00:00
|
|
|
{
|
2008-03-11 20:11:53 +00:00
|
|
|
for (i = start; i < end; i++)
|
|
|
|
{
|
|
|
|
unsigned int t = a * pixelData[i] + 0x80;
|
2008-02-25 15:35:57 +00:00
|
|
|
|
2008-03-11 20:11:53 +00:00
|
|
|
pixelData[i] = ((t >> 8) + t) >> 8;
|
|
|
|
}
|
|
|
|
//[self setPixel: pixelData atX: x y: y];
|
|
|
|
setP(self, setPSel, pixelData, x, y);
|
2008-02-25 15:35:57 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
2008-02-08 22:40:38 +00:00
|
|
|
{
|
2008-02-25 15:35:57 +00:00
|
|
|
float scale;
|
|
|
|
float alpha;
|
|
|
|
|
|
|
|
scale = (float)((1 << _bitsPerSample) - 1);
|
|
|
|
for (y = 0; y < _pixelsHigh; y++)
|
2008-02-08 22:40:38 +00:00
|
|
|
{
|
2008-02-25 15:35:57 +00:00
|
|
|
for (x = 0; x < _pixelsWide; x++)
|
2008-02-08 22:40:38 +00:00
|
|
|
{
|
2008-02-25 15:35:57 +00:00
|
|
|
//[self getPixel: pixelData atX: x y: y];
|
|
|
|
getP(self, getPSel, pixelData, x, y);
|
|
|
|
alpha = pixelData[ai] / scale;
|
|
|
|
for (i = start; i < end; i++)
|
|
|
|
{
|
|
|
|
pixelData[i] *= alpha;
|
|
|
|
}
|
|
|
|
//[self setPixel: pixelData atX: x y: y];
|
|
|
|
setP(self, setPSel, pixelData, x, y);
|
2008-02-08 22:40:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2008-02-25 15:35:57 +00:00
|
|
|
|
|
|
|
_format &= ~NSAlphaNonpremultipliedBitmapFormat;
|
2008-02-08 22:40:38 +00:00
|
|
|
}
|
2004-02-03 22:42:15 +00:00
|
|
|
|
2008-02-08 22:40:38 +00:00
|
|
|
- (void) _unpremultiply
|
|
|
|
{
|
|
|
|
int x, y;
|
|
|
|
unsigned int pixelData[5];
|
|
|
|
int start, end, i, ai;
|
|
|
|
SEL getPSel = @selector(getPixel:atX:y:);
|
|
|
|
SEL setPSel = @selector(setPixel:atX:y:);
|
|
|
|
IMP getP = [self methodForSelector: getPSel];
|
|
|
|
IMP setP = [self methodForSelector: setPSel];
|
|
|
|
|
|
|
|
if (!_hasAlpha || (_format & NSAlphaNonpremultipliedBitmapFormat))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (_format & NSAlphaFirstBitmapFormat)
|
|
|
|
{
|
|
|
|
ai = 0;
|
|
|
|
start = 1;
|
|
|
|
end = _numColors;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ai = _numColors - 1;
|
|
|
|
start = 0;
|
|
|
|
end = _numColors - 1;
|
|
|
|
}
|
|
|
|
|
2008-02-25 15:35:57 +00:00
|
|
|
if (_bitsPerSample == 8)
|
|
|
|
{
|
|
|
|
unsigned int a;
|
|
|
|
|
|
|
|
for (y = 0; y < _pixelsHigh; y++)
|
|
|
|
{
|
|
|
|
for (x = 0; x < _pixelsWide; x++)
|
|
|
|
{
|
|
|
|
//[self getPixel: pixelData atX: x y: y];
|
|
|
|
getP(self, getPSel, pixelData, x, y);
|
|
|
|
a = pixelData[ai];
|
2008-03-11 20:11:53 +00:00
|
|
|
if ((a != 0) && (a != 255))
|
2008-02-25 15:35:57 +00:00
|
|
|
{
|
|
|
|
for (i = start; i < end; i++)
|
|
|
|
{
|
2008-03-11 20:11:53 +00:00
|
|
|
unsigned int c;
|
|
|
|
|
|
|
|
c = (pixelData[i] * 255) / a;
|
|
|
|
if (c >= 255)
|
|
|
|
{
|
|
|
|
pixelData[i] = 255;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pixelData[i] = c;
|
|
|
|
}
|
2008-02-25 15:35:57 +00:00
|
|
|
}
|
|
|
|
//[self setPixel: pixelData atX: x y: y];
|
|
|
|
setP(self, setPSel, pixelData, x, y);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
2008-02-08 22:40:38 +00:00
|
|
|
{
|
2008-02-25 15:35:57 +00:00
|
|
|
float scale;
|
|
|
|
float alpha;
|
|
|
|
|
|
|
|
scale = (float)((1 << _bitsPerSample) - 1);
|
|
|
|
for (y = 0; y < _pixelsHigh; y++)
|
2008-02-08 22:40:38 +00:00
|
|
|
{
|
2008-02-25 15:35:57 +00:00
|
|
|
unsigned int a;
|
|
|
|
|
|
|
|
for (x = 0; x < _pixelsWide; x++)
|
2008-02-08 22:40:38 +00:00
|
|
|
{
|
2008-02-25 15:35:57 +00:00
|
|
|
//[self getPixel: pixelData atX: x y: y];
|
|
|
|
getP(self, getPSel, pixelData, x, y);
|
|
|
|
a = pixelData[ai];
|
|
|
|
if (a != 0)
|
|
|
|
{
|
|
|
|
alpha = scale / a;
|
|
|
|
for (i = start; i < end; i++)
|
|
|
|
{
|
|
|
|
float new = pixelData[i] * alpha;
|
|
|
|
|
|
|
|
if (new > scale)
|
|
|
|
{
|
|
|
|
pixelData[i] = scale;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pixelData[i] = new;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//[self setPixel: pixelData atX: x y: y];
|
|
|
|
setP(self, setPSel, pixelData, x, y);
|
|
|
|
}
|
2008-02-08 22:40:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2008-02-25 15:35:57 +00:00
|
|
|
|
|
|
|
_format |= NSAlphaNonpremultipliedBitmapFormat;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (NSBitmapImageRep *) _convertToFormatBitsPerSample: (int)bps
|
|
|
|
samplesPerPixel: (int)spp
|
|
|
|
hasAlpha: (BOOL)alpha
|
|
|
|
isPlanar: (BOOL)isPlanar
|
|
|
|
colorSpaceName: (NSString*)colorSpaceName
|
|
|
|
bitmapFormat: (NSBitmapFormat)bitmapFormat
|
|
|
|
bytesPerRow: (int)rowBytes
|
|
|
|
bitsPerPixel: (int)pixelBits
|
|
|
|
{
|
|
|
|
if (!pixelBits)
|
|
|
|
pixelBits = bps * ((isPlanar) ? 1 : spp);
|
|
|
|
if (!rowBytes)
|
|
|
|
rowBytes = ceil((float)_pixelsWide * pixelBits / 8);
|
|
|
|
|
|
|
|
// Do we already have the correct format?
|
|
|
|
if ((bps == _bitsPerSample) && (spp == _numColors)
|
|
|
|
&& (alpha == _hasAlpha) && (isPlanar == _isPlanar)
|
|
|
|
&& (bitmapFormat == _format) && (rowBytes == _bytesPerRow)
|
|
|
|
&& (pixelBits == _bitsPerPixel)
|
|
|
|
&& [_colorSpace isEqualToString: colorSpaceName])
|
|
|
|
{
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
NSBitmapImageRep* new;
|
|
|
|
|
|
|
|
new = [[NSBitmapImageRep alloc]
|
|
|
|
initWithBitmapDataPlanes: NULL
|
|
|
|
pixelsWide: _pixelsWide
|
|
|
|
pixelsHigh: _pixelsHigh
|
|
|
|
bitsPerSample: bps
|
|
|
|
samplesPerPixel: spp
|
|
|
|
hasAlpha: alpha
|
|
|
|
isPlanar: isPlanar
|
|
|
|
colorSpaceName: colorSpaceName
|
|
|
|
bitmapFormat: bitmapFormat
|
|
|
|
bytesPerRow: rowBytes
|
|
|
|
bitsPerPixel: pixelBits];
|
|
|
|
|
2008-12-11 23:34:56 +00:00
|
|
|
if ([_colorSpace isEqualToString: colorSpaceName] ||
|
|
|
|
([_colorSpace isEqualToString: NSDeviceRGBColorSpace] &&
|
|
|
|
[colorSpaceName isEqualToString: NSCalibratedRGBColorSpace]) ||
|
|
|
|
([colorSpaceName isEqualToString: NSDeviceRGBColorSpace] &&
|
|
|
|
[_colorSpace isEqualToString: NSCalibratedRGBColorSpace]))
|
2008-02-25 15:35:57 +00:00
|
|
|
{
|
|
|
|
SEL getPSel = @selector(getPixel:atX:y:);
|
|
|
|
SEL setPSel = @selector(setPixel:atX:y:);
|
|
|
|
IMP getP = [self methodForSelector: getPSel];
|
|
|
|
IMP setP = [new methodForSelector: setPSel];
|
|
|
|
unsigned int pixelData[5];
|
|
|
|
int x, y;
|
2008-11-06 09:23:10 +00:00
|
|
|
float _scale;
|
|
|
|
float scale;
|
|
|
|
|
2008-12-11 23:34:56 +00:00
|
|
|
NSDebugLLog(@"NSImage", @"Converting %@ bitmap data", _colorSpace);
|
|
|
|
|
2008-11-06 09:23:10 +00:00
|
|
|
if (_bitsPerSample != bps)
|
|
|
|
{
|
|
|
|
_scale = (float)((1 << _bitsPerSample) - 1);
|
|
|
|
scale = (float)((1 << bps) - 1);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
_scale = 1.0;
|
|
|
|
scale = 1.0;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (y = 0; y < _pixelsHigh; y++)
|
|
|
|
{
|
|
|
|
for (x = 0; x < _pixelsWide; x++)
|
|
|
|
{
|
|
|
|
unsigned int iv[4], ia;
|
|
|
|
float fv[4], fa;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
//[self getPixel: pixelData atX: x y: y];
|
|
|
|
getP(self, getPSel, pixelData, x, y);
|
|
|
|
|
|
|
|
if (_hasAlpha)
|
|
|
|
{
|
|
|
|
// This order depends on the bitmap format
|
|
|
|
if (_format & NSAlphaFirstBitmapFormat)
|
|
|
|
{
|
|
|
|
ia = pixelData[0];
|
|
|
|
for (i = 0; i < _numColors - 1; i++)
|
|
|
|
{
|
|
|
|
iv[i] = pixelData[i + 1];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (i = 0; i < _numColors - 1; i++)
|
|
|
|
{
|
|
|
|
iv[i] = pixelData[i];
|
|
|
|
}
|
|
|
|
ia = pixelData[_numColors - 1];
|
|
|
|
}
|
|
|
|
|
|
|
|
// Scale to [0.0 ... 1.0]
|
|
|
|
for (i = 0; i < _numColors - 1; i++)
|
|
|
|
{
|
|
|
|
fv[i] = iv[i] / _scale;
|
|
|
|
}
|
|
|
|
fa = ia / _scale;
|
|
|
|
|
|
|
|
if ((_format & NSAlphaNonpremultipliedBitmapFormat) !=
|
|
|
|
(bitmapFormat & NSAlphaNonpremultipliedBitmapFormat))
|
|
|
|
{
|
|
|
|
if (_format & NSAlphaNonpremultipliedBitmapFormat)
|
|
|
|
{
|
|
|
|
for (i = 0; i < _numColors - 1; i++)
|
|
|
|
{
|
|
|
|
fv[i] = fv[i] * fa;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (i = 0; i < _numColors - 1; i++)
|
|
|
|
{
|
|
|
|
fv[i] = fv[i] / fa;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (i = 0; i < _numColors; i++)
|
|
|
|
{
|
|
|
|
iv[i] = pixelData[i];
|
|
|
|
}
|
|
|
|
// Scale to [0.0 ... 1.0]
|
|
|
|
for (i = 0; i < _numColors; i++)
|
|
|
|
{
|
|
|
|
fv[i] = iv[i] / _scale;
|
|
|
|
}
|
|
|
|
fa = 1.0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (alpha)
|
|
|
|
{
|
|
|
|
// Scale from [0.0 ... 1.0]
|
|
|
|
for (i = 0; i < _numColors; i++)
|
|
|
|
{
|
|
|
|
iv[i] = fv[i] * scale;
|
|
|
|
}
|
|
|
|
ia = fa * scale;
|
|
|
|
|
|
|
|
if (bitmapFormat & NSAlphaFirstBitmapFormat)
|
|
|
|
{
|
|
|
|
pixelData[0] = ia;
|
|
|
|
for (i = 0; i < spp - 1; i++)
|
|
|
|
{
|
|
|
|
pixelData[i + 1] = iv[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (i = 0; i < spp - 1; i++)
|
|
|
|
{
|
|
|
|
pixelData[i] = iv[i];
|
|
|
|
}
|
|
|
|
pixelData[spp -1] = ia;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Scale from [0.0 ... 1.0]
|
|
|
|
for (i = 0; i < spp; i++)
|
|
|
|
{
|
|
|
|
pixelData[i] = fv[i] * scale;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//[new setPixel: pixelData atX: x y: y];
|
|
|
|
setP(new, setPSel, pixelData, x, y);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (([colorSpaceName isEqualToString: NSDeviceRGBColorSpace] ||
|
|
|
|
[colorSpaceName isEqualToString: NSCalibratedRGBColorSpace])
|
|
|
|
&& ([_colorSpace isEqualToString: NSCalibratedWhiteColorSpace] ||
|
|
|
|
[_colorSpace isEqualToString: NSCalibratedBlackColorSpace] ||
|
|
|
|
[_colorSpace isEqualToString: NSDeviceWhiteColorSpace] ||
|
|
|
|
[_colorSpace isEqualToString: NSDeviceBlackColorSpace]))
|
|
|
|
{
|
|
|
|
SEL getPSel = @selector(getPixel:atX:y:);
|
|
|
|
SEL setPSel = @selector(setPixel:atX:y:);
|
|
|
|
IMP getP = [self methodForSelector: getPSel];
|
|
|
|
IMP setP = [new methodForSelector: setPSel];
|
|
|
|
unsigned int pixelData[4];
|
|
|
|
int x, y;
|
|
|
|
float _scale;
|
|
|
|
float scale;
|
|
|
|
int max = (1 << bps) - 1;
|
|
|
|
BOOL isWhite = [_colorSpace isEqualToString: NSCalibratedWhiteColorSpace]
|
|
|
|
|| [_colorSpace isEqualToString: NSDeviceWhiteColorSpace];
|
|
|
|
|
|
|
|
NSDebugLLog(@"NSImage", @"Converting black/white bitmap data");
|
|
|
|
|
|
|
|
if (_bitsPerSample != bps)
|
|
|
|
{
|
|
|
|
_scale = (float)((1 << _bitsPerSample) - 1);
|
|
|
|
scale = (float)((1 << bps) - 1);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
_scale = 1.0;
|
|
|
|
scale = 1.0;
|
|
|
|
}
|
2008-02-25 15:35:57 +00:00
|
|
|
|
|
|
|
for (y = 0; y < _pixelsHigh; y++)
|
|
|
|
{
|
|
|
|
for (x = 0; x < _pixelsWide; x++)
|
|
|
|
{
|
2008-11-06 09:23:10 +00:00
|
|
|
unsigned int iv, ia;
|
|
|
|
float fv, fa;
|
|
|
|
|
|
|
|
//[self getPixel: pixelData atX: x y: y];
|
2008-02-25 15:35:57 +00:00
|
|
|
getP(self, getPSel, pixelData, x, y);
|
|
|
|
|
2008-11-06 09:23:10 +00:00
|
|
|
if (_hasAlpha)
|
|
|
|
{
|
|
|
|
// This order depends on the bitmap format
|
|
|
|
if (_format & NSAlphaFirstBitmapFormat)
|
|
|
|
{
|
|
|
|
ia = pixelData[0];
|
|
|
|
if (isWhite)
|
|
|
|
iv = pixelData[1];
|
|
|
|
else
|
|
|
|
iv = max - pixelData[1];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (isWhite)
|
|
|
|
iv = pixelData[0];
|
|
|
|
else
|
|
|
|
iv = max - pixelData[0];
|
|
|
|
ia = pixelData[1];
|
|
|
|
}
|
|
|
|
|
|
|
|
// Scale to [0.0 ... 1.0]
|
|
|
|
fv = iv / _scale;
|
|
|
|
fa = ia / _scale;
|
|
|
|
|
|
|
|
if ((_format & NSAlphaNonpremultipliedBitmapFormat) !=
|
|
|
|
(bitmapFormat & NSAlphaNonpremultipliedBitmapFormat))
|
|
|
|
{
|
|
|
|
if (_format & NSAlphaNonpremultipliedBitmapFormat)
|
|
|
|
{
|
|
|
|
fv = fv * fa;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fv = fv / fa;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (isWhite)
|
|
|
|
iv = pixelData[0];
|
|
|
|
else
|
|
|
|
iv = max - pixelData[0];
|
|
|
|
// Scale to [0.0 ... 1.0]
|
|
|
|
fv = iv / _scale;
|
|
|
|
fa = 1.0;
|
|
|
|
}
|
2008-02-25 15:35:57 +00:00
|
|
|
|
2008-11-06 09:23:10 +00:00
|
|
|
if (alpha)
|
|
|
|
{
|
|
|
|
// Scale from [0.0 ... 1.0]
|
|
|
|
iv = fv * scale;
|
|
|
|
ia = fa * scale;
|
|
|
|
|
|
|
|
if (bitmapFormat & NSAlphaFirstBitmapFormat)
|
|
|
|
{
|
|
|
|
pixelData[0] = ia;
|
|
|
|
pixelData[1] = iv;
|
|
|
|
pixelData[2] = iv;
|
|
|
|
pixelData[3] = iv;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pixelData[0] = iv;
|
|
|
|
pixelData[1] = iv;
|
|
|
|
pixelData[2] = iv;
|
|
|
|
pixelData[3] = ia;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Scale from [0.0 ... 1.0]
|
|
|
|
iv = fv * scale;
|
|
|
|
pixelData[0] = iv;
|
|
|
|
pixelData[1] = iv;
|
|
|
|
pixelData[2] = iv;
|
|
|
|
}
|
2008-02-25 15:35:57 +00:00
|
|
|
|
|
|
|
//[new setPixel: pixelData atX: x y: y];
|
|
|
|
setP(new, setPSel, pixelData, x, y);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
SEL getCSel = @selector(colorAtX:y:);
|
|
|
|
SEL setCSel = @selector(setColor:atX:y:);
|
|
|
|
IMP getC = [self methodForSelector: getCSel];
|
|
|
|
IMP setC = [new methodForSelector: setCSel];
|
|
|
|
int i, j;
|
|
|
|
|
2008-12-11 23:34:56 +00:00
|
|
|
NSDebugLLog(@"NSImage", @"Slow converting %@ bitmap data to %@",
|
|
|
|
_colorSpace, colorSpaceName);
|
2008-02-25 15:35:57 +00:00
|
|
|
for (j = 0; j < _pixelsHigh; j++)
|
|
|
|
{
|
|
|
|
CREATE_AUTORELEASE_POOL(pool);
|
|
|
|
|
|
|
|
for (i = 0; i < _pixelsWide; i++)
|
|
|
|
{
|
|
|
|
NSColor *c;
|
|
|
|
|
|
|
|
//c = [self colorAtX: i y: j];
|
|
|
|
c = getC(self, getCSel, i, j);
|
|
|
|
//[new setColor: c atX: i y: j];
|
|
|
|
setC(new, setCSel, c, i, j);
|
|
|
|
}
|
|
|
|
RELEASE(pool);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return AUTORELEASE(new);
|
|
|
|
}
|
2008-02-08 22:40:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
@end
|