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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit c384741e811835aa76b4baf66331c25f06b08c02
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 30 23:28:10 2003 +0000

    Fix build bustage.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5329 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/khtml/html/html_imageimpl.cpp b/WebCore/khtml/html/html_imageimpl.cpp
index 96b839b..1f13a91 100644
--- a/WebCore/khtml/html/html_imageimpl.cpp
+++ b/WebCore/khtml/html/html_imageimpl.cpp
@@ -233,10 +233,6 @@ long HTMLImageElementImpl::width() const
 	docimpl->updateLayout();
     }
 
-    if (!m_renderer) {
-	return 0;
-    }
-
     return m_render->contentWidth();
 }
 
@@ -248,7 +244,7 @@ long HTMLImageElementImpl::height() const
 	bool ok;
 	long height = attrHeight.string().toLong(&ok);
 	if (ok) {
-	  return Number(height);
+	  return height;
 	}
     }
 
@@ -257,10 +253,6 @@ long HTMLImageElementImpl::height() const
 	docimpl->updateLayout();
     }
 
-    if (!m_renderer) {
-	return 0;
-    }
-
     return m_render->contentHeight();
 }
 

-- 
WebKit Debian packaging