X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fbinfolder.C;h=593bfdab1fe041b27ba15a9caf15a0b30de40421;hb=5ac2037d8e5ab71a1915389cd08b458cfb60d64f;hp=32fd02aa82fb41a632de925d9d488b66619cb240;hpb=a95193c3fd88733d184f2d460eca1fe6ddf8af28;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/binfolder.C b/cinelerra-5.1/cinelerra/binfolder.C index 32fd02aa..593bfdab 100644 --- a/cinelerra-5.1/cinelerra/binfolder.C +++ b/cinelerra-5.1/cinelerra/binfolder.C @@ -239,7 +239,6 @@ static int64_t scan_date(const char *cp, char *&bp) struct tm ttm; memset(&ttm, 0, sizeof(ttm)); ttm.tm_year = year-1900; ttm.tm_mon = mon-1; ttm.tm_mday = day; ttm.tm_hour = hour; ttm.tm_min = min; ttm.tm_sec = secs; - ttm.tm_wday = ttm.tm_yday = 0; ttm.tm_isdst = daylight; /* tzset in main */ time_t t = mktime(&ttm); return (int64_t)t; } @@ -539,9 +538,9 @@ void BinFolderFilters::copy_from(BinFolderFilters *that) double BinFolderOp::around(double v, double a) { - if( type != FOLDER_OP_AROUND || a <= 0 ) return v; - if( (v=fabs(v)) > a ) return -1; - return v / a; + if( type != FOLDER_OP_AROUND ) return v; + v = fabs(v); + return a>0 ? v/a : v; } // string theory: Feynman, Einstein and Schrodinger string compare