simspark-cvs

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/plugin/rubysceneimporter
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv9977

Modified Files:
      Tag: WIN32
	rubysceneimporter.cpp rubysceneimporter.h 
Log Message:
- fix type casts
- make mVersionMajor and mVersionMinor int types

Index: rubysceneimporter.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/rubysceneimporter/rubysceneimporter.h,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** rubysceneimporter.h	10 Feb 2007 19:00:55 -0000	1.2.2.1
--- rubysceneimporter.h	14 Feb 2007 12:34:09 -0000	1.2.2.2
***************
*** 112,119 ****
  
      /** the major version of the scen graph file */
!     float mVersionMajor;
  
      /** the minor version of the scen graph file */
!     float mVersionMinor;
  
      /** the last supplied fileName */
--- 112,119 ----
  
      /** the major version of the scen graph file */
!     int mVersionMajor;
  
      /** the minor version of the scen graph file */
!     int mVersionMinor;
  
      /** the last supplied fileName */

Index: rubysceneimporter.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/rubysceneimporter/rubysceneimporter.cpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** rubysceneimporter.cpp	10 Feb 2007 19:00:55 -0000	1.2.2.1
--- rubysceneimporter.cpp	14 Feb 2007 12:34:08 -0000	1.2.2.2
***************
*** 114,118 ****
  {
      mFileName = S_FROMSTRING;
!     return ParseScene(scene.c_str(),scene.size(),root,parameter);
  }
  
--- 114,118 ----
  {
      mFileName = S_FROMSTRING;
!     return ParseScene(scene.c_str(),static_cast<int>(scene.size()),root,parameter);
  }
  
***************
*** 645,649 ****
              // create a new variable
              env.parameter->AddValue(value);
!             env.parameterMap[varname] = (env.parameterMap.size() - 1);
          } else
          {
--- 645,649 ----
              // create a new variable
              env.parameter->AddValue(value);
!             env.parameterMap[varname] = (static_cast<int>(env.parameterMap.size()) - 1);
          } else
          {
***************
*** 701,705 ****
                  }
  
!             int idx = env.parameterMap.size();
              env.parameterMap[param] = idx;
              sexp = sexp->next;
--- 701,705 ----
                  }
  
!             int idx = static_cast<int>(env.parameterMap.size());
              env.parameterMap[param] = idx;
              sexp = sexp->next;