Merge pull request #421 from Autumin/master
remove user defined "round" that never invoked
This commit is contained in:
commit
6a5690c9ca
@ -27,8 +27,6 @@
|
|||||||
|
|
||||||
const float fadeTime = 1.5f;
|
const float fadeTime = 1.5f;
|
||||||
|
|
||||||
extern "C" double round(double val);
|
|
||||||
|
|
||||||
class BitmapTransitionSource : public ImageSource
|
class BitmapTransitionSource : public ImageSource
|
||||||
{
|
{
|
||||||
List<BitmapImage*> bitmapImages;
|
List<BitmapImage*> bitmapImages;
|
||||||
|
@ -1,33 +0,0 @@
|
|||||||
/********************************************************************************
|
|
||||||
Copyright (C) 2012 Hugh Bailey <obs.jim@gmail.com>
|
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
********************************************************************************/
|
|
||||||
|
|
||||||
#include "Main.h"
|
|
||||||
|
|
||||||
extern "C"
|
|
||||||
{
|
|
||||||
double round(double val)
|
|
||||||
{
|
|
||||||
if(!_isnan(val) || !_finite(val))
|
|
||||||
return val;
|
|
||||||
|
|
||||||
if(val > 0.0f)
|
|
||||||
return floor(val+0.5);
|
|
||||||
else
|
|
||||||
return floor(val-0.5);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1916,8 +1916,6 @@ void OBS::MoveItemsByPixels(int dx, int dy)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
extern "C" double round(double val);
|
|
||||||
|
|
||||||
void OBS::FitItemsToScreen()
|
void OBS::FitItemsToScreen()
|
||||||
{
|
{
|
||||||
if(App->bRunning)
|
if(App->bRunning)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user