diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-09-04 02:39:21 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-09-04 02:39:21 +0400 |
| commit | 60e5abe71f8c219f7ba6dcb8ac9d109ca5610715 (patch) | |
| tree | 6a57327818427635e3ac1304e8c1858f9b0621bd /intern/cycles/render/tile.cpp | |
| parent | b314209356288c3768faa1d7fbd7b1bf9d179a7a (diff) | |
Fix a few issues reported by coverity scan.
Diffstat (limited to 'intern/cycles/render/tile.cpp')
| -rw-r--r-- | intern/cycles/render/tile.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/intern/cycles/render/tile.cpp b/intern/cycles/render/tile.cpp index e707f336627..72bcdf966b5 100644 --- a/intern/cycles/render/tile.cpp +++ b/intern/cycles/render/tile.cpp @@ -22,7 +22,7 @@ CCL_NAMESPACE_BEGIN TileManager::TileManager(bool progressive_, int num_samples_, int2 tile_size_, int start_resolution_, - bool preserve_tile_device_, bool background_, int tile_order_, int num_devices_) + bool preserve_tile_device_, bool background_, TileOrder tile_order_, int num_devices_) { progressive = progressive_; tile_size = tile_size_; @@ -178,7 +178,7 @@ list<Tile>::iterator TileManager::next_viewport_tile(int device) return state.tiles.end(); } -list<Tile>::iterator TileManager::next_background_tile(int device, int tile_order) +list<Tile>::iterator TileManager::next_background_tile(int device, TileOrder tile_order) { list<Tile>::iterator iter, best = state.tiles.end(); @@ -199,21 +199,21 @@ list<Tile>::iterator TileManager::next_background_tile(int device, int tile_orde int64_t disty = cordy; switch (tile_order) { - case TileManager::CENTER: + case TILE_CENTER: distx = centx - (cur_tile.x + cur_tile.w); disty = centy - (cur_tile.y + cur_tile.h); distx = (int64_t) sqrt((double)distx * distx + disty * disty); break; - case TileManager::RIGHT_TO_LEFT: + case TILE_RIGHT_TO_LEFT: distx = cordx - cur_tile.x; break; - case TileManager::LEFT_TO_RIGHT: + case TILE_LEFT_TO_RIGHT: distx = cordx + cur_tile.x; break; - case TileManager::TOP_TO_BOTTOM: + case TILE_TOP_TO_BOTTOM: distx = cordx - cur_tile.y; break; - case TileManager::BOTTOM_TO_TOP: + case TILE_BOTTOM_TO_TOP: distx = cordx + cur_tile.y; break; default: |