suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fix VS2010 build errors

Browse Source 
git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5328 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
This commit is contained in:
wmayer 2011-12-20 10:25:52 +00:00
parent dd88426df6
commit 4cb8920c15
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mod/Draft/Makefile.am
View File

@ -74,8 +74,10 @@ EXTRA_DIST = \
Resources/icons/Draft_Arc.svg \
Resources/icons/Draft_BSpline.svg \
Resources/icons/Draft_Circle.svg \
Resources/icons/Draft_Cursor.svg \
Resources/icons/Draft_DelPoint.svg \
Resources/icons/Draft_Dimension.svg \
Resources/icons/Draft_Dot.svg \
Resources/icons/Draft_Downgrade.svg \
Resources/icons/Draft_Drawing.svg \
Resources/icons/Draft_Edit.svg \
@ -85,6 +87,7 @@ EXTRA_DIST = \
Resources/icons/Draft_Macro.svg \
Resources/icons/Draft_Move.svg \
Resources/icons/Draft_Offset.svg \
Resources/icons/Draft_Point.svg \
Resources/icons/Draft_Polygon.svg \
Resources/icons/Draft_Rectangle.svg \
Resources/icons/Draft_Rotate.svg \

16
src/Mod/Drawing/Gui/TaskOrthoViews.cpp
View File

@ -406,9 +406,9 @@ void TaskOrthoViews::pagesize(std::string& page_template)
}
// open Template file
string line;
string temp_line;
ifstream file (fi.filePath().c_str());
std::string line;
std::string temp_line;
std::ifstream file (fi.filePath().c_str());
size_t found;
bool done = false;
@ -418,12 +418,12 @@ void TaskOrthoViews::pagesize(std::string& page_template)
{
getline (file,line);
found = line.find("width=");
if (found != string::npos)
if (found != std::string::npos)
{
temp_line = line.substr(7+found);
found = temp_line.find("\"");
temp_line = temp_line.substr(0,found);
stringstream num_str(temp_line);
std::stringstream num_str(temp_line);
num_str >> pagewidth;
pagewidth -= 2*margin;
if (done)
@ -436,12 +436,12 @@ void TaskOrthoViews::pagesize(std::string& page_template)
}
found = line.find("height=");
if (found != string::npos)
if (found != std::string::npos)
{
temp_line = line.substr(8+found);
found = temp_line.find("\"");
temp_line = temp_line.substr(0,found);
stringstream num_str_2(temp_line);
std::stringstream num_str_2(temp_line);
num_str_2 >> pageh1;
pageh1 -= 2*margin;
pageh2 = pageh1;
@ -454,7 +454,7 @@ void TaskOrthoViews::pagesize(std::string& page_template)
done = true;
}
if (line.find("metadata") != string::npos) //give up if we meet a metadata tag
if (line.find("metadata") != std::string::npos) //give up if we meet a metadata tag
break;
}
}

1
src/Mod/Part/App/modelRefine.cpp
View File

@ -23,6 +23,7 @@
#include "PreCompiled.h"
#include <algorithm>
#include <iterator>
#include <Geom_Surface.hxx>
#include <GeomAdaptor_Surface.hxx>
#include <Geom_Plane.hxx>