From cdb8dd8dd56435ec71c67c5eb83b8a7d4c661aaf Mon Sep 17 00:00:00 2001 From: David Sansome Date: Mon, 7 Jun 2010 11:47:35 +0000 Subject: [PATCH] More mingw fixes --- 3rdparty/libprojectm/MilkdropPresetFactory/PresetFrameIO.cpp | 3 ++- 3rdparty/libprojectm/Renderer/MilkdropWaveform.cpp | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/3rdparty/libprojectm/MilkdropPresetFactory/PresetFrameIO.cpp b/3rdparty/libprojectm/MilkdropPresetFactory/PresetFrameIO.cpp index df294fc9d..0d0b7254e 100644 --- a/3rdparty/libprojectm/MilkdropPresetFactory/PresetFrameIO.cpp +++ b/3rdparty/libprojectm/MilkdropPresetFactory/PresetFrameIO.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include "Renderer/BeatDetect.hpp" PresetInputs::PresetInputs() : PipelineContext() @@ -195,7 +196,7 @@ void PresetOutputs::PerPixelMath(const PipelineContext &context) { for (y = 0; y < gy; y++) { - fZoom2 = powf(this->zoom_mesh[x][y], powf(this->zoomexp_mesh[x][y], + fZoom2 = std::pow(this->zoom_mesh[x][y], std::pow(this->zoomexp_mesh[x][y], rad_mesh[x][y] * 2.0f - 1.0f)); fZoom2Inv = 1.0f / fZoom2; this->x_mesh[x][y] = this->orig_x[x][y] * 0.5f * fZoom2Inv + 0.5f; diff --git a/3rdparty/libprojectm/Renderer/MilkdropWaveform.cpp b/3rdparty/libprojectm/Renderer/MilkdropWaveform.cpp index 455eedb1a..6e4933371 100644 --- a/3rdparty/libprojectm/Renderer/MilkdropWaveform.cpp +++ b/3rdparty/libprojectm/Renderer/MilkdropWaveform.cpp @@ -16,6 +16,8 @@ #include #endif +#include + #include "MilkdropWaveform.hpp" #include "math.h" #include "BeatDetect.hpp" @@ -124,7 +126,7 @@ void MilkdropWaveform::MaximizeColors(RenderContext &context) case 2048: temp_a *= 0.33f; break; } temp_a*=1.3f; - temp_a*=powf(context.beatDetect->treb , 2.0f); + temp_a*=std::pow(context.beatDetect->treb , 2.0f); } if (maximizeColors==true)