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

[darin]

The following commit has been merged in the debian/unstable branch:
commit d4b2bf346a2eb935b490906b406aac9ede0e952e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 3 04:38:18 2002 +0000

            * WebCoreSupport.subproj/IFImageRenderer.m:
            (-[IFImageRenderer incrementalLoadWithBytes:length:complete:]):
    	Fixed a syntax error caused by a "just before committing" edit.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1501 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 44ddbb0..911acf5 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,11 @@
 2002-07-02  Darin Adler  <darin at apple.com>
 
+        * WebCoreSupport.subproj/IFImageRenderer.m:
+        (-[IFImageRenderer incrementalLoadWithBytes:length:complete:]):
+	Fixed a syntax error caused by a "just before committing" edit.
+
+2002-07-02  Darin Adler  <darin at apple.com>
+
 	- fixed 2952837 -- image not rendered if height or width attributes specified incorrectly
 
         * WebCoreSupport.subproj/IFImageRenderer.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 44ddbb0..911acf5 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,11 @@
 2002-07-02  Darin Adler  <darin at apple.com>
 
+        * WebCoreSupport.subproj/IFImageRenderer.m:
+        (-[IFImageRenderer incrementalLoadWithBytes:length:complete:]):
+	Fixed a syntax error caused by a "just before committing" edit.
+
+2002-07-02  Darin Adler  <darin at apple.com>
+
 	- fixed 2952837 -- image not rendered if height or width attributes specified incorrectly
 
         * WebCoreSupport.subproj/IFImageRenderer.m:
diff --git a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
index 8abe8fa..b0cb231 100644
--- a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
@@ -43,6 +43,7 @@ static NSMutableArray *activeImageRenderers;
     NSBitmapImageRep* imageRep = [[self representations] objectAtIndex:0];
     //NSData *data = [[NSData alloc] initWithBytesNoCopy: (void *)bytes length: length freeWhenDone: NO];
     NSData *data = [[NSData alloc] initWithBytes: (void *)bytes length: length];
+    NSSize size;
     
     loadStatus = [imageRep incrementalLoadFromData:data complete:isComplete];
     [data release];
@@ -65,7 +66,7 @@ static NSMutableArray *activeImageRenderers;
     case NSImageRepLoadStatusCompleted:         // all is well, the full pixelsHigh image is valid.
         //printf ("NSImageRepLoadStatusUnexpectedEOF size %d, isComplete %d\n", length, isComplete);
         // Force the image to use the pixel size and ignore the dpi.
-        NSSize size = NSMakeSize([imageRep pixelsWide], [imageRep pixelsHigh]);
+        size = NSMakeSize([imageRep pixelsWide], [imageRep pixelsHigh]);
         [imageRep setSize:size];
         [self setSize:size];
         return YES;
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index 8abe8fa..b0cb231 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -43,6 +43,7 @@ static NSMutableArray *activeImageRenderers;
     NSBitmapImageRep* imageRep = [[self representations] objectAtIndex:0];
     //NSData *data = [[NSData alloc] initWithBytesNoCopy: (void *)bytes length: length freeWhenDone: NO];
     NSData *data = [[NSData alloc] initWithBytes: (void *)bytes length: length];
+    NSSize size;
     
     loadStatus = [imageRep incrementalLoadFromData:data complete:isComplete];
     [data release];
@@ -65,7 +66,7 @@ static NSMutableArray *activeImageRenderers;
     case NSImageRepLoadStatusCompleted:         // all is well, the full pixelsHigh image is valid.
         //printf ("NSImageRepLoadStatusUnexpectedEOF size %d, isComplete %d\n", length, isComplete);
         // Force the image to use the pixel size and ignore the dpi.
-        NSSize size = NSMakeSize([imageRep pixelsWide], [imageRep pixelsHigh]);
+        size = NSMakeSize([imageRep pixelsWide], [imageRep pixelsHigh]);
         [imageRep setSize:size];
         [self setSize:size];
         return YES;

-- 
WebKit Debian packaging