SF.net SVN: openvrml:[4255] trunk

[<br...@us...>]

Revision: 4255
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4255&view=rev
Author:   braden
Date:     2012-04-24 02:40:32 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
Quell warnings from gcc 4.7.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp
    trunk/src/openvrml-player/curlbrowserhost.cpp
    trunk/src/script/javascript.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-04-24 02:03:29 UTC (rev 4254)
+++ trunk/ChangeLog	2012-04-24 02:40:32 UTC (rev 4255)
@@ -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: trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp
===================================================================
--- trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp	2012-04-24 02:03:29 UTC (rev 4254)
+++ trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp	2012-04-24 02:40:32 UTC (rev 4255)
@@ -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: trunk/src/openvrml-player/curlbrowserhost.cpp
===================================================================
--- trunk/src/openvrml-player/curlbrowserhost.cpp	2012-04-24 02:03:29 UTC (rev 4254)
+++ trunk/src/openvrml-player/curlbrowserhost.cpp	2012-04-24 02:40:32 UTC (rev 4255)
@@ -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: trunk/src/script/javascript.cpp
===================================================================
--- trunk/src/script/javascript.cpp	2012-04-24 02:03:29 UTC (rev 4254)
+++ trunk/src/script/javascript.cpp	2012-04-24 02:40:32 UTC (rev 4255)
@@ -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.