Commit ddcf73a7 authored by thakis@chromium.org's avatar thakis@chromium.org

fix win build

TBR=sky

Review URL: https://chromiumcodereview.appspot.com/10837278

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151819 0039d316-1c4b-4281-b951-d872f2087c98
parent 0a0e74f9
...@@ -82,7 +82,7 @@ SkBitmap SelectCandidate(const std::vector<SkBitmap>& bitmaps, ...@@ -82,7 +82,7 @@ SkBitmap SelectCandidate(const std::vector<SkBitmap>& bitmaps,
for (size_t i = 0; i < bitmaps.size(); ++i) { for (size_t i = 0; i < bitmaps.size(); ++i) {
if (bitmaps[i].width() == source_size && if (bitmaps[i].width() == source_size &&
bitmaps[i].height() == source_size) { bitmaps[i].height() == source_size) {
*score = 0.2; *score = 0.2f;
return PadWithBorder(bitmaps[i], desired_size, source_size); return PadWithBorder(bitmaps[i], desired_size, source_size);
} }
} }
...@@ -90,7 +90,7 @@ SkBitmap SelectCandidate(const std::vector<SkBitmap>& bitmaps, ...@@ -90,7 +90,7 @@ SkBitmap SelectCandidate(const std::vector<SkBitmap>& bitmaps,
for (size_t i = 0; i < bitmaps.size(); ++i) { for (size_t i = 0; i < bitmaps.size(); ++i) {
if (bitmaps[i].width() * scale == source_size && if (bitmaps[i].width() * scale == source_size &&
bitmaps[i].height() * scale == source_size) { bitmaps[i].height() * scale == source_size) {
*score = 0.15; *score = 0.15f;
return PadWithBorder(bitmaps[i], desired_size, source_size); return PadWithBorder(bitmaps[i], desired_size, source_size);
} }
} }
...@@ -110,7 +110,7 @@ SkBitmap SelectCandidate(const std::vector<SkBitmap>& bitmaps, ...@@ -110,7 +110,7 @@ SkBitmap SelectCandidate(const std::vector<SkBitmap>& bitmaps,
min_area = area; min_area = area;
} }
} }
*score = 0.1; *score = 0.1f;
// c) Else, from the biggest smaller variant. // c) Else, from the biggest smaller variant.
if (candidate == -1) { if (candidate == -1) {
*score = 0; *score = 0;
...@@ -144,7 +144,7 @@ gfx::ImageSkia SelectFaviconFrames( ...@@ -144,7 +144,7 @@ gfx::ImageSkia SelectFaviconFrames(
multi_image.AddRepresentation( multi_image.AddRepresentation(
gfx::ImageSkiaRep(bitmaps[max_index], ui::SCALE_FACTOR_100P)); gfx::ImageSkiaRep(bitmaps[max_index], ui::SCALE_FACTOR_100P));
if (match_score) if (match_score)
*match_score = 0.8; *match_score = 0.8f;
return multi_image; return multi_image;
} }
......
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