[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit f13264a94089c14e8159af2ea17fa4c370b04d64
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 18 21:03:45 2003 +0000

    	Fix build problem from last checkin.
    
            Reviewed by Darin.
    
            * WebCoreSupport.subproj/WebImageRenderer.m:
            (-[WebImageRenderer initWithData:MIMEType:]):
            (-[WebImageRenderer initWithContentsOfFile:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4839 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2a70797..9d2760d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-08-18  Richard Williamson  <rjw at apple.com>
+
+	Fix build problem from last checkin.
+
+        Reviewed by Darin.
+
+        * WebCoreSupport.subproj/WebImageRenderer.m:
+        (-[WebImageRenderer initWithData:MIMEType:]):
+        (-[WebImageRenderer initWithContentsOfFile:]):
+
 2003-08-17  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index 1738f5b..625e176 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -56,40 +56,54 @@ static NSMutableSet *activeImageRenderers;
 
 - (id)initWithData:(NSData *)data MIMEType:(NSString *)MIME
 {
+    WebImageRenderer *result = nil;
+
     NS_DURING
-        self = [super initWithData:data];
+    
+        result = [super initWithData:data];
+        if (result != nil) {
+            // Work around issue with flipped images and TIFF by never using the image cache.
+            // See bug 3344259 and related bugs.
+            [result setCacheMode:NSImageCacheNever];
+    
+            result->loadStatus = NSImageRepLoadStatusUnknownType;
+            result->MIMEType = [MIME copy];
+            result->isNull = [data length] == 0;
+        }
+
     NS_HANDLER
-        self = nil;
+
+        result = nil;
+
     NS_ENDHANDLER
-    if (self != nil) {
-        // Work around issue with flipped images and TIFF by never using the image cache.
-        // See bug 3344259 and related bugs.
-        [self setCacheMode:NSImageCacheNever];
 
-        loadStatus = NSImageRepLoadStatusUnknownType;
-        MIMEType = [MIME copy];
-        isNull = [data length] == 0;
-    }
-    return self;
+    return result;
 }
 
 - (id)initWithContentsOfFile:(NSString *)filename
 {
     NSBundle *bundle = [NSBundle bundleForClass:[self class]];
     NSString *imagePath = [bundle pathForResource:filename ofType:@"tiff"];
+    WebImageRenderer *result = nil;
+
     NS_DURING
-        self = [super initWithContentsOfFile:imagePath];
+
+        result = [super initWithContentsOfFile:imagePath];
+        if (result != nil) {
+            // Work around issue with flipped images and TIFF by never using the image cache.
+            // See bug 3344259 and related bugs.
+            [result setCacheMode:NSImageCacheNever];
+    
+            result->loadStatus = NSImageRepLoadStatusUnknownType;
+        }
+        
     NS_HANDLER
-        self = nil;
+
+        result = nil;
+
     NS_ENDHANDLER
-    if (self != nil) {
-        // Work around issue with flipped images and TIFF by never using the image cache.
-        // See bug 3344259 and related bugs.
-        [self setCacheMode:NSImageCacheNever];
 
-        loadStatus = NSImageRepLoadStatusUnknownType;
-    }
-    return self;
+    return result;
 }
 
 - (id <WebCoreImageRenderer>)retainOrCopyIfNeeded

-- 
WebKit Debian packaging