diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-07 21:40:51 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-07 21:40:51 +0000 |
| commit | 462474b9444dcda47b5c140f5d31b790610b6176 (patch) | |
| tree | bb4cd80ced3007f1c21a05577ff65d9885cb3990 /app | |
| parent | 742ddfe4b1c32bb0d86c541a25de3e05d7061901 (diff) | |
| download | chromium_src-462474b9444dcda47b5c140f5d31b790610b6176.zip chromium_src-462474b9444dcda47b5c140f5d31b790610b6176.tar.gz chromium_src-462474b9444dcda47b5c140f5d31b790610b6176.tar.bz2 | |
Attempt to fix crash in issue 31082
Crash in issue 31082 is inside Windows ICM (Image Color Management)
code. I suspect it is caused by invalid bV5Intent value in the
BITMAPV5HEADER we passed in.
BUG=31082
TEST=Crashes in issue 31082 should be gone.
Review URL: http://codereview.chromium.org/519081
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
| -rw-r--r-- | app/gfx/icon_util.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/gfx/icon_util.cc b/app/gfx/icon_util.cc index ae77b43..b87d799 100644 --- a/app/gfx/icon_util.cc +++ b/app/gfx/icon_util.cc @@ -312,6 +312,10 @@ void IconUtil::InitializeBitmapHeader(BITMAPV5HEADER* header, int width, // <http://msdn.microsoft.com/en-us/library/ms536531(VS.85).aspx> and // <http://b/1283121>. header->bV5CSType = LCS_WINDOWS_COLOR_SPACE; + + // Use a valid value for bV5Intent as 0 is not a valid one. + // <http://msdn.microsoft.com/en-us/library/dd183381(VS.85).aspx> + header->bV5Intent = LCS_GM_IMAGES; } void IconUtil::SetSingleIconImageInformation(const SkBitmap& bitmap, |