Author: rmottola
Date: Wed Jun 1 15:46:11 2016
New Revision: 39831
URL: http://svn.gna.org/viewcvs/gnustep?rev=39831&view=rev
Log:
cleanup / pass Dictionary, not the raw image data
Modified:
apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.h
apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.m
apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/Resizer.m
Modified:
apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.h
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.h?rev=39831&r1=39830&r2=39831&view=diff
==============================================================================
--- apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.h
(original)
+++ apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.h
Wed Jun 1 15:46:11 2016
@@ -79,16 +79,12 @@
NSWorkspace *ws;
}
-- (void)checkResizer:(id)sender;
-
-- (void)setResizer:(id)anObject;
-
- (BOOL)connection:(NSConnection *)ancestor
shouldMakeNewConnection:(NSConnection *)newConn;
- (void)connectionDidDie:(NSNotification *)notification;
-- (void)imageReady:(NSData *)data;
+- (void)imageReady:(NSDictionary *)imginfo;
- (void)editFile:(id)sender;
Modified:
apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.m?rev=39831&r1=39830&r2=39831&view=diff
==============================================================================
--- apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.m
(original)
+++ apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.m
Wed Jun 1 15:46:11 2016
@@ -36,9 +36,6 @@
[nc removeObserver: self];
if (resizerConn != nil) {
- if (resizer != nil) {
- [resizer terminate];
- }
DESTROY (resizer);
DESTROY (resizerConn);
}
@@ -192,15 +189,16 @@
object: conn];
}
- if (!(resizer == nil)) {
- NSSize imsize = [imview bounds].size;
-
- imsize.width -= 4;
- imsize.height -= 4;
- [self addSubview: progView];
- [progView start];
- [resizer readImageAtPath: imagePath setSize: imsize];
- }
+ if (!(resizer == nil))
+ {
+ NSSize imsize = [imview bounds].size;
+
+ imsize.width -= 4;
+ imsize.height -= 4;
+ [self addSubview: progView];
+ [progView start];
+ [resizer readImageAtPath: imagePath setSize: imsize];
+ }
}
- (void)displayLastPath:(BOOL)forced
@@ -228,14 +226,8 @@
- (void)setServer:(id)anObject
{
- [self setResizer:anObject];
-}
-
-- (void)setResizer:(id)anObject
-{
- if (resizer == nil) {
NSSize imsize = [imview bounds].size;
-
+
imsize.width -= 4;
imsize.height -= 4;
[anObject setProtocolForProxy: @protocol(ImageResizerProtocol)];
@@ -245,7 +237,6 @@
[self addSubview: progView];
[progView start];
[resizer readImageAtPath: imagePath setSize: imsize];
- }
}
- (BOOL)connection:(NSConnection *)ancestor
@@ -296,23 +287,25 @@
}
}
-- (void)imageReady:(NSData *)imgdata
-{
- NSDictionary *imginfo;
+- (void)imageReady:(NSDictionary *)imginfo
+{
+ NSData *imgdata;
BOOL imgok;
NSString *lastPath;
+ if (imginfo == nil)
+ return;
+
+ imgdata = [imginfo objectForKey:@"imgdata"];
imgok = NO;
if (imgdata)
{
- [imgdata retain];
-
if ([self superview])
[inspector contentsReadyAt: imagePath];
DESTROY (image);
image = [[NSImage alloc] initWithData: imgdata];
- [imgdata release];
+
imgok = YES;
if (image)
{
Modified: apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/Resizer.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/Resizer.m?rev=39831&r1=39830&r2=39831&view=diff
==============================================================================
--- apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/Resizer.m
(original)
+++ apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/Resizer.m
Wed Jun 1 15:46:11 2016
@@ -83,10 +83,7 @@
CREATE_AUTORELEASE_POOL(arp);
NSMutableDictionary *info = [NSMutableDictionary dictionary];
NSImage *srcImage = [[NSImage alloc] initWithContentsOfFile: path];
- NSData *returnData;
-
- returnData = nil;
-
+
if (srcImage && [srcImage isValid])
{
NSData *srcData = [srcImage TIFFRepresentation];
@@ -183,20 +180,18 @@
NS_ENDHANDLER
if (tiffData) {
- returnData = tiffData;
+ [info setObject: tiffData forKey:@"imgdata"];
}
RELEASE (dstRep);
} else {
- returnData = srcData;
+ [info setObject: srcData forKey:@"imgdata"];
}
RELEASE (srcImage);
}
- [returnData retain];
- [[serverConnection rootProxy] imageReady: returnData];
- [returnData release];
+ [[serverConnection rootProxy] imageReady: info];
RELEASE (arp);
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
