[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51860] trunk/blender: code cleanup: double promotions
Campbell Barton
ideasman42 at gmail.com
Sun Nov 4 11:20:24 CET 2012
Revision: 51860
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51860
Author: campbellbarton
Date: 2012-11-04 10:20:16 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
code cleanup: double promotions
Modified Paths:
--------------
trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_DelayReader.cpp
trunk/blender/intern/audaspace/FX/AUD_HighpassFactory.cpp
trunk/blender/intern/bsp/intern/BOP_CarveInterface.cpp
trunk/blender/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.c
trunk/blender/source/blender/imbuf/intern/radiance_hdr.c
trunk/blender/source/blender/render/intern/raytrace/svbvh.h
Modified: trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.cpp
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.cpp 2012-11-04 07:18:29 UTC (rev 51859)
+++ trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.cpp 2012-11-04 10:20:16 UTC (rev 51860)
@@ -53,11 +53,11 @@
float omega = 2 * tan(m_frequency * M_PI / rate);
float o2 = omega * omega;
float o4 = o2 * o2;
- float x1 = o2 + 2 * BWPB41 * omega + 4;
- float x2 = o2 + 2 * BWPB42 * omega + 4;
- float y1 = o2 - 2 * BWPB41 * omega + 4;
- float y2 = o2 - 2 * BWPB42 * omega + 4;
- float o228 = 2 * o2 - 8;
+ float x1 = o2 + 2.0f * (float)BWPB41 * omega + 4.0f;
+ float x2 = o2 + 2.0f * (float)BWPB42 * omega + 4.0f;
+ float y1 = o2 - 2.0f * (float)BWPB41 * omega + 4.0f;
+ float y2 = o2 - 2.0f * (float)BWPB42 * omega + 4.0f;
+ float o228 = 2.0f * o2 - 8.0f;
float norm = x1 * x2;
a.push_back(1);
a.push_back((x1 + x2) * o228 / norm);
Modified: trunk/blender/intern/audaspace/FX/AUD_DelayReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_DelayReader.cpp 2012-11-04 07:18:29 UTC (rev 51859)
+++ trunk/blender/intern/audaspace/FX/AUD_DelayReader.cpp 2012-11-04 10:20:16 UTC (rev 51860)
@@ -33,8 +33,8 @@
AUD_DelayReader::AUD_DelayReader(AUD_Reference<AUD_IReader> reader, float delay) :
AUD_EffectReader(reader),
- m_delay(int(delay * reader->getSpecs().rate)),
- m_remdelay(int(delay * reader->getSpecs().rate))
+ m_delay(int((AUD_SampleRate)delay * reader->getSpecs().rate)),
+ m_remdelay(int((AUD_SampleRate)delay * reader->getSpecs().rate))
{
}
Modified: trunk/blender/intern/audaspace/FX/AUD_HighpassFactory.cpp
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_HighpassFactory.cpp 2012-11-04 07:18:29 UTC (rev 51859)
+++ trunk/blender/intern/audaspace/FX/AUD_HighpassFactory.cpp 2012-11-04 10:20:16 UTC (rev 51860)
@@ -48,8 +48,8 @@
std::vector<float> &b,
std::vector<float> &a)
{
- float w0 = 2 * M_PI * m_frequency / rate;
- float alpha = sin(w0) / (2 * m_Q);
+ float w0 = 2.0 * M_PI * (AUD_SampleRate)m_frequency / rate;
+ float alpha = (float)(sin(w0) / (2.0 * (double)m_Q));
float norm = 1 + alpha;
float c = cos(w0);
a.push_back(1);
Modified: trunk/blender/intern/bsp/intern/BOP_CarveInterface.cpp
===================================================================
--- trunk/blender/intern/bsp/intern/BOP_CarveInterface.cpp 2012-11-04 07:18:29 UTC (rev 51859)
+++ trunk/blender/intern/bsp/intern/BOP_CarveInterface.cpp 2012-11-04 10:20:16 UTC (rev 51860)
@@ -60,7 +60,7 @@
float production = carve::geom::dot(cross, vec3);
float magnitude = 1e-5 * cross.length();
- return fabs(production) < magnitude;
+ return fabsf(production) < magnitude;
}
static bool isFacePlanar(CSG_IFace &face, std::vector<carve::geom3d::Vector> &vertices)
Modified: trunk/blender/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp 2012-11-04 07:18:29 UTC (rev 51859)
+++ trunk/blender/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp 2012-11-04 10:20:16 UTC (rev 51860)
@@ -86,8 +86,8 @@
fREAL *data_nbd = &data_n[bd];
fREAL *data_bd = &data[bd];
for (k = bl; k < len; k += istep) {
- t1 = fc * data_n[k] + fs * data_nbd[k];
- t2 = fs * data_n[k] - fc * data_nbd[k];
+ t1 = fc * (double)data_n[k] + fs * (double)data_nbd[k];
+ t2 = fs * (double)data_n[k] - fc * (double)data_nbd[k];
data_n[k] = data[k] - t1;
data_nbd[k] = data_bd[k] - t2;
data[k] += t1;
@@ -395,7 +395,7 @@
// linear window good enough here, visual result counts, not scientific analysis
//w = (1.f-fabs(u))*(1.f-fabs(v));
// actually, Hanning window is ok, cos^2 for some reason is slower
- w = (0.5f + 0.5f * cos((double)u * M_PI)) * (0.5f + 0.5f * cos((double)v * M_PI));
+ w = (0.5f + 0.5f * cosf(u * (float)M_PI)) * (0.5f + 0.5f * cosf(v * (float)M_PI));
mul_v3_fl(fcol, w);
ckrn->writePixel(x, y, fcol);
}
Modified: trunk/blender/source/blender/editors/space_file/filelist.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filelist.c 2012-11-04 07:18:29 UTC (rev 51859)
+++ trunk/blender/source/blender/editors/space_file/filelist.c 2012-11-04 10:20:16 UTC (rev 51860)
@@ -785,7 +785,7 @@
}
else if (BLI_testextensie(relname, ".txt") ||
BLI_testextensie(relname, ".glsl") ||
- BLI_testextensie(relname, ".osl") ||
+ BLI_testextensie(relname, ".osl") ||
BLI_testextensie(relname, ".data"))
{
return TEXTFILE;
Modified: trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.c 2012-11-04 07:18:29 UTC (rev 51859)
+++ trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.c 2012-11-04 10:20:16 UTC (rev 51860)
@@ -947,7 +947,7 @@
softClip = 0;
breakPoint = logImage->referenceWhite - softClip;
- gain = logElement.maxValue / (1.0 - powf(10, (logImage->referenceBlack - logImage->referenceWhite) * step / negativeFilmGamma * logImage->gamma / 1.7f));
+ gain = logElement.maxValue / (1.0f - powf(10, (logImage->referenceBlack - logImage->referenceWhite) * step / negativeFilmGamma * logImage->gamma / 1.7f));
offset = gain - logElement.maxValue;
kneeOffset = powf(10, (breakPoint - logImage->referenceWhite) * step / negativeFilmGamma * logImage->gamma / 1.7f) * gain - offset;
kneeGain = (logElement.maxValue - kneeOffset) / powf(5 * softClip, softClip / 100);
Modified: trunk/blender/source/blender/imbuf/intern/radiance_hdr.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/radiance_hdr.c 2012-11-04 07:18:29 UTC (rev 51859)
+++ trunk/blender/source/blender/imbuf/intern/radiance_hdr.c 2012-11-04 10:20:16 UTC (rev 51860)
@@ -154,7 +154,7 @@
if (d <= 1e-32f)
rgbe[RED] = rgbe[GRN] = rgbe[BLU] = rgbe[EXP] = 0;
else {
- d = frexp(d, &e) * 256.f / d;
+ d = (float)frexp(d, &e) * 256.0f / d;
rgbe[RED] = (unsigned char)(fcol[RED] * d);
rgbe[GRN] = (unsigned char)(fcol[GRN] * d);
rgbe[BLU] = (unsigned char)(fcol[BLU] * d);
Modified: trunk/blender/source/blender/render/intern/raytrace/svbvh.h
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/svbvh.h 2012-11-04 07:18:29 UTC (rev 51859)
+++ trunk/blender/source/blender/render/intern/raytrace/svbvh.h 2012-11-04 10:20:16 UTC (rev 51860)
@@ -93,7 +93,7 @@
RE_RC_COUNT(isec->raycounter->bb.test);
if (t1x > t2y || t2x < t1y || t1x > t2z || t2x < t1z || t1y > t2z || t2y < t1z) return 0;
- if (t2x < 0.0 || t2y < 0.0 || t2z < 0.0) return 0;
+ if (t2x < 0.0f || t2y < 0.0f || t2z < 0.0f) return 0;
if (t1x > isec->dist || t1y > isec->dist || t1z > isec->dist) return 0;
RE_RC_COUNT(isec->raycounter->bb.hit);
More information about the Bf-blender-cvs
mailing list