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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit b9ac3580afe9195abe1390bb5fb5a23935ed0ee5
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 23 21:25:44 2003 +0000

    	Fixed a divide by zero problem.
    
            Reviewed by darin.
    
            * WebCore.pbproj/project.pbxproj:
            * khtml/rendering/render_image.cpp:
            (RenderImage::calcReplacedWidth):
            (RenderImage::calcReplacedHeight):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3427 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0317475..a8152fe 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-01-23  Chris Blumenberg  <cblu at apple.com>
+	
+	Fixed a divide by zero problem.
+
+        Reviewed by darin.
+
+        * WebCore.pbproj/project.pbxproj:
+        * khtml/rendering/render_image.cpp:
+        (RenderImage::calcReplacedWidth):
+        (RenderImage::calcReplacedHeight):
+
 2003-01-23  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
@@ -21,6 +32,7 @@
 	prevent default if this is an html event handler, rather than one
 	set with addEventListener or the like.
 
+>>>>>>> 1.1299
 2003-01-23  Chris Blumenberg  <cblu at apple.com>
 
 	Replaced the paint phase constants with the PaintAction enum. Added PaintActionSelection as a paint action. This will eventually allow us to only paint selected objects. This is needed for the text dragging image.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0317475..a8152fe 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-01-23  Chris Blumenberg  <cblu at apple.com>
+	
+	Fixed a divide by zero problem.
+
+        Reviewed by darin.
+
+        * WebCore.pbproj/project.pbxproj:
+        * khtml/rendering/render_image.cpp:
+        (RenderImage::calcReplacedWidth):
+        (RenderImage::calcReplacedHeight):
+
 2003-01-23  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
@@ -21,6 +32,7 @@
 	prevent default if this is an html event handler, rather than one
 	set with addEventListener or the like.
 
+>>>>>>> 1.1299
 2003-01-23  Chris Blumenberg  <cblu at apple.com>
 
 	Replaced the paint phase constants with the PaintAction enum. Added PaintActionSelection as a paint action. This will eventually allow us to only paint selected objects. This is needed for the text dragging image.
diff --git a/WebCore/khtml/rendering/render_image.cpp b/WebCore/khtml/rendering/render_image.cpp
index ec7bd19..b58778d 100644
--- a/WebCore/khtml/rendering/render_image.cpp
+++ b/WebCore/khtml/rendering/render_image.cpp
@@ -435,6 +435,9 @@ short RenderImage::calcReplacedWidth() const
 {
     // If height is specified and not width, preserve aspect ratio.
     if (isHeightSpecified() && !isWidthSpecified()) {
+        if (intrinsicHeight() == 0){
+            return 0;
+        }
         return calcReplacedHeight() * intrinsicWidth() / intrinsicHeight();
     }
     return RenderReplaced::calcReplacedWidth();
@@ -444,6 +447,9 @@ int RenderImage::calcReplacedHeight() const
 {
     // If width is specified and not height, preserve aspect ratio.
     if (isWidthSpecified() && !isHeightSpecified()) {
+        if (intrinsicWidth() == 0){
+            return 0;
+        }
         return calcReplacedWidth() * intrinsicHeight() / intrinsicWidth();
     }
     return RenderReplaced::calcReplacedHeight();

-- 
WebKit Debian packaging