[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Toon-members] tag src/absorient.cpp src/quartic.cpp build/vc2...
|
From: |
Gerhard Reitmayr |
|
Subject: |
[Toon-members] tag src/absorient.cpp src/quartic.cpp build/vc2... |
|
Date: |
Thu, 29 May 2008 16:36:23 +0000 |
CVSROOT: /cvsroot/toon
Module name: tag
Changes by: Gerhard Reitmayr <gerhard> 08/05/29 16:36:23
Modified files:
src : absorient.cpp quartic.cpp
Added files:
build/vc2005 : tag.vcproj vc2005.sln
Log message:
build files and some fixes for Visual Studio 2005
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/tag/src/absorient.cpp?cvsroot=toon&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/tag/src/quartic.cpp?cvsroot=toon&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/tag/build/vc2005/tag.vcproj?cvsroot=toon&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/tag/build/vc2005/vc2005.sln?cvsroot=toon&rev=1.1
Patches:
Index: src/absorient.cpp
===================================================================
RCS file: /cvsroot/toon/tag/src/absorient.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/absorient.cpp 29 May 2006 13:54:03 -0000 1.1
+++ src/absorient.cpp 29 May 2008 16:36:23 -0000 1.2
@@ -22,7 +22,7 @@
}
TooN::SO3 computeOrientation( const std::vector<TooN::Vector<3> > & a, const
std::vector<TooN::Vector<3> > & b ){
- const unsigned int N = a.size();
+ const size_t N = a.size();
// compute cross correlations
const int x = 0, y = 1, z = 2;
TooN::Matrix<3> s;
@@ -59,7 +59,7 @@
TooN::SE3 computeAbsoluteOrientation( const std::vector<TooN::Vector<3> > & a,
const std::vector<TooN::Vector<3> > & b){
//std::assert(a.size() == b.size());
- const unsigned int N = a.size();
+ const size_t N = a.size();
TooN::Vector<3> ma, mb;
TooN::Zero(ma);
@@ -110,7 +110,7 @@
#endif
TooN::SO3 computeMeanOrientation( const std::vector<TooN::SO3> & r){
- const unsigned int N = r.size();
+ const size_t N = r.size();
std::vector<TooN::SO3> rt(N);
TooN::SO3 base = r.front();
TooN::SO3 baseInv = base.inverse();
Index: src/quartic.cpp
===================================================================
RCS file: /cvsroot/toon/tag/src/quartic.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/quartic.cpp 1 Apr 2008 02:40:52 -0000 1.2
+++ src/quartic.cpp 29 May 2008 16:36:23 -0000 1.3
@@ -5,6 +5,15 @@
#include <algorithm>
using namespace std;
+#ifdef WIN32
+
+// Visual Studio 2005 does not yet define the C99 cbrt function
+inline double cbrt( double x ){
+ return pow(fabs(x), 1.0/3.0) * (x>=0 ? 1 : -1);
+}
+
+#endif
+
int depressed_cubic_real_roots(double P, double Q, double r[])
{
static const double third = 1.0/3.0;
Index: build/vc2005/tag.vcproj
===================================================================
RCS file: build/vc2005/tag.vcproj
diff -N build/vc2005/tag.vcproj
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ build/vc2005/tag.vcproj 29 May 2008 16:36:23 -0000 1.1
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="tag"
+ ProjectGUID="{1637B117-A476-4861-8998-83C6C3B42086}"
+ RootNamespace="tag"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..;..\..\.."
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\$(ProjectName)d.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ InlineFunctionExpansion="2"
+ FavorSizeOrSpeed="1"
+ AdditionalIncludeDirectories="..\..;..\..\.."
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\$(ProjectName).lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\src\absorient.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\fourpointpose.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\quartic.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\threepointpose.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath="..\..\tag\absorient.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tag\array.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tag\constantposition.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tag\constantvelocity.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tag\fn.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tag\fourpointpose.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tag\helpers.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tag\intersection.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tag\kalmanfilter.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tag\measurements.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tag\printf.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tag\quartic.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tag\ransac.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tag\ransac_estimators.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tag\stdpp.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tag\threepointpose.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tag\tuple.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tag\unscented.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ <File
+ RelativePath=".\ReadMe.txt"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Index: build/vc2005/vc2005.sln
===================================================================
RCS file: build/vc2005/vc2005.sln
diff -N build/vc2005/vc2005.sln
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ build/vc2005/vc2005.sln 29 May 2008 16:36:23 -0000 1.1
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tag", "tag.vcproj",
"{1637B117-A476-4861-8998-83C6C3B42086}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {1637B117-A476-4861-8998-83C6C3B42086}.Debug|Win32.ActiveCfg =
Debug|Win32
+ {1637B117-A476-4861-8998-83C6C3B42086}.Debug|Win32.Build.0 =
Debug|Win32
+ {1637B117-A476-4861-8998-83C6C3B42086}.Release|Win32.ActiveCfg
= Release|Win32
+ {1637B117-A476-4861-8998-83C6C3B42086}.Release|Win32.Build.0 =
Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Toon-members] tag src/absorient.cpp src/quartic.cpp build/vc2...,
Gerhard Reitmayr <=