[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenox/konq-embed/kdesrc/khtml/patches
From:       Eva Brucherseifer <eva () kde ! org>
Date:       2006-03-17 16:52:27
Message-ID: 1142614347.216371.23913.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 519605 by eva:


fixed the patch, so that it actually works


 M  +11 -14    image_scaling.patch  


--- trunk/kdenox/konq-embed/kdesrc/khtml/patches/image_scaling.patch #519604:519605
@@ -231,9 +231,17 @@
          _style->setDisplay(BLOCK);
          _style->setVisuallyOrdered( visuallyOrdered );
          // ### make the font stuff _really_ work!!!!
---- rendering/render_image.cpp	2006-03-15 19:17:49.000000000 +0100
-+++ rendering/render_image.cpp.org	2006-03-15 19:17:27.000000000 +0100
-@@ -305,10 +305,12 @@
+--- rendering/render_image.cpp	2006-03-17 17:47:24.000000000 +0100
++++ rendering/render_image.cpp.patched	2006-03-17 17:46:59.000000000 +0100
+@@ -298,17 +298,19 @@
+         if ( (cWidth != intrinsicWidth() ||  cHeight != intrinsicHeight()) &&
+              pix.width() > 0 && pix.height() > 0 && i->valid_rect().isValid())
+         {
+-            if (resizeCache.isNull() && cWidth && cHeight && intrinsicWidth() && \
intrinsicHeight()) ++            if (resizeCache.isNull() && cWidth && cHeight && \
intrinsicWidth() && intrinsicHeight() && pix.width() && pix.height() ) +             \
{ +                 QRect scaledrect(i->valid_rect());
+ //                 kdDebug(6040) << "time elapsed: " << dt->elapsed() << endl;
  //                  kdDebug( 6040 ) << "have to scale: " << endl;
  //                  qDebug("cw=%d ch=%d  pw=%d ph=%d  rcw=%d, rch=%d",
  //                          cWidth, cHeight, intrinsicWidth(), intrinsicHeight(), \
resizeCache.width(), resizeCache.height()); @@ -250,14 +258,3 @@
                  scaledrect.setWidth( ( cWidth*scaledrect.width() ) / \
                intrinsicWidth() );
                  scaledrect.setHeight( ( cHeight*scaledrect.height() ) / \
intrinsicHeight() );  //                   qDebug("resizeCache size: %d/%d", \
                resizeCache.width(), resizeCache.height());
---- rendering/render_image.cpp	2006-03-17 17:38:48.000000000 +0100
-+++ rendering/render_image.cpp.org	2006-03-15 19:17:27.000000000 +0100
-@@ -298,7 +298,7 @@
-         if ( (cWidth != intrinsicWidth() ||  cHeight != intrinsicHeight()) &&
-              pix.width() > 0 && pix.height() > 0 && i->valid_rect().isValid())
-         {
--            if (resizeCache.isNull() && cWidth && cHeight && intrinsicWidth() && \
                intrinsicHeight() && pix.width() && pix.height() )
-+            if (resizeCache.isNull() && cWidth && cHeight && intrinsicWidth() && \
                intrinsicHeight())
-             {
-                 QRect scaledrect(i->valid_rect());
- //                 kdDebug(6040) << "time elapsed: " << dt->elapsed() << endl;


[prev in list] [next in list] [prev in thread] [next in thread]