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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit e00d0421145b6b5171efcfe21aadc953899abdb7
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 30 21:03:32 2003 +0000

    Tests:
    
            * qt/qregexp-test.cpp:
            (main):
    	fixed broken build by removing final parameter to match()
    
    WebCore:
    
    	- fixed 3346460 -- images > area (2048x2048) are compressed vertically
    	when displayed as src of img tag
    
            Reviewed by Darin
    
            * khtml/rendering/render_image.cpp:
            (RenderImage::layout):
    	Just comment out the code that imposes a maximum image size (incorrectly);
    	maybe KDE folks want to make this work, but we don't need to try to
    	prevent large images.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4735 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5ae529e..2a66c93 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,18 @@
 2003-07-30  John Sullivan  <sullivan at apple.com>
 
+	- fixed 3346460 -- images > area (2048x2048) are compressed vertically 
+	when displayed as src of img tag
+
+        Reviewed by Darin
+
+        * khtml/rendering/render_image.cpp:
+        (RenderImage::layout):
+	Just comment out the code that imposes a maximum image size (incorrectly);
+	maybe KDE folks want to make this work, but we don't need to try to
+	prevent large images.
+
+2003-07-30  John Sullivan  <sullivan at apple.com>
+
 	- WebCore part of fix for 3284525 -- AutoFill fills in 
 	only e-mail address field of New Account form on Apple Store Japan
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5ae529e..2a66c93 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,18 @@
 2003-07-30  John Sullivan  <sullivan at apple.com>
 
+	- fixed 3346460 -- images > area (2048x2048) are compressed vertically 
+	when displayed as src of img tag
+
+        Reviewed by Darin
+
+        * khtml/rendering/render_image.cpp:
+        (RenderImage::layout):
+	Just comment out the code that imposes a maximum image size (incorrectly);
+	maybe KDE folks want to make this work, but we don't need to try to
+	prevent large images.
+
+2003-07-30  John Sullivan  <sullivan at apple.com>
+
 	- WebCore part of fix for 3284525 -- AutoFill fills in 
 	only e-mail address field of New Account form on Apple Store Japan
 
diff --git a/WebCore/khtml/rendering/render_image.cpp b/WebCore/khtml/rendering/render_image.cpp
index db8cc62..4122a1e 100644
--- a/WebCore/khtml/rendering/render_image.cpp
+++ b/WebCore/khtml/rendering/render_image.cpp
@@ -369,12 +369,18 @@ void RenderImage::layout()
 	m_width = intrinsicWidth();
     if ( m_height > 2048 && !style()->height().isFixed() )
 	m_height = intrinsicHeight();
+
+// We don't want to impose a constraint on image size here. But there also
+// is a bug somewhere that causes the scaled height to be used with the
+// original width, causing the image to be compressed vertically.
+#if !APPLE_CHANGES
     // limit total size to not run out of memory when doing the xform call.
     if ( m_width * m_height > 2048*2048 ) {
 	float scale = sqrt( m_width*m_height / ( 2048.*2048. ) );
 	m_width = (int) (m_width/scale);
 	m_height = (int) (m_height/scale);
     }
+#endif
     
     if ( m_width != oldwidth || m_height != oldheight )
         resizeCache = QPixmap();

-- 
WebKit Debian packaging