[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 d7bf225d640d4c0d3ffded63e683fcd535449c06
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 3 04:30:21 2002 +0000

    	- fixed 2952837 -- image not rendered if height or width attributes specified incorrectly
    
            * WebCoreSupport.subproj/IFImageRenderer.m:
            (-[IFImageRenderer incrementalLoadWithBytes:length:complete:]):
    	Set the size of both the image and the image representation.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1500 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 135ce4e..44ddbb0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,7 +1,14 @@
+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:
+        (-[IFImageRenderer incrementalLoadWithBytes:length:complete:]):
+	Set the size of both the image and the image representation.
+
 2002-07-02  Chris Blumenberg  <cblu at apple.com>
 
-	Can't call startLoading on a frame if setProvisionalDataSource 
-returned NO.
+	Can't call startLoading on a frame if setProvisionalDataSource returned NO.
 
         * Plugins.subproj/IFPluginView.mm:
         (-[IFPluginView loadURL:inTarget:withNotifyData:andHandleAttributes:]):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 135ce4e..44ddbb0 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,7 +1,14 @@
+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:
+        (-[IFImageRenderer incrementalLoadWithBytes:length:complete:]):
+	Set the size of both the image and the image representation.
+
 2002-07-02  Chris Blumenberg  <cblu at apple.com>
 
-	Can't call startLoading on a frame if setProvisionalDataSource 
-returned NO.
+	Can't call startLoading on a frame if setProvisionalDataSource returned NO.
 
         * Plugins.subproj/IFPluginView.mm:
         (-[IFPluginView loadURL:inTarget:withNotifyData:andHandleAttributes:]):
diff --git a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
index ef2cb22..8abe8fa 100644
--- a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
@@ -65,7 +65,9 @@ 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.
-        [imageRep setSize:NSMakeSize([imageRep pixelsWide], [imageRep pixelsHigh])];
+        NSSize size = NSMakeSize([imageRep pixelsWide], [imageRep pixelsHigh]);
+        [imageRep setSize:size];
+        [self setSize:size];
         return YES;
     default:
         // We have some data.  Return YES so we can attempt a to draw what we've got.
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index ef2cb22..8abe8fa 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -65,7 +65,9 @@ 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.
-        [imageRep setSize:NSMakeSize([imageRep pixelsWide], [imageRep pixelsHigh])];
+        NSSize size = NSMakeSize([imageRep pixelsWide], [imageRep pixelsHigh]);
+        [imageRep setSize:size];
+        [self setSize:size];
         return YES;
     default:
         // We have some data.  Return YES so we can attempt a to draw what we've got.

-- 
WebKit Debian packaging