[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 9178305289bb4c461567dae3b6541b9992c55916
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 2 05:16:49 2004 +0000

    WebCore:
            Fixed deployment build warning.
    
            * khtml/rendering/render_canvasimage.cpp:
            (RenderCanvasImage::paint):
    
    WebKit:
            Fixed deployment build warning.
    
            * WebCoreSupport.subproj/WebImageRenderer.m:
            (-[WebImageRenderer incrementalLoadWithBytes:length:complete:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6742 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 013d052..a76b658 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,12 @@
 2004-06-01  Richard Williamson   <rjw at apple.com>
 
+        Fixed deployment build warning.
+
+        * khtml/rendering/render_canvasimage.cpp:
+        (RenderCanvasImage::paint):
+
+2004-06-01  Richard Williamson   <rjw at apple.com>
+
 		Added support for composite attribute to <CANVAS>
 		Added support for drawImage and drawImageFromRect to <CANVAS>, i.e.:
 
diff --git a/WebCore/khtml/rendering/render_canvasimage.cpp b/WebCore/khtml/rendering/render_canvasimage.cpp
index 45822b4..7395d54 100644
--- a/WebCore/khtml/rendering/render_canvasimage.cpp
+++ b/WebCore/khtml/rendering/render_canvasimage.cpp
@@ -180,9 +180,9 @@ void RenderCanvasImage::paint(PaintInfo& i, int _tx, int _ty)
     }
     
     if (drawnImage()) {
-         HTMLCanvasElementImpl* i = (element() && element()->id() == ID_IMG) ? static_cast<HTMLCanvasElementImpl*>(element()) : 0;
-         int oldOperation;
-         if (i && !i->compositeOperator().isNull()){
+        HTMLCanvasElementImpl* i = (element() && element()->id() == ID_IMG) ? static_cast<HTMLCanvasElementImpl*>(element()) : 0;
+        int oldOperation = 0;
+        if (i && !i->compositeOperator().isNull()){
             oldOperation = QPainter::getCompositeOperation(p->currentContext());
             QPainter::setCompositeOperation (p->currentContext(),i->compositeOperator());
         }
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7e1f7d6..fbe7342 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,12 @@
 2004-06-01  Richard Williamson   <rjw at apple.com>
 
+        Fixed deployment build warning.
+
+        * WebCoreSupport.subproj/WebImageRenderer.m:
+        (-[WebImageRenderer incrementalLoadWithBytes:length:complete:]):
+
+2004-06-01  Richard Williamson   <rjw at apple.com>
+
 		Added support for drawImage and drawImageFromRect to <CANVAS>
 		Added support for composite attribute to <CANVAS>
 
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index 2e3611b..4bf4edf 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -279,7 +279,9 @@ static NSMutableSet *activeImageRenderers;
         NSData *data = [[NSData alloc] initWithBytes:bytes length:length];
 
         NS_DURING
-            loadStatus = [imageRep incrementalLoadFromData:data complete:isComplete];
+            // Get rep again to avoid bogus compiler warning.
+            NSBitmapImageRep *aRep = [[self representations] objectAtIndex:0];
+            loadStatus = [aRep incrementalLoadFromData:data complete:isComplete];
         NS_HANDLER
             loadStatus = NSImageRepLoadStatusInvalidData; // Arbitrary choice; any error will do.
         NS_ENDHANDLER

-- 
WebKit Debian packaging