gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 15:11:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

[canInitWithData:], [imageRepsWithData:] and [initWithData:]

Browse source 
protect against data being nil. [imageRepsWithFile:] check if the
file exists and only return an array when it contains objects.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17591 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2003-09-01 16:58:27 +00:00
parent ee1d9197b7
commit 1a94f30ba2
1 changed files with 40 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
Source/NSBitmapImageRep.m
View file

@ -30,15 +30,16 @@
#include <math.h>
#include <tiff.h>
#include <Foundation/NSException.h>
#include <Foundation/NSArray.h>
#include <Foundation/NSData.h>
#include <Foundation/NSDebug.h>
#include "AppKit/NSGraphics.h"
#include "AppKit/NSView.h"
#include "AppKit/NSPasteboard.h"
#include "AppKit/NSBitmapImageRep.h"
#include <Foundation/NSException.h>
#include <Foundation/NSFileManager.h>
#include "AppKit/AppKitExceptions.h"
#include "AppKit/NSBitmapImageRep.h"
#include "AppKit/NSGraphics.h"
#include "AppKit/NSPasteboard.h"
#include "AppKit/NSView.h"
#include "nsimage-tiff.h"
@ -59,6 +60,12 @@
+ (BOOL) canInitWithData: (NSData *)data
{
TIFF *image = NULL;
if (data == nil)
{
return NO;
}
image = NSTiffOpenDataRead ((char *)[data bytes], [data length]);
if (image != NULL)
@ -125,6 +132,11 @@
TIFF *image;
NSMutableArray *array;
if (tiffData == nil)
{
return nil;
}
image = NSTiffOpenDataRead((char *)[tiffData bytes], [tiffData length]);
if (image == NULL)
{
@ -155,8 +167,14 @@
{
TIFF *image;
if (tiffData == nil)
{
RELEASE(self);
return nil;
}
image = NSTiffOpenDataRead((char *)[tiffData bytes], [tiffData length]);
if (image == 0)
if (image == NULL)
{
RELEASE(self);
NSLog(@"Tiff read invalid TIFF info from data");
@ -639,15 +657,21 @@
@implementation NSBitmapImageRep (GNUstepExtension)
/* A special method used mostly when we have the wraster library in the
backend, which can read several more image formats */
backend, which can read several more image formats.
Don't use this for TIFF images, use the regular ...Data methods */
+ (NSArray*) imageRepsWithFile: (NSString *)filename
{
NSString *ext;
int images;
NSMutableArray *array;
NSBitmapImageRep* imageRep;
NSFileManager *manager = [NSFileManager defaultManager];
if ([manager fileExistsAtPath: filename] == NO)
{
return nil;
}
/* Don't use this for TIFF images, use the regular ...Data methods */
ext = [filename pathExtension];
if (!ext)
{
@ -678,7 +702,14 @@
}
while (imageRep);
return array;
if ([array count] > 0)
{
return array;
}
else
{
return nil;
}
}
/* Given a TIFF image (from the libtiff library), load the image information