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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 76f9dc3cc73f98751ed0d00c4bf7c9d8606925b1
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 16 22:43:11 2002 +0000

    	Fixed 2896350.  Ignore DPI in images and render directly at pixel size.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1168 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index e1dca28..396d5ae 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-05-16  Richard J. Williamson  <rjw at apple.com>
 
+	Fixed 2896350.  Ignore DPI in images and render directly at pixel size.
+	
+	* kwq/KWQPainter.mm:
+	(QPainter::drawPixmap):
+	* kwq/KWQPixmap.mm:
+	(QPixmap::QPixmap):
+
+2002-05-16  Richard J. Williamson  <rjw at apple.com>
+
 	Fixed 2925638.  Don't send last progress message from resourceDataDidBecomeAvailable,
 	it is sent from IFURLHandleResourceDidFinishLoading, avoiding duplication.
 	
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e1dca28..396d5ae 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2002-05-16  Richard J. Williamson  <rjw at apple.com>
 
+	Fixed 2896350.  Ignore DPI in images and render directly at pixel size.
+	
+	* kwq/KWQPainter.mm:
+	(QPainter::drawPixmap):
+	* kwq/KWQPixmap.mm:
+	(QPixmap::QPixmap):
+
+2002-05-16  Richard J. Williamson  <rjw at apple.com>
+
 	Fixed 2925638.  Don't send last progress message from resourceDataDidBecomeAvailable,
 	it is sent from IFURLHandleResourceDidFinishLoading, avoiding duplication.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e1dca28..396d5ae 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2002-05-16  Richard J. Williamson  <rjw at apple.com>
 
+	Fixed 2896350.  Ignore DPI in images and render directly at pixel size.
+	
+	* kwq/KWQPainter.mm:
+	(QPainter::drawPixmap):
+	* kwq/KWQPixmap.mm:
+	(QPixmap::QPixmap):
+
+2002-05-16  Richard J. Williamson  <rjw at apple.com>
+
 	Fixed 2925638.  Don't send last progress message from resourceDataDidBecomeAvailable,
 	it is sent from IFURLHandleResourceDidFinishLoading, avoiding duplication.
 	
diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index 5c371d1..27eafc8 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -392,10 +392,10 @@ void QPainter::drawPixmap( int x, int y, const QPixmap &pixmap,
             sw = (int)[pixmap.nsimage size].width;
         if (sh == -1)
             sh = (int)[pixmap.nsimage size].height;
-        [pixmap.nsimage drawInRect: NSMakeRect(x, y, sw, sh) 
-                    fromRect: NSMakeRect(sx, sy, sw, sh)
-                    operation: NSCompositeSourceOver	// Renders transparency correctly
-                    fraction: 1.0];
+		[pixmap.nsimage drawInRect: NSMakeRect(x, y, sw, sh) 
+				fromRect: NSMakeRect(sx, sy, sw, sh)
+				operation: NSCompositeSourceOver	// Renders transparency correctly
+				fraction: 1.0];
     }
     
     _unlockFocus();
diff --git a/WebCore/kwq/KWQPixmap.mm b/WebCore/kwq/KWQPixmap.mm
index 656a211..d68b6c5 100644
--- a/WebCore/kwq/KWQPixmap.mm
+++ b/WebCore/kwq/KWQPixmap.mm
@@ -43,6 +43,9 @@ QPixmap::QPixmap(const QByteArray &bytes)
 {
     NSData *data = [[NSData alloc] initWithBytes: bytes.data() length: bytes.size()];
     nsimage = [[NSImage alloc] initWithData: data];
+	NSArray *reps = [nsimage representations];
+	NSImageRep *rep = [reps objectAtIndex: 0];
+	[rep setSize:NSMakeSize([rep pixelsWide], [rep pixelsHigh])];
     [data release];
     if (nsimage == nil){
         KWQDEBUG("unable to create image\n");

-- 
WebKit Debian packaging