[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19346] branches/soc-2008-mxcurioni/source /blender/freestyle: Corrected stroke/Operators. cpp to compile without warnings

[Maxime Curioni]

Revision: 19346
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19346
Author:   mxcurioni
Date:     2009-03-21 05:51:51 +0100 (Sat, 21 Mar 2009)

Log Message:
-----------
Corrected stroke/Operators.cpp to compile without warnings
Cleaned up comments

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/Controller.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Operators.cpp

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript	2009-03-21 03:49:22 UTC (rev 19345)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript	2009-03-21 04:51:51 UTC (rev 19346)
@@ -71,31 +71,3 @@
                 priority = [25]
  )
 
-########################################################
-# SWIG
-########################################################
-#	swig
-#
-# 	1] Run the following three commands in the source/blender/freestyle/intern/swig directory.
-#
-#	2] Replace /Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/lib to the path
-#	of your library directory (used to locate libbf_freestyle.a)
-#
-#   3] Replace the python directories to suit your config
-
-# export SWIG_LIB=/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/extern/freestyle/swig/Lib
-
-# cd /Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/intern/swig
-
-# /Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/bin/swig -c++ -python -o ModuleWrapper.cpp Freestyle.i
-
-# mv ./Freestyle.py ../../python/
-
-# g++ -w  -I../geometry -I../image -I../scene_graph -I../stroke -I../system -I../view_map -I../winged_edge -I/usr/include/python2.5 -I../../../blenlib -I../../../blenkernel -I../../../imbuf -I../../../makesdna -c ModuleWrapper.cpp -o ModuleWrapper.o
-
-###########  Mac OS X ###########
-# g++ -bundle -flat_namespace -undefined suppress  -w  -L/usr/lib/python2.5/config -L/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/lib -lpython2.5 -lbf_freestyle -o ../../python/_Freestyle.so ModuleWrapper.o
-
-###########  Linux  ###########
-# g++ -shared -w  -L/usr/lib/python2.5/config -L/home/joe/bf_blender_freestyle/build/linux2/lib  -lpython2.5 -lbf_freestyle -o ../../python/_Freestyle.so ModuleWrapper.o
-

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/Controller.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/Controller.cpp	2009-03-21 03:49:22 UTC (rev 19345)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/Controller.cpp	2009-03-21 04:51:51 UTC (rev 19346)
@@ -649,14 +649,6 @@
 
 void Controller::InsertStyleModule(unsigned index, const char *iFileName)
 {
-  // QFileInfo fi(iFileName);
-  // string ext = fi.suffix();
-  // if (ext != "py") {
-  //   cerr << "Error: Cannot load \"" << fi.fileName().toAscii().data()
-  // 	 << "\", unknown extension" << endl;
-  //   return;
-  // }
-
 	if( !BLI_testextensie(iFileName, ".py") ) {
 		cerr << "Error: Cannot load \"" << StringUtils::toAscii( string(iFileName) )
 		  << "\", unknown extension" << endl;

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Operators.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Operators.cpp	2009-03-21 03:49:22 UTC (rev 19345)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Operators.cpp	2009-03-21 04:51:51 UTC (rev 19346)
@@ -20,6 +20,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <algorithm>
+#include <stdexcept>
 #include "Operators.h"
 #include "Canvas.h"
 #include "Stroke.h"
@@ -978,7 +979,7 @@
 
 
 int Operators::create(UnaryPredicate1D& pred, vector<StrokeShader*> shaders) {
-  Canvas* canvas = Canvas::getInstance();
+  //Canvas* canvas = Canvas::getInstance();
   if (!_current_set) {
     cerr << "Warning: current set empty" << endl;
     return 0;