Changeset 63944 in webkit

Timestamp:

Jul 22, 2010 7:55:21 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-22 Patrick Gansterer <​paroga@paroga.com>

Reviewed by Adam Roben.

[WINCE] Add additonal methods to BitmapInfo.
​https://bugs.webkit.org/show_bug.cgi?id=42071

Added a parameter to create 16bit BitmapInfo and
some additional accessors for the WinCE port.

Set bmiHeader.biSize only at constructor.

• platform/win/BitmapInfo.cpp: Added property svn:eol-style. (WebCore::bitmapInfoForSize): (WebCore::BitmapInfo::create): (WebCore::BitmapInfo::createBottomUp):
• platform/win/BitmapInfo.h: Added property svn:eol-style. (WebCore::BitmapInfo::is16bit): (WebCore::BitmapInfo::is32bit): (WebCore::BitmapInfo::width): (WebCore::BitmapInfo::height): (WebCore::BitmapInfo::size): (WebCore::BitmapInfo::paddedWidth): (WebCore::BitmapInfo::numPixels): (WebCore::BitmapInfo::paddedBytesPerLine): (WebCore::BitmapInfo::bytesPerLine):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/win/BitmapInfo.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-22  Patrick Gansterer  <paroga@paroga.com>
+
+        Reviewed by Adam Roben.
+
+        [WINCE] Add additonal methods to BitmapInfo.
+        https://bugs.webkit.org/show_bug.cgi?id=42071
+
+        Added a parameter to create 16bit BitmapInfo and
+        some additional accessors for the WinCE port.
+
+        Set bmiHeader.biSize only at constructor.
+
+        * platform/win/BitmapInfo.cpp: Added property svn:eol-style.
+        (WebCore::bitmapInfoForSize):
+        (WebCore::BitmapInfo::create):
+        (WebCore::BitmapInfo::createBottomUp):
+        * platform/win/BitmapInfo.h: Added property svn:eol-style.
+        (WebCore::BitmapInfo::is16bit):
+        (WebCore::BitmapInfo::is32bit):
+        (WebCore::BitmapInfo::width):
+        (WebCore::BitmapInfo::height):
+        (WebCore::BitmapInfo::size):
+        (WebCore::BitmapInfo::paddedWidth):
+        (WebCore::BitmapInfo::numPixels):
+        (WebCore::BitmapInfo::paddedBytesPerLine):
+        (WebCore::BitmapInfo::bytesPerLine):
+
 2010-07-22  MORITA Hajime  <morrita@google.com>
 

trunk/WebCore/platform/win/BitmapInfo.cpp

@@ -2 +2 @@
  * Copyright (C) 2009 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009 Brent Fulgham
+ * Copyright (C) 2007-2009 Torch Mobile, Inc. All Rights Reserved.
+ * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28 +30 @@
 #include "BitmapInfo.h"
 
+#include <wtf/Assertions.h>
+
 namespace WebCore {
 
-BitmapInfo bitmapInfoForSize(int width, int height)
+BitmapInfo bitmapInfoForSize(int width, int height, WORD bitCount)
 {
+    ASSERT_ARG(bitCount, bitCount == 16 || bitCount == 32);
+
     BitmapInfo bitmapInfo;
-    bitmapInfo.bmiHeader.biSize          = sizeof(BITMAPINFOHEADER);
-    bitmapInfo.bmiHeader.biWidth         = width; 
+    bitmapInfo.bmiHeader.biWidth         = width;
     bitmapInfo.bmiHeader.biHeight        = height;
     bitmapInfo.bmiHeader.biPlanes        = 1;
-    bitmapInfo.bmiHeader.biBitCount      = 32;
+    bitmapInfo.bmiHeader.biBitCount      = bitCount;
     bitmapInfo.bmiHeader.biCompression   = BI_RGB;
     bitmapInfo.bmiHeader.biSizeImage     = 0;
@@ -54 +59 @@
 }
 
-BitmapInfo BitmapInfo::create(const IntSize& size)
+BitmapInfo BitmapInfo::create(const IntSize& size, WORD bitCount)
 {
-   return bitmapInfoForSize(size.width(), size.height());
+    return bitmapInfoForSize(size.width(), size.height(), bitCount);
 }
 
-BitmapInfo BitmapInfo::createBottomUp(const IntSize& size)
+BitmapInfo BitmapInfo::createBottomUp(const IntSize& size, WORD bitCount)
 {
-   return bitmapInfoForSize(size.width(), -size.height());
+    return bitmapInfoForSize(size.width(), -size.height(), bitCount);
 }