Commit 355136e1 authored by oliver's avatar oliver
Browse files

WebCore:

        Reviewed by Darin.

        Use correct size for BITMAPINFOHEADER -- whoops.

        * platform/win/CursorWin.cpp:
        (WebCore::Cursor::Cursor):
        * platform/win/PasteboardWin.cpp:
        (WebCore::Pasteboard::writeImage):

WebKit:

        Reviewed by Darin.

        Use correct size for BITMAPINFOHEADER -- whoops.

        * win/WebIconDatabase.cpp:
        (createDIB):
        (WebIconDatabase::getOrCreateDefaultIconBitmap):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@23486 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5835026e
2007-06-12 Oliver Hunt <oliver@apple.com>
Reviewed by Darin.
Use correct size for BITMAPINFOHEADER -- whoops.
* platform/win/CursorWin.cpp:
(WebCore::Cursor::Cursor):
* platform/win/PasteboardWin.cpp:
(WebCore::Pasteboard::writeImage):
2007-06-12 Sam Weinig <sam@webkit.org>
 
Reviewed by Oliver.
......@@ -53,7 +53,7 @@ Cursor::Cursor(Image* img, const IntPoint& hotspot)
static bool doAlpha = supportsAlphaCursors();
HBITMAP hCursor;
BITMAPINFO cursorImage = {0};
cursorImage.bmiHeader.biSize = sizeof(BITMAPINFO);
cursorImage.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
cursorImage.bmiHeader.biWidth = img->width();
cursorImage.bmiHeader.biHeight = img->height();
cursorImage.bmiHeader.biPlanes = 1;
......
......@@ -188,7 +188,7 @@ void Pasteboard::writeImage(Node* node, const KURL&, const String&)
HBITMAP oldBitmap = (HBITMAP)SelectObject(compatibleDC, resultBitmap);
BITMAPINFO bmInfo = {0};
bmInfo.bmiHeader.biSize = sizeof(BITMAPINFO);
bmInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
bmInfo.bmiHeader.biWidth = image->width();
bmInfo.bmiHeader.biHeight = image->height();
bmInfo.bmiHeader.biPlanes = 1;
......
2007-06-12 Oliver Hunt <oliver@apple.com>
Reviewed by Darin.
Use correct size for BITMAPINFOHEADER -- whoops.
* win/WebIconDatabase.cpp:
(createDIB):
(WebIconDatabase::getOrCreateDefaultIconBitmap):
2007-06-10 David Hyatt <hyatt@apple.com>
 
Fix for bug 14037, make sure respondsToSelector does the write thing
......
......@@ -241,7 +241,7 @@ HBITMAP createDIB(LPSIZE size)
HBITMAP result;
BITMAPINFO bmInfo = {0};
bmInfo.bmiHeader.biSize = sizeof(BITMAPINFO);
bmInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
bmInfo.bmiHeader.biWidth = size->cx;
bmInfo.bmiHeader.biHeight = size->cy;
bmInfo.bmiHeader.biPlanes = 1;
......@@ -282,4 +282,4 @@ HBITMAP WebIconDatabase::getOrCreateDefaultIconBitmap(LPSIZE size)
return 0;
}
return result;
}
\ No newline at end of file
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment