liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup for min/max functions. Committed on behalf of lebedev.ri (thanks!).

Browse Source
This commit is contained in:
Emil Martinec
2012-04-09 15:42:59 -05:00
parent 30681df133
commit 033755b6df
61 changed files with 767 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtengine/slicer.cc
View File

@@ -18,11 +18,16 @@
*/
#include <cmath>
#include <gtkmm.h>
#include <algorithm>
#include "slicer.h"
#ifdef _OPENMP
#include <omp.h>
#endif
#include "slicer.h"
#include <gtkmm.h>
using namespace std;
// If no parameter set, everything = 0 -> process all the image
Block::Block() {
@@ -75,7 +80,7 @@ Slicer::Slicer(unsigned int imageWidth, unsigned int imageHeight, Block *subRegi
//calculate the number of block
blockNumber = (double(region.width*region.height) / (double)pixels);
blockNumber = int((MAX(blockNumber, 1) + (double)procNumber/2.)/procNumber)*procNumber;
blockNumber = int((max(blockNumber, 1U) + (double)procNumber/2.)/procNumber)*procNumber;
vBlockNumber = (unsigned int)(sqrt((double)blockNumber / subRegionRatio)+0.5);
vBlockNumber = CLAMP(vBlockNumber, 1, blockNumber);
hBlockNumber = (double)blockNumber / (double)vBlockNumber;