Changeset 36446 in webkit

Timestamp:

Sep 15, 2008 10:10:48 AM (16 years ago)

Author:

Simon Fraser

Message:

2008-09-15 Simon Fraser <Simon Fraser>

Reviewed by Dan Bernstein

Fix assertion and integral pixel issue when creating subimages.
​https://bugs.webkit.org/show_bug.cgi?id=20786

• platform/graphics/cg/ImageCG.cpp: (WebCore::BitmapImage::draw):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cg/ImageCG.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-09-15  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Dan Bernstein
+
+        Fix assertion and integral pixel issue when creating subimages.
+        https://bugs.webkit.org/show_bug.cgi?id=20786
+
+        * platform/graphics/cg/ImageCG.cpp:
+        (WebCore::BitmapImage::draw):
+
 2008-09-15  Tor Arne Vestbø  <tavestbo@trolltech.com>
 

trunk/WebCore/platform/graphics/cg/ImageCG.cpp

@@ -164 +164 @@
             image = CGImageCreateWithImageInRect(image, srcRect);
             if (currHeight < srcRect.bottom()) {
-                ASSERT(CGImageGetHeight(image) == currHeight - srcRect.y());
-                adjustedDestRect.setHeight(destRect.height() / srcRect.height() * (currHeight - srcRect.y()));
+                ASSERT(CGImageGetHeight(image) == currHeight - CGRectIntegral(srcRect).origin.y);
+                adjustedDestRect.setHeight(destRect.height() / srcRect.height() * CGImageGetHeight(image));
             }
         } else {