Sync with GIT

This commit is contained in:
ghorvath
2010-04-20 15:13:34 +00:00
parent 68c4f03a59
commit af8a25edeb
64 changed files with 869 additions and 3405 deletions

View File

@@ -163,7 +163,7 @@ void Crop::update (int todo, bool internal) {
if (settings->verbose) printf ("C-TRANSFORM: %d\n", t3.etime(t2));
if ((todo & M_BLURMAP) && params.sh.enabled) {
double radius = sqrt (SKIPS(parent->fw,skip)*SKIPS(parent->fw,skip)+SKIPS(parent->fh,skip)*SKIPS(parent->fh,skip)) / 2.0;
double radius = sqrt (double(SKIPS(parent->fw,skip)*SKIPS(parent->fw,skip)+SKIPS(parent->fh,skip)*SKIPS(parent->fh,skip))) / 2.0;
double shradius = radius / 1800.0 * params.sh.radius;
cshmap->update (baseCrop, (unsigned short**)cbuffer, shradius, parent->ipf.lumimul, params.sh.hq);
cshmap->forceStat (parent->shmap->max, parent->shmap->min, parent->shmap->avg);