From 2437b86d2588921ccc0da0c5d063e78763d355c9 Mon Sep 17 00:00:00 2001 From: fedor Date: Sat, 1 Sep 2001 04:20:55 +0000 Subject: [PATCH] Fix image encoding git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10827 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSBitmapImageRep.m | 2 +- Source/tiff.m | 9 +++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4457dacfe..c29f5a7d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-08-31 Adam Fedor + + * Source/NSBitmapImageRep.m (-encodeWithCoder:): Encode data correctly. + * Source/tiff.m (NSTiffWrite): Fix type, use ==. + Fri Aug 31 12:06:24 2001 Nicola Pero * Source/GSSimpleLayoutManager.m ([_GNULineLayoutInfo diff --git a/Source/NSBitmapImageRep.m b/Source/NSBitmapImageRep.m index 3d4b0838f..ee02c7fd8 100644 --- a/Source/NSBitmapImageRep.m +++ b/Source/NSBitmapImageRep.m @@ -621,7 +621,7 @@ NSData *data = [self TIFFRepresentation]; [super encodeWithCoder: aCoder]; - [data encodeWithCoder: aCoder]; + [aCoder encodeObject: data]; } - (id) initWithCoder: (NSCoder*)aDecoder diff --git a/Source/tiff.m b/Source/tiff.m index 2b41bf1ff..200d7e38b 100644 --- a/Source/tiff.m +++ b/Source/tiff.m @@ -204,7 +204,7 @@ NSTiffOpenDataRead(const char* data, long size) handle->outposition = 0; handle->size = size; handle->mode = "r"; - return TIFFClientOpen("TiffData", "r", + return TIFFClientOpen("GSTiffReadData", "r", (thandle_t)handle, TiffHandleRead, TiffHandleWrite, TiffHandleSeek, TiffHandleClose, @@ -223,7 +223,7 @@ NSTiffOpenDataWrite(char **data, long *size) handle->outposition = size; handle->size = *size; handle->mode = "w"; - return TIFFClientOpen("TiffData", "w", + return TIFFClientOpen("GSTiffWriteData", "w", (thandle_t)handle, TiffHandleRead, TiffHandleWrite, TiffHandleSeek, TiffHandleClose, @@ -275,7 +275,8 @@ NSTiffGetInfo(int imageNumber, TIFF* image) TIFFGetField(image, TIFFTAG_IMAGEWIDTH, &info->width); TIFFGetField(image, TIFFTAG_IMAGELENGTH, &info->height); TIFFGetField(image, TIFFTAG_COMPRESSION, &info->compression); - TIFFGetField(image, TIFFTAG_JPEGQUALITY, &info->quality); + if (info->compression == COMPRESSION_JPEG) + TIFFGetField(image, TIFFTAG_JPEGQUALITY, &info->quality); TIFFGetField(image, TIFFTAG_SUBFILETYPE, &info->subfileType); TIFFGetField(image, TIFFTAG_EXTRASAMPLES, &info->extraSamples, &sample_info); info->extraSamples = (info->extraSamples == 1 @@ -451,7 +452,7 @@ NSTiffWrite(TIFF* image, NSTiffInfo* info, char* data) TIFFSetField(image, TIFFTAG_IMAGEWIDTH, info->width); TIFFSetField(image, TIFFTAG_IMAGELENGTH, info->height); TIFFSetField(image, TIFFTAG_COMPRESSION, info->compression); - if (info->compression = COMPRESSION_JPEG) + if (info->compression == COMPRESSION_JPEG) TIFFSetField(image, TIFFTAG_JPEGQUALITY, info->quality); TIFFSetField(image, TIFFTAG_SUBFILETYPE, info->subfileType); TIFFSetField(image, TIFFTAG_BITSPERSAMPLE, info->bitsPerSample);