AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Windows build

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1633413003

Review URL: https://codereview.chromium.org/1633413003
This commit is contained in:
yujieqin 2016-01-27 09:03:20 -08:00 committed by Commit bot
parent 0edf1693df
commit fda27a977d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/codec/SkRawCodec.cpp
View File

@ -42,8 +42,8 @@ namespace {
dng_point num_tiles_in_area(const dng_point &areaSize,
const dng_point_real64 &tileSize) {
// FIXME: Add a ceil_div() helper in SkCodecPriv.h
return dng_point((areaSize.v + tileSize.v - 1) / tileSize.v,
(areaSize.h + tileSize.h - 1) / tileSize.h);
return dng_point(static_cast<int32>((areaSize.v + tileSize.v - 1) / tileSize.v),
static_cast<int32>((areaSize.h + tileSize.h - 1) / tileSize.h));
}
int num_tasks_required(const dng_point& tilesInTask,
@ -92,7 +92,7 @@ std::vector<dng_rect> compute_task_areas(const int maxTasks, const dng_rect& are
class SkDngHost : public dng_host {
public:
using dng_host::dng_host;
explicit SkDngHost(dng_memory_allocator* allocater) : dng_host(allocater) {}
void PerformAreaTask(dng_area_task& task, const dng_rect& area) override {
// The area task gets split up into max_tasks sub-tasks. The max_tasks is defined by the
@ -105,7 +105,7 @@ public:
// tileSize is typically 256x256
const dng_point tileSize(task.FindTileSize(area));
const std::vector<dng_rect> taskAreas = compute_task_areas(maxTasks, area, tileSize);
const int numTasks = taskAreas.size();
const int numTasks = static_cast<int>(taskAreas.size());
task.Start(numTasks, tileSize, &Allocator(), Sniffer());
for (int taskIndex = 0; taskIndex < numTasks; ++taskIndex) {