Menu
▾
▴
SF.net SVN: openvrml:[4256] branches/0.18
|
From: <br...@us...> - 2012-04-24 03:23:20
|
Revision: 4256
http://openvrml.svn.sourceforge.net/openvrml/?rev=4256&view=rev
Author: braden
Date: 2012-04-24 03:23:13 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
Quell warnings from gcc 4.7.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp
branches/0.18/src/openvrml-player/curlbrowserhost.cpp
branches/0.18/src/script/javascript.cpp
Property Changed:
----------------
branches/0.18/
Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-04-24 02:40:32 UTC (rev 4255)
+++ branches/0.18/ChangeLog 2012-04-24 03:23:13 UTC (rev 4256)
@@ -1,3 +1,11 @@
+2012-04-23 Braden McDaniel <br...@en...>
+
+ Quell warnings from gcc 4.7.
+
+ * src/libopenvrml-gl/openvrml/gl/viewer.cpp
+ * src/openvrml-player/curlbrowserhost.cpp
+ * src/script/javascript.cpp
+
2012-04-23 Tom Callaway <tca...@re...>
* src/openvrml-xembed/browserfactory.cpp: gcc 4.7 insists that
Modified: branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp
===================================================================
--- branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2012-04-24 02:40:32 UTC (rev 4255)
+++ branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2012-04-24 03:23:13 UTC (rev 4256)
@@ -1236,20 +1236,19 @@
c0 = c1;
++c1;
- double circ_angle0, circ_angle1 = 0.0;
+ double circ_angle = 0.0;
double sha0 = sin(height_angle0), cha0 = cos(height_angle0);
double sha1 = sin(height_angle1), cha1 = cos(height_angle1);
double sca0, cca0;
- double sca1 = sin(circ_angle1), cca1 = cos(circ_angle1);
+ double sca1 = sin(circ_angle), cca1 = cos(circ_angle);
glBegin(GL_QUADS);
for (size_t nc = 0; nc < nCirc; ++nc) {
- circ_angle0 = circ_angle1;
- circ_angle1 = (nc + 1) * cd;
+ circ_angle = (nc + 1) * cd;
sca0 = sca1;
- sca1 = sin(circ_angle1);
+ sca1 = sin(circ_angle);
cca0 = cca1;
- cca1 = cos(circ_angle1);
+ cca1 = cos(circ_angle);
glColor3fv(&(*c1)[0]);
glVertex3f(GLfloat(sha1 * cca0),
@@ -1281,20 +1280,19 @@
c0 = c1;
++c1;
- double circ_angle0, circ_angle1 = 0.0;
+ double circ_angle = 0.0;
double sha0 = sin(height_angle0), cha0 = cos(height_angle0);
double sha1 = sin(height_angle1), cha1 = cos(height_angle1);
double sca0, cca0;
- double sca1 = sin(circ_angle1), cca1 = cos(circ_angle1);
+ double sca1 = sin(circ_angle), cca1 = cos(circ_angle);
glBegin(GL_QUADS);
for (size_t nc = 0; nc < nCirc; ++nc) {
- circ_angle0 = circ_angle1;
- circ_angle1 = (nc + 1) * cd;
+ circ_angle = (nc + 1) * cd;
sca0 = sca1;
- sca1 = sin(circ_angle1);
+ sca1 = sin(circ_angle);
cca0 = cca1;
- cca1 = cos(circ_angle1);
+ cca1 = cos(circ_angle);
glColor3fv(&(*c1)[0]);
glVertex3f(GLfloat(sha1 * cca1),
Modified: branches/0.18/src/openvrml-player/curlbrowserhost.cpp
===================================================================
--- branches/0.18/src/openvrml-player/curlbrowserhost.cpp 2012-04-24 02:40:32 UTC (rev 4255)
+++ branches/0.18/src/openvrml-player/curlbrowserhost.cpp 2012-04-24 03:23:13 UTC (rev 4256)
@@ -808,14 +808,14 @@
//
if (!stream_data->initialized()) {
const char * type = 0;
- CURLcode result = curl_easy_getinfo(msg->easy_handle,
- CURLINFO_CONTENT_TYPE,
- &type);
+ curl_easy_getinfo(msg->easy_handle,
+ CURLINFO_CONTENT_TYPE,
+ &type);
if (!type) { type = "application/octet-stream"; }
const char * url = 0;
- result = curl_easy_getinfo(msg->easy_handle,
- CURLINFO_EFFECTIVE_URL,
- &url);
+ curl_easy_getinfo(msg->easy_handle,
+ CURLINFO_EFFECTIVE_URL,
+ &url);
dbus_g_proxy_call_no_reply(
browser_host->priv->browser,
"NewStream",
Modified: branches/0.18/src/script/javascript.cpp
===================================================================
--- branches/0.18/src/script/javascript.cpp 2012-04-24 02:40:32 UTC (rev 4255)
+++ branches/0.18/src/script/javascript.cpp 2012-04-24 03:23:13 UTC (rev 4256)
@@ -4058,7 +4058,8 @@
typedef typename SFVec2::field_type sfvec2_t;
typedef typename SFVec2::value_type vec2_t;
- const vec2_t vec2 = { { vec[0], vec[1] } };
+ const vec2_t vec2 = { { static_cast<float>(vec[0]),
+ static_cast<float>(vec[1]) } };
auto_ptr<sfvec2_t> sfvec2(new sfvec2_t(vec2));
auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfvec2.get()));
sfvec2.release();
@@ -4665,7 +4666,9 @@
try {
using std::auto_ptr;
- const vec3_t vec3 = { { vec[0], vec[1], vec[2] } };
+ const vec3_t vec3 = { { static_cast<float>(vec[0]),
+ static_cast<float>(vec[1]),
+ static_cast<float>(vec[2]) } };
auto_ptr<sfvec3_t> sfvec3(new sfvec3_t(vec3));
auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfvec3.get()));
sfvec3.release();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
