From dfff9c1ee66841f959dfcca5ad51d7114f96a41c Mon Sep 17 00:00:00 2001 From: fengbing Date: Thu, 16 Apr 2015 21:31:16 +0800 Subject: [PATCH] vs 2013 compile success --- lib/5point/5point.vcxproj | 90 ++ lib/5point/5point.vcxproj.filters | 42 + lib/ann_1.1_char/ann_1.1_char.vcxproj | 106 ++ lib/ann_1.1_char/ann_1.1_char.vcxproj.filters | 96 ++ lib/cblas/cblas.vcxproj | 87 ++ lib/cblas/cblas.vcxproj.filters | 39 + lib/clapack/clapack.vcxproj | 506 +++++++ lib/clapack/clapack.vcxproj.filters | 1251 +++++++++++++++++ lib/cminpack/cminpack.vcxproj | 105 ++ lib/cminpack/cminpack.vcxproj.filters | 89 ++ lib/f2c/f2c.vcxproj | 238 ++++ lib/f2c/f2c.vcxproj.filters | 494 +++++++ lib/f2c/signal1.h0 | 35 - lib/f2c/sysdep1.h0 | 66 - lib/getopt/getopt.vcxproj | 84 ++ lib/getopt/getopt.vcxproj.filters | 30 + lib/imagelib/filter.c | 2 +- lib/imagelib/imagelib.vcxproj | 142 ++ lib/imagelib/imagelib.vcxproj.filters | 198 +++ lib/jpeg/jpeg.vcxproj | 140 ++ lib/jpeg/jpeg.vcxproj.filters | 162 +++ lib/matrix/matrix.c | 33 + lib/matrix/matrix.h | 38 +- lib/matrix/matrix.vcxproj | 92 ++ lib/matrix/matrix.vcxproj.filters | 45 + lib/sba-1.5/sba-1.5.vcxproj | 92 ++ lib/sba-1.5/sba-1.5.vcxproj.filters | 48 + lib/sfm-driver/sfm-driver.vcxproj | 86 ++ lib/sfm-driver/sfm-driver.vcxproj.filters | 30 + src/Bundle2PMVS.cpp | 6 +- src/BundleAdd.cpp | 2 +- src/KeyMatchFull.cpp | 1 + src/RadialUndistort.cpp | 8 +- src/TwoFrameModel.cpp | 2 +- vc++/Backup/Bundler.sln | 145 ++ vc++/Bundle2PMVS.vcxproj | 135 ++ vc++/Bundle2PMVS.vcxproj.filters | 30 + vc++/Bundler.sln | 103 +- vc++/Bundler.v12.suo | Bin 0 -> 28672 bytes vc++/Bundler.vcxproj | 196 +++ vc++/Bundler.vcxproj.filters | 159 +++ vc++/KeyMatchFull.vcxproj | 106 ++ vc++/KeyMatchFull.vcxproj.filters | 25 + vc++/RadialUndistort.vcxproj | 126 ++ vc++/RadialUndistort.vcxproj.filters | 21 + 45 files changed, 5325 insertions(+), 206 deletions(-) create mode 100644 lib/5point/5point.vcxproj create mode 100644 lib/5point/5point.vcxproj.filters create mode 100644 lib/ann_1.1_char/ann_1.1_char.vcxproj create mode 100644 lib/ann_1.1_char/ann_1.1_char.vcxproj.filters create mode 100644 lib/cblas/cblas.vcxproj create mode 100644 lib/cblas/cblas.vcxproj.filters create mode 100644 lib/clapack/clapack.vcxproj create mode 100644 lib/clapack/clapack.vcxproj.filters create mode 100644 lib/cminpack/cminpack.vcxproj create mode 100644 lib/cminpack/cminpack.vcxproj.filters create mode 100644 lib/f2c/f2c.vcxproj create mode 100644 lib/f2c/f2c.vcxproj.filters delete mode 100644 lib/f2c/signal1.h0 delete mode 100644 lib/f2c/sysdep1.h0 create mode 100644 lib/getopt/getopt.vcxproj create mode 100644 lib/getopt/getopt.vcxproj.filters create mode 100644 lib/imagelib/imagelib.vcxproj create mode 100644 lib/imagelib/imagelib.vcxproj.filters create mode 100644 lib/jpeg/jpeg.vcxproj create mode 100644 lib/jpeg/jpeg.vcxproj.filters create mode 100644 lib/matrix/matrix.vcxproj create mode 100644 lib/matrix/matrix.vcxproj.filters create mode 100644 lib/sba-1.5/sba-1.5.vcxproj create mode 100644 lib/sba-1.5/sba-1.5.vcxproj.filters create mode 100644 lib/sfm-driver/sfm-driver.vcxproj create mode 100644 lib/sfm-driver/sfm-driver.vcxproj.filters create mode 100644 vc++/Backup/Bundler.sln create mode 100644 vc++/Bundle2PMVS.vcxproj create mode 100644 vc++/Bundle2PMVS.vcxproj.filters create mode 100644 vc++/Bundler.v12.suo create mode 100644 vc++/Bundler.vcxproj create mode 100644 vc++/Bundler.vcxproj.filters create mode 100644 vc++/KeyMatchFull.vcxproj create mode 100644 vc++/KeyMatchFull.vcxproj.filters create mode 100644 vc++/RadialUndistort.vcxproj create mode 100644 vc++/RadialUndistort.vcxproj.filters diff --git a/lib/5point/5point.vcxproj b/lib/5point/5point.vcxproj new file mode 100644 index 0000000..6d487da --- /dev/null +++ b/lib/5point/5point.vcxproj @@ -0,0 +1,90 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {ECDBE0BF-6E8D-4A37-B7F9-E415FEDFE367} + My5point + Win32Proj + + + + StaticLibrary + v120 + Unicode + true + + + StaticLibrary + v120 + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + ..\..\include; ..\imagelib; ..\matrix;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + + + ..\..\include; ..\imagelib; ..\matrix;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/5point/5point.vcxproj.filters b/lib/5point/5point.vcxproj.filters new file mode 100644 index 0000000..0c3bf89 --- /dev/null +++ b/lib/5point/5point.vcxproj.filters @@ -0,0 +1,42 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + + + + \ No newline at end of file diff --git a/lib/ann_1.1_char/ann_1.1_char.vcxproj b/lib/ann_1.1_char/ann_1.1_char.vcxproj new file mode 100644 index 0000000..33657da --- /dev/null +++ b/lib/ann_1.1_char/ann_1.1_char.vcxproj @@ -0,0 +1,106 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {80759706-388F-475A-B149-E96A0516AAE1} + ann_11_char + Win32Proj + + + + DynamicLibrary + v120 + Unicode + true + + + DynamicLibrary + v120 + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_WINDOWS;_USRDLL;DLL_EXPORTS;ANN_PERF;ANN_NO_RANDOM;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + + + include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_WINDOWS;_USRDLL;DLL_EXPORTS;ANN_PERF;ANN_NO_RANDOM;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/ann_1.1_char/ann_1.1_char.vcxproj.filters b/lib/ann_1.1_char/ann_1.1_char.vcxproj.filters new file mode 100644 index 0000000..62fc65e --- /dev/null +++ b/lib/ann_1.1_char/ann_1.1_char.vcxproj.filters @@ -0,0 +1,96 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/lib/cblas/cblas.vcxproj b/lib/cblas/cblas.vcxproj new file mode 100644 index 0000000..17f3b74 --- /dev/null +++ b/lib/cblas/cblas.vcxproj @@ -0,0 +1,87 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {EAD96717-53E5-4D12-9F04-596F54EEB22A} + cblas + Win32Proj + + + + StaticLibrary + v120 + Unicode + true + + + StaticLibrary + v120 + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + WIN32;_DEBUG;_LIB;NO_BLAS_WRAP;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + + + WIN32;NDEBUG;_LIB;NO_BLAS_WRAP;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/cblas/cblas.vcxproj.filters b/lib/cblas/cblas.vcxproj.filters new file mode 100644 index 0000000..cd91d19 --- /dev/null +++ b/lib/cblas/cblas.vcxproj.filters @@ -0,0 +1,39 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + + + + \ No newline at end of file diff --git a/lib/clapack/clapack.vcxproj b/lib/clapack/clapack.vcxproj new file mode 100644 index 0000000..b414fe6 --- /dev/null +++ b/lib/clapack/clapack.vcxproj @@ -0,0 +1,506 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE} + clapack + Win32Proj + + + + StaticLibrary + v120 + Unicode + true + + + StaticLibrary + v120 + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + ..\f2c;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;NO_BLAS_WRAP;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + + + ..\f2c;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;NO_BLAS_WRAP;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/clapack/clapack.vcxproj.filters b/lib/clapack/clapack.vcxproj.filters new file mode 100644 index 0000000..0d73868 --- /dev/null +++ b/lib/clapack/clapack.vcxproj.filters @@ -0,0 +1,1251 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/lib/cminpack/cminpack.vcxproj b/lib/cminpack/cminpack.vcxproj new file mode 100644 index 0000000..e87df08 --- /dev/null +++ b/lib/cminpack/cminpack.vcxproj @@ -0,0 +1,105 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {B327F8A7-2D8F-4E5B-88F8-C719BB99A155} + cminpack + Win32Proj + + + + StaticLibrary + v120 + Unicode + true + + + StaticLibrary + v120 + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + ..\f2c;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + + + ..\f2c;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/cminpack/cminpack.vcxproj.filters b/lib/cminpack/cminpack.vcxproj.filters new file mode 100644 index 0000000..706cc14 --- /dev/null +++ b/lib/cminpack/cminpack.vcxproj.filters @@ -0,0 +1,89 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/lib/f2c/f2c.vcxproj b/lib/f2c/f2c.vcxproj new file mode 100644 index 0000000..c696e42 --- /dev/null +++ b/lib/f2c/f2c.vcxproj @@ -0,0 +1,238 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {1C54AC20-DA61-4E7F-96D0-1438EB3D4C10} + f2c + Win32Proj + + + + StaticLibrary + v120 + Unicode + true + + + StaticLibrary + v120 + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + + + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/f2c/f2c.vcxproj.filters b/lib/f2c/f2c.vcxproj.filters new file mode 100644 index 0000000..f1c6528 --- /dev/null +++ b/lib/f2c/f2c.vcxproj.filters @@ -0,0 +1,494 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/lib/f2c/signal1.h0 b/lib/f2c/signal1.h0 deleted file mode 100644 index a383774..0000000 --- a/lib/f2c/signal1.h0 +++ /dev/null @@ -1,35 +0,0 @@ -/* You may need to adjust the definition of signal1 to supply a */ -/* cast to the correct argument type. This detail is system- and */ -/* compiler-dependent. The #define below assumes signal.h declares */ -/* type SIG_PF for the signal function's second argument. */ - -/* For some C++ compilers, "#define Sigarg_t ..." may be appropriate. */ - -#include - -#ifndef Sigret_t -#define Sigret_t void -#endif -#ifndef Sigarg_t -#ifdef KR_headers -#define Sigarg_t -#else -#define Sigarg_t int -#endif -#endif /*Sigarg_t*/ - -#ifdef USE_SIG_PF /* compile with -DUSE_SIG_PF under IRIX */ -#define sig_pf SIG_PF -#else -typedef Sigret_t (*sig_pf)(Sigarg_t); -#endif - -#define signal1(a,b) signal(a,(sig_pf)b) - -#ifdef __cplusplus -#define Sigarg ... -#define Use_Sigarg -#else -#define Sigarg Int n -#define Use_Sigarg n = n /* shut up compiler warning */ -#endif diff --git a/lib/f2c/sysdep1.h0 b/lib/f2c/sysdep1.h0 deleted file mode 100644 index 4c026a2..0000000 --- a/lib/f2c/sysdep1.h0 +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef SYSDEP_H_INCLUDED -#define SYSDEP_H_INCLUDED -#undef USE_LARGEFILE -#ifndef NO_LONG_LONG - -#ifdef __sun__ -#define USE_LARGEFILE -#define OFF_T off64_t -#endif - -#ifdef __linux__ -#define USE_LARGEFILE -#define OFF_T __off64_t -#endif - -#ifdef _AIX43 -#define _LARGE_FILES -#define _LARGE_FILE_API -#define USE_LARGEFILE -#endif /*_AIX43*/ - -#ifdef __hpux -#define _FILE64 -#define _LARGEFILE64_SOURCE -#define USE_LARGEFILE -#endif /*__hpux*/ - -#ifdef __sgi -#define USE_LARGEFILE -#endif /*__sgi*/ - -#ifdef __FreeBSD__ -#define OFF_T off_t -#define FSEEK fseeko -#define FTELL ftello -#endif - -#ifdef USE_LARGEFILE -#ifndef OFF_T -#define OFF_T off64_t -#endif -#define _LARGEFILE_SOURCE -#define _LARGEFILE64_SOURCE -#include -#include -#define FOPEN fopen64 -#define FREOPEN freopen64 -#define FSEEK fseeko64 -#define FSTAT fstat64 -#define FTELL ftello64 -#define FTRUNCATE ftruncate64 -#define STAT stat64 -#define STAT_ST stat64 -#endif /*USE_LARGEFILE*/ -#endif /*NO_LONG_LONG*/ - -#ifndef NON_UNIX_STDIO -#ifndef USE_LARGEFILE -#define _INCLUDE_POSIX_SOURCE /* for HP-UX */ -#define _INCLUDE_XOPEN_SOURCE /* for HP-UX */ -#include "sys/types.h" -#include "sys/stat.h" -#endif -#endif - -#endif /*SYSDEP_H_INCLUDED*/ diff --git a/lib/getopt/getopt.vcxproj b/lib/getopt/getopt.vcxproj new file mode 100644 index 0000000..8426ec1 --- /dev/null +++ b/lib/getopt/getopt.vcxproj @@ -0,0 +1,84 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {726E00FB-025B-42D4-83B4-1BD5F15DD1F4} + getopt + Win32Proj + + + + StaticLibrary + v120 + Unicode + true + + + StaticLibrary + v120 + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + + + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/getopt/getopt.vcxproj.filters b/lib/getopt/getopt.vcxproj.filters new file mode 100644 index 0000000..a4fee7f --- /dev/null +++ b/lib/getopt/getopt.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + + + Header Files + + + + + + \ No newline at end of file diff --git a/lib/imagelib/filter.c b/lib/imagelib/filter.c index eee6a00..adf2439 100644 --- a/lib/imagelib/filter.c +++ b/lib/imagelib/filter.c @@ -149,7 +149,7 @@ double img_laplacian(img_t *img, int x, int y) { } #ifdef WIN32 -static double erf (double x) { +double erf (double x) { int sign; double t; diff --git a/lib/imagelib/imagelib.vcxproj b/lib/imagelib/imagelib.vcxproj new file mode 100644 index 0000000..f7fd7a6 --- /dev/null +++ b/lib/imagelib/imagelib.vcxproj @@ -0,0 +1,142 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {9FFEA15D-094D-43C9-94DB-551EA49B1FCA} + imagelib + Win32Proj + + + + StaticLibrary + v120 + Unicode + true + + + StaticLibrary + v120 + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + ..\..\include; ..\matrix;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + + + ..\..\include; ..\matrix;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/imagelib/imagelib.vcxproj.filters b/lib/imagelib/imagelib.vcxproj.filters new file mode 100644 index 0000000..c9fdcef --- /dev/null +++ b/lib/imagelib/imagelib.vcxproj.filters @@ -0,0 +1,198 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + + \ No newline at end of file diff --git a/lib/jpeg/jpeg.vcxproj b/lib/jpeg/jpeg.vcxproj new file mode 100644 index 0000000..0795b5b --- /dev/null +++ b/lib/jpeg/jpeg.vcxproj @@ -0,0 +1,140 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {64AC4653-466C-4AA1-A9E0-61B3877944CD} + jpeg + Win32Proj + + + + DynamicLibrary + v120 + Unicode + true + + + DynamicLibrary + v120 + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;JPEG_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + true + Windows + MachineX86 + + + + + WIN32;NDEBUG;_WINDOWS;_USRDLL;JPEG_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/jpeg/jpeg.vcxproj.filters b/lib/jpeg/jpeg.vcxproj.filters new file mode 100644 index 0000000..aed7391 --- /dev/null +++ b/lib/jpeg/jpeg.vcxproj.filters @@ -0,0 +1,162 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/lib/matrix/matrix.c b/lib/matrix/matrix.c index 0d2f894..1bbc8cf 100644 --- a/lib/matrix/matrix.c +++ b/lib/matrix/matrix.c @@ -76,6 +76,39 @@ void matrix_transpose(int m, int n, double *A, double *AT) { AT[j * m + i] = A[i * n + j]; } + + void matrix_product33(double *A, double *B, double *R) +{ + R[0] = A[0] * B[0] + A[1] * B[3] + A[2] * B[6]; + R[1] = A[0] * B[1] + A[1] * B[4] + A[2] * B[7]; + R[2] = A[0] * B[2] + A[1] * B[5] + A[2] * B[8]; + + R[3] = A[3] * B[0] + A[4] * B[3] + A[5] * B[6]; + R[4] = A[3] * B[1] + A[4] * B[4] + A[5] * B[7]; + R[5] = A[3] * B[2] + A[4] * B[5] + A[5] * B[8]; + + R[6] = A[6] * B[0] + A[7] * B[3] + A[8] * B[6]; + R[7] = A[6] * B[1] + A[7] * B[4] + A[8] * B[7]; + R[8] = A[6] * B[2] + A[7] * B[5] + A[8] * B[8]; +} + + static void matrix_product121(double *A, double *b, double *r) +{ + r[0] = A[0] * b[0] + A[1] * b[1]; +} + + static void matrix_product131(double *A, double *b, double *r) +{ + r[0] = A[0] * b[0] + A[1] * b[1] + A[2] * b[2]; +} + + void matrix_product331(double *A, double *b, double *r) +{ + r[0] = A[0] * b[0] + A[1] * b[1] + A[2] * b[2]; + r[1] = A[3] * b[0] + A[4] * b[1] + A[5] * b[2]; + r[2] = A[6] * b[0] + A[7] * b[1] + A[8] * b[2]; +} + #if !defined(WIN32) && !defined(__NO_MKL__) void matrix_product_ipp(int Am, int An, int Bn, const double *A, const double *B, double *R) diff --git a/lib/matrix/matrix.h b/lib/matrix/matrix.h index 3b13c3b..39045a6 100644 --- a/lib/matrix/matrix.h +++ b/lib/matrix/matrix.h @@ -54,37 +54,17 @@ void matrix_transpose_product2_ipp(int Am, int An, int Bm, void matrix_array_product_ipp(int count, int Am, int An, int Bn, const double *A, const double *B, double *R); -static inline void matrix_product33(double *A, double *B, double *R) -{ - R[0] = A[0] * B[0] + A[1] * B[3] + A[2] * B[6]; - R[1] = A[0] * B[1] + A[1] * B[4] + A[2] * B[7]; - R[2] = A[0] * B[2] + A[1] * B[5] + A[2] * B[8]; - - R[3] = A[3] * B[0] + A[4] * B[3] + A[5] * B[6]; - R[4] = A[3] * B[1] + A[4] * B[4] + A[5] * B[7]; - R[5] = A[3] * B[2] + A[4] * B[5] + A[5] * B[8]; - - R[6] = A[6] * B[0] + A[7] * B[3] + A[8] * B[6]; - R[7] = A[6] * B[1] + A[7] * B[4] + A[8] * B[7]; - R[8] = A[6] * B[2] + A[7] * B[5] + A[8] * B[8]; -} - -static inline void matrix_product121(double *A, double *b, double *r) -{ - r[0] = A[0] * b[0] + A[1] * b[1]; -} + void matrix_product33(double *A, double *B, double *R); + + +static void matrix_product121(double *A, double *b, double *r); + -static inline void matrix_product131(double *A, double *b, double *r) -{ - r[0] = A[0] * b[0] + A[1] * b[1] + A[2] * b[2]; -} +static void matrix_product131(double *A, double *b, double *r); + -static inline void matrix_product331(double *A, double *b, double *r) -{ - r[0] = A[0] * b[0] + A[1] * b[1] + A[2] * b[2]; - r[1] = A[3] * b[0] + A[4] * b[1] + A[5] * b[2]; - r[2] = A[6] * b[0] + A[7] * b[1] + A[8] * b[2]; -} +void matrix_product331(double *A, double *b, double *r); + void matrix_product341(double *A, double *b, double *r); void matrix_product44(double *A, double *B, double *R); diff --git a/lib/matrix/matrix.vcxproj b/lib/matrix/matrix.vcxproj new file mode 100644 index 0000000..7fdae99 --- /dev/null +++ b/lib/matrix/matrix.vcxproj @@ -0,0 +1,92 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {036DFA58-A699-4EDC-8560-DA257B16DF9B} + matrix + Win32Proj + + + + StaticLibrary + v120 + Unicode + true + + + StaticLibrary + v120 + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + ..\imagelib; ..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + CompileAsC + + + + + ..\imagelib; ..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/matrix/matrix.vcxproj.filters b/lib/matrix/matrix.vcxproj.filters new file mode 100644 index 0000000..ecf4823 --- /dev/null +++ b/lib/matrix/matrix.vcxproj.filters @@ -0,0 +1,45 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + + \ No newline at end of file diff --git a/lib/sba-1.5/sba-1.5.vcxproj b/lib/sba-1.5/sba-1.5.vcxproj new file mode 100644 index 0000000..e97b640 --- /dev/null +++ b/lib/sba-1.5/sba-1.5.vcxproj @@ -0,0 +1,92 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {731F2109-1E74-4509-AC90-683C092614AF} + sba15 + Win32Proj + + + + StaticLibrary + v120 + Unicode + true + + + StaticLibrary + v120 + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + ..\matrix;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + + + ..\matrix;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/sba-1.5/sba-1.5.vcxproj.filters b/lib/sba-1.5/sba-1.5.vcxproj.filters new file mode 100644 index 0000000..5c38f93 --- /dev/null +++ b/lib/sba-1.5/sba-1.5.vcxproj.filters @@ -0,0 +1,48 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + + + + \ No newline at end of file diff --git a/lib/sfm-driver/sfm-driver.vcxproj b/lib/sfm-driver/sfm-driver.vcxproj new file mode 100644 index 0000000..ce27270 --- /dev/null +++ b/lib/sfm-driver/sfm-driver.vcxproj @@ -0,0 +1,86 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {19073530-AA3E-411E-B869-3C68BED3D9AE} + sfmdriver + Win32Proj + + + + StaticLibrary + v120 + Unicode + true + + + StaticLibrary + v120 + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + ..\..\include; ..\sba-1.5; ..\matrix;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + + + ..\..\include; ..\sba-1.5; ..\matrix;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/sfm-driver/sfm-driver.vcxproj.filters b/lib/sfm-driver/sfm-driver.vcxproj.filters new file mode 100644 index 0000000..20e2796 --- /dev/null +++ b/lib/sfm-driver/sfm-driver.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + + + Header Files + + + + + + \ No newline at end of file diff --git a/src/Bundle2PMVS.cpp b/src/Bundle2PMVS.cpp index c8813ea..f0b89d9 100644 --- a/src/Bundle2PMVS.cpp +++ b/src/Bundle2PMVS.cpp @@ -6,7 +6,7 @@ #include #include #include - +#include /* For mkdir */ #include #include @@ -149,8 +149,8 @@ void WritePMVS(const char *output_path, int num_cameras = (int) cameras.size(); /* Make sure output_path exists */ - mkdir(output_path, 0770); - + //mkdir(output_path, 0770); + _mkdir(output_path); char buf[2048]; sprintf(buf, "%s/prep_pmvs.sh", output_path); diff --git a/src/BundleAdd.cpp b/src/BundleAdd.cpp index 5f4b58a..1e37911 100644 --- a/src/BundleAdd.cpp +++ b/src/BundleAdd.cpp @@ -348,7 +348,7 @@ BundlerApp::BundleAdjustAddAllNewPoints(int num_points, int num_cameras, error, true); } - if (std::isnan(error) || error > max_reprojection_error) { + if (isnan(error) || error > max_reprojection_error) { num_high_reprojection++; #if 0 printf(">> Reprojection error [%0.3f] is too large\n", error); diff --git a/src/KeyMatchFull.cpp b/src/KeyMatchFull.cpp index 6ccd8c8..7b7b8ec 100644 --- a/src/KeyMatchFull.cpp +++ b/src/KeyMatchFull.cpp @@ -22,6 +22,7 @@ #include #include "keys2a.h" +#include int ReadFileList(char* list_in, std::vector& key_files) { FILE* fp; diff --git a/src/RadialUndistort.cpp b/src/RadialUndistort.cpp index 1bbdda4..e2c2c50 100644 --- a/src/RadialUndistort.cpp +++ b/src/RadialUndistort.cpp @@ -198,8 +198,12 @@ void ReadListFile(char *list_file, std::vector &files) if (buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = 0; - char *space = index(buf, ' '); - if (space) *space = 0; + /*char *space = index(buf, ' '); + if (space) *space = 0;*/ + std::string str(buf); + int space_pos = str.find(' '); + str.at(space_pos) = 0; + files.push_back(str); files.push_back(std::string(buf)); } diff --git a/src/TwoFrameModel.cpp b/src/TwoFrameModel.cpp index f4b7f2c..765d2a5 100644 --- a/src/TwoFrameModel.cpp +++ b/src/TwoFrameModel.cpp @@ -399,7 +399,7 @@ ModelMap ReadModels(FILE *f, int *num_images_out) continue; } - if (std::isnan(m.m_angle) || std::isnan(m.m_error)) { + if (isnan(m.m_angle) || isnan(m.m_error)) { printf("[ReadModels] Error! NaNs in pair %d,%d!\n", i1, i2); continue; } diff --git a/vc++/Backup/Bundler.sln b/vc++/Backup/Bundler.sln new file mode 100644 index 0000000..ef0ee9c --- /dev/null +++ b/vc++/Backup/Bundler.sln @@ -0,0 +1,145 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bundler", "Bundler.vcproj", "{1F292560-62CF-4A80-A157-A2EE06A4F461}" + ProjectSection(ProjectDependencies) = postProject + {64AC4653-466C-4AA1-A9E0-61B3877944CD} = {64AC4653-466C-4AA1-A9E0-61B3877944CD} + {731F2109-1E74-4509-AC90-683C092614AF} = {731F2109-1E74-4509-AC90-683C092614AF} + {19073530-AA3E-411E-B869-3C68BED3D9AE} = {19073530-AA3E-411E-B869-3C68BED3D9AE} + {036DFA58-A699-4EDC-8560-DA257B16DF9B} = {036DFA58-A699-4EDC-8560-DA257B16DF9B} + {9FFEA15D-094D-43C9-94DB-551EA49B1FCA} = {9FFEA15D-094D-43C9-94DB-551EA49B1FCA} + {ECDBE0BF-6E8D-4A37-B7F9-E415FEDFE367} = {ECDBE0BF-6E8D-4A37-B7F9-E415FEDFE367} + {726E00FB-025B-42D4-83B4-1BD5F15DD1F4} = {726E00FB-025B-42D4-83B4-1BD5F15DD1F4} + {DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE} = {DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE} + {1C54AC20-DA61-4E7F-96D0-1438EB3D4C10} = {1C54AC20-DA61-4E7F-96D0-1438EB3D4C10} + {EAD96717-53E5-4D12-9F04-596F54EEB22A} = {EAD96717-53E5-4D12-9F04-596F54EEB22A} + {B327F8A7-2D8F-4E5B-88F8-C719BB99A155} = {B327F8A7-2D8F-4E5B-88F8-C719BB99A155} + {80759706-388F-475A-B149-E96A0516AAE1} = {80759706-388F-475A-B149-E96A0516AAE1} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "5point", "..\lib\5point\5point.vcproj", "{ECDBE0BF-6E8D-4A37-B7F9-E415FEDFE367}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imagelib", "..\lib\imagelib\imagelib.vcproj", "{9FFEA15D-094D-43C9-94DB-551EA49B1FCA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "matrix", "..\lib\matrix\matrix.vcproj", "{036DFA58-A699-4EDC-8560-DA257B16DF9B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sba-1.5", "..\lib\sba-1.5\sba-1.5.vcproj", "{731F2109-1E74-4509-AC90-683C092614AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfm-driver", "..\lib\sfm-driver\sfm-driver.vcproj", "{19073530-AA3E-411E-B869-3C68BED3D9AE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ann_1.1_char", "..\lib\ann_1.1_char\ann_1.1_char.vcproj", "{80759706-388F-475A-B149-E96A0516AAE1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyMatchFull", "KeyMatchFull.vcproj", "{70C25E8E-3069-470E-BEAD-5134BF98ACC0}" + ProjectSection(ProjectDependencies) = postProject + {80759706-388F-475A-B149-E96A0516AAE1} = {80759706-388F-475A-B149-E96A0516AAE1} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt", "..\lib\getopt\getopt.vcproj", "{726E00FB-025B-42D4-83B4-1BD5F15DD1F4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cblas", "..\lib\cblas\cblas.vcproj", "{EAD96717-53E5-4D12-9F04-596F54EEB22A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clapack", "..\lib\clapack\clapack.vcproj", "{DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "f2c", "..\lib\f2c\f2c.vcproj", "{1C54AC20-DA61-4E7F-96D0-1438EB3D4C10}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cminpack", "..\lib\cminpack\cminpack.vcproj", "{B327F8A7-2D8F-4E5B-88F8-C719BB99A155}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "..\lib\jpeg\jpeg.vcproj", "{64AC4653-466C-4AA1-A9E0-61B3877944CD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bundle2PMVS", "Bundle2PMVS.vcproj", "{89822BB0-494A-4822-B39F-8828FFBB33F5}" + ProjectSection(ProjectDependencies) = postProject + {036DFA58-A699-4EDC-8560-DA257B16DF9B} = {036DFA58-A699-4EDC-8560-DA257B16DF9B} + {DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE} = {DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE} + {9FFEA15D-094D-43C9-94DB-551EA49B1FCA} = {9FFEA15D-094D-43C9-94DB-551EA49B1FCA} + {EAD96717-53E5-4D12-9F04-596F54EEB22A} = {EAD96717-53E5-4D12-9F04-596F54EEB22A} + {B327F8A7-2D8F-4E5B-88F8-C719BB99A155} = {B327F8A7-2D8F-4E5B-88F8-C719BB99A155} + {64AC4653-466C-4AA1-A9E0-61B3877944CD} = {64AC4653-466C-4AA1-A9E0-61B3877944CD} + {1C54AC20-DA61-4E7F-96D0-1438EB3D4C10} = {1C54AC20-DA61-4E7F-96D0-1438EB3D4C10} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RadialUndistort", "RadialUndistort.vcproj", "{671EBC7C-3CD7-4BBC-A32A-A7FC8CBF761B}" + ProjectSection(ProjectDependencies) = postProject + {EAD96717-53E5-4D12-9F04-596F54EEB22A} = {EAD96717-53E5-4D12-9F04-596F54EEB22A} + {1C54AC20-DA61-4E7F-96D0-1438EB3D4C10} = {1C54AC20-DA61-4E7F-96D0-1438EB3D4C10} + {64AC4653-466C-4AA1-A9E0-61B3877944CD} = {64AC4653-466C-4AA1-A9E0-61B3877944CD} + {036DFA58-A699-4EDC-8560-DA257B16DF9B} = {036DFA58-A699-4EDC-8560-DA257B16DF9B} + {9FFEA15D-094D-43C9-94DB-551EA49B1FCA} = {9FFEA15D-094D-43C9-94DB-551EA49B1FCA} + {DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE} = {DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE} + {B327F8A7-2D8F-4E5B-88F8-C719BB99A155} = {B327F8A7-2D8F-4E5B-88F8-C719BB99A155} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1F292560-62CF-4A80-A157-A2EE06A4F461}.Debug|Win32.ActiveCfg = Debug|Win32 + {1F292560-62CF-4A80-A157-A2EE06A4F461}.Debug|Win32.Build.0 = Debug|Win32 + {1F292560-62CF-4A80-A157-A2EE06A4F461}.Release|Win32.ActiveCfg = Release|Win32 + {1F292560-62CF-4A80-A157-A2EE06A4F461}.Release|Win32.Build.0 = Release|Win32 + {ECDBE0BF-6E8D-4A37-B7F9-E415FEDFE367}.Debug|Win32.ActiveCfg = Debug|Win32 + {ECDBE0BF-6E8D-4A37-B7F9-E415FEDFE367}.Debug|Win32.Build.0 = Debug|Win32 + {ECDBE0BF-6E8D-4A37-B7F9-E415FEDFE367}.Release|Win32.ActiveCfg = Release|Win32 + {ECDBE0BF-6E8D-4A37-B7F9-E415FEDFE367}.Release|Win32.Build.0 = Release|Win32 + {9FFEA15D-094D-43C9-94DB-551EA49B1FCA}.Debug|Win32.ActiveCfg = Debug|Win32 + {9FFEA15D-094D-43C9-94DB-551EA49B1FCA}.Debug|Win32.Build.0 = Debug|Win32 + {9FFEA15D-094D-43C9-94DB-551EA49B1FCA}.Release|Win32.ActiveCfg = Release|Win32 + {9FFEA15D-094D-43C9-94DB-551EA49B1FCA}.Release|Win32.Build.0 = Release|Win32 + {036DFA58-A699-4EDC-8560-DA257B16DF9B}.Debug|Win32.ActiveCfg = Debug|Win32 + {036DFA58-A699-4EDC-8560-DA257B16DF9B}.Debug|Win32.Build.0 = Debug|Win32 + {036DFA58-A699-4EDC-8560-DA257B16DF9B}.Release|Win32.ActiveCfg = Release|Win32 + {036DFA58-A699-4EDC-8560-DA257B16DF9B}.Release|Win32.Build.0 = Release|Win32 + {731F2109-1E74-4509-AC90-683C092614AF}.Debug|Win32.ActiveCfg = Debug|Win32 + {731F2109-1E74-4509-AC90-683C092614AF}.Debug|Win32.Build.0 = Debug|Win32 + {731F2109-1E74-4509-AC90-683C092614AF}.Release|Win32.ActiveCfg = Release|Win32 + {731F2109-1E74-4509-AC90-683C092614AF}.Release|Win32.Build.0 = Release|Win32 + {19073530-AA3E-411E-B869-3C68BED3D9AE}.Debug|Win32.ActiveCfg = Debug|Win32 + {19073530-AA3E-411E-B869-3C68BED3D9AE}.Debug|Win32.Build.0 = Debug|Win32 + {19073530-AA3E-411E-B869-3C68BED3D9AE}.Release|Win32.ActiveCfg = Release|Win32 + {19073530-AA3E-411E-B869-3C68BED3D9AE}.Release|Win32.Build.0 = Release|Win32 + {80759706-388F-475A-B149-E96A0516AAE1}.Debug|Win32.ActiveCfg = Debug|Win32 + {80759706-388F-475A-B149-E96A0516AAE1}.Debug|Win32.Build.0 = Debug|Win32 + {80759706-388F-475A-B149-E96A0516AAE1}.Release|Win32.ActiveCfg = Release|Win32 + {80759706-388F-475A-B149-E96A0516AAE1}.Release|Win32.Build.0 = Release|Win32 + {70C25E8E-3069-470E-BEAD-5134BF98ACC0}.Debug|Win32.ActiveCfg = Debug|Win32 + {70C25E8E-3069-470E-BEAD-5134BF98ACC0}.Debug|Win32.Build.0 = Debug|Win32 + {70C25E8E-3069-470E-BEAD-5134BF98ACC0}.Release|Win32.ActiveCfg = Release|Win32 + {70C25E8E-3069-470E-BEAD-5134BF98ACC0}.Release|Win32.Build.0 = Release|Win32 + {726E00FB-025B-42D4-83B4-1BD5F15DD1F4}.Debug|Win32.ActiveCfg = Debug|Win32 + {726E00FB-025B-42D4-83B4-1BD5F15DD1F4}.Debug|Win32.Build.0 = Debug|Win32 + {726E00FB-025B-42D4-83B4-1BD5F15DD1F4}.Release|Win32.ActiveCfg = Release|Win32 + {726E00FB-025B-42D4-83B4-1BD5F15DD1F4}.Release|Win32.Build.0 = Release|Win32 + {EAD96717-53E5-4D12-9F04-596F54EEB22A}.Debug|Win32.ActiveCfg = Debug|Win32 + {EAD96717-53E5-4D12-9F04-596F54EEB22A}.Debug|Win32.Build.0 = Debug|Win32 + {EAD96717-53E5-4D12-9F04-596F54EEB22A}.Release|Win32.ActiveCfg = Release|Win32 + {EAD96717-53E5-4D12-9F04-596F54EEB22A}.Release|Win32.Build.0 = Release|Win32 + {DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE}.Debug|Win32.ActiveCfg = Debug|Win32 + {DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE}.Debug|Win32.Build.0 = Debug|Win32 + {DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE}.Release|Win32.ActiveCfg = Release|Win32 + {DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE}.Release|Win32.Build.0 = Release|Win32 + {1C54AC20-DA61-4E7F-96D0-1438EB3D4C10}.Debug|Win32.ActiveCfg = Debug|Win32 + {1C54AC20-DA61-4E7F-96D0-1438EB3D4C10}.Debug|Win32.Build.0 = Debug|Win32 + {1C54AC20-DA61-4E7F-96D0-1438EB3D4C10}.Release|Win32.ActiveCfg = Release|Win32 + {1C54AC20-DA61-4E7F-96D0-1438EB3D4C10}.Release|Win32.Build.0 = Release|Win32 + {B327F8A7-2D8F-4E5B-88F8-C719BB99A155}.Debug|Win32.ActiveCfg = Debug|Win32 + {B327F8A7-2D8F-4E5B-88F8-C719BB99A155}.Debug|Win32.Build.0 = Debug|Win32 + {B327F8A7-2D8F-4E5B-88F8-C719BB99A155}.Release|Win32.ActiveCfg = Release|Win32 + {B327F8A7-2D8F-4E5B-88F8-C719BB99A155}.Release|Win32.Build.0 = Release|Win32 + {64AC4653-466C-4AA1-A9E0-61B3877944CD}.Debug|Win32.ActiveCfg = Debug|Win32 + {64AC4653-466C-4AA1-A9E0-61B3877944CD}.Debug|Win32.Build.0 = Debug|Win32 + {64AC4653-466C-4AA1-A9E0-61B3877944CD}.Release|Win32.ActiveCfg = Release|Win32 + {64AC4653-466C-4AA1-A9E0-61B3877944CD}.Release|Win32.Build.0 = Release|Win32 + {89822BB0-494A-4822-B39F-8828FFBB33F5}.Debug|Win32.ActiveCfg = Debug|Win32 + {89822BB0-494A-4822-B39F-8828FFBB33F5}.Debug|Win32.Build.0 = Debug|Win32 + {89822BB0-494A-4822-B39F-8828FFBB33F5}.Release|Win32.ActiveCfg = Release|Win32 + {89822BB0-494A-4822-B39F-8828FFBB33F5}.Release|Win32.Build.0 = Release|Win32 + {671EBC7C-3CD7-4BBC-A32A-A7FC8CBF761B}.Debug|Win32.ActiveCfg = Debug|Win32 + {671EBC7C-3CD7-4BBC-A32A-A7FC8CBF761B}.Debug|Win32.Build.0 = Debug|Win32 + {671EBC7C-3CD7-4BBC-A32A-A7FC8CBF761B}.Release|Win32.ActiveCfg = Release|Win32 + {671EBC7C-3CD7-4BBC-A32A-A7FC8CBF761B}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/vc++/Bundle2PMVS.vcxproj b/vc++/Bundle2PMVS.vcxproj new file mode 100644 index 0000000..77ad9ca --- /dev/null +++ b/vc++/Bundle2PMVS.vcxproj @@ -0,0 +1,135 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {89822BB0-494A-4822-B39F-8828FFBB33F5} + Bundle2PMVS + Win32Proj + + + + Application + v120 + Unicode + true + + + Application + v120 + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + ..\include;..\lib\imagelib;..\lib\matrix;..\lib\sfm-driver;..\lib\jpeg\src;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + /FS %(AdditionalOptions) + + + true + Console + MachineX86 + + + + + + + + ..\include;..\lib\imagelib;..\lib\matrix;..\lib\sfm-driver;..\lib\jpeg\src;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + + + + + + + + + + + {ead96717-53e5-4d12-9f04-596f54eeb22a} + false + + + {dca45ea3-ce31-4d66-87e4-89d85bee8bae} + false + + + {b327f8a7-2d8f-4e5b-88f8-c719bb99a155} + false + + + {1c54ac20-da61-4e7f-96d0-1438eb3d4c10} + false + + + {9ffea15d-094d-43c9-94db-551ea49b1fca} + false + + + {64ac4653-466c-4aa1-a9e0-61b3877944cd} + false + + + {036dfa58-a699-4edc-8560-da257b16df9b} + false + + + + + + \ No newline at end of file diff --git a/vc++/Bundle2PMVS.vcxproj.filters b/vc++/Bundle2PMVS.vcxproj.filters new file mode 100644 index 0000000..bfbd303 --- /dev/null +++ b/vc++/Bundle2PMVS.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/vc++/Bundler.sln b/vc++/Bundler.sln index c684a92..2dfdb61 100755 --- a/vc++/Bundler.sln +++ b/vc++/Bundler.sln @@ -1,72 +1,39 @@  -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bundler", "Bundler.vcproj", "{1F292560-62CF-4A80-A157-A2EE06A4F461}" - ProjectSection(ProjectDependencies) = postProject - {64AC4653-466C-4AA1-A9E0-61B3877944CD} = {64AC4653-466C-4AA1-A9E0-61B3877944CD} - {731F2109-1E74-4509-AC90-683C092614AF} = {731F2109-1E74-4509-AC90-683C092614AF} - {19073530-AA3E-411E-B869-3C68BED3D9AE} = {19073530-AA3E-411E-B869-3C68BED3D9AE} - {036DFA58-A699-4EDC-8560-DA257B16DF9B} = {036DFA58-A699-4EDC-8560-DA257B16DF9B} - {9FFEA15D-094D-43C9-94DB-551EA49B1FCA} = {9FFEA15D-094D-43C9-94DB-551EA49B1FCA} - {ECDBE0BF-6E8D-4A37-B7F9-E415FEDFE367} = {ECDBE0BF-6E8D-4A37-B7F9-E415FEDFE367} - {726E00FB-025B-42D4-83B4-1BD5F15DD1F4} = {726E00FB-025B-42D4-83B4-1BD5F15DD1F4} - {DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE} = {DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE} - {1C54AC20-DA61-4E7F-96D0-1438EB3D4C10} = {1C54AC20-DA61-4E7F-96D0-1438EB3D4C10} - {EAD96717-53E5-4D12-9F04-596F54EEB22A} = {EAD96717-53E5-4D12-9F04-596F54EEB22A} - {B327F8A7-2D8F-4E5B-88F8-C719BB99A155} = {B327F8A7-2D8F-4E5B-88F8-C719BB99A155} - {80759706-388F-475A-B149-E96A0516AAE1} = {80759706-388F-475A-B149-E96A0516AAE1} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "5point", "..\lib\5point\5point.vcproj", "{ECDBE0BF-6E8D-4A37-B7F9-E415FEDFE367}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imagelib", "..\lib\imagelib\imagelib.vcproj", "{9FFEA15D-094D-43C9-94DB-551EA49B1FCA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "matrix", "..\lib\matrix\matrix.vcproj", "{036DFA58-A699-4EDC-8560-DA257B16DF9B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sba-1.5", "..\lib\sba-1.5\sba-1.5.vcproj", "{731F2109-1E74-4509-AC90-683C092614AF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfm-driver", "..\lib\sfm-driver\sfm-driver.vcproj", "{19073530-AA3E-411E-B869-3C68BED3D9AE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ann_1.1_char", "..\lib\ann_1.1_char\ann_1.1_char.vcproj", "{80759706-388F-475A-B149-E96A0516AAE1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyMatchFull", "KeyMatchFull.vcproj", "{70C25E8E-3069-470E-BEAD-5134BF98ACC0}" - ProjectSection(ProjectDependencies) = postProject - {80759706-388F-475A-B149-E96A0516AAE1} = {80759706-388F-475A-B149-E96A0516AAE1} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt", "..\lib\getopt\getopt.vcproj", "{726E00FB-025B-42D4-83B4-1BD5F15DD1F4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cblas", "..\lib\cblas\cblas.vcproj", "{EAD96717-53E5-4D12-9F04-596F54EEB22A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clapack", "..\lib\clapack\clapack.vcproj", "{DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "f2c", "..\lib\f2c\f2c.vcproj", "{1C54AC20-DA61-4E7F-96D0-1438EB3D4C10}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cminpack", "..\lib\cminpack\cminpack.vcproj", "{B327F8A7-2D8F-4E5B-88F8-C719BB99A155}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "..\lib\jpeg\jpeg.vcproj", "{64AC4653-466C-4AA1-A9E0-61B3877944CD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bundle2PMVS", "Bundle2PMVS.vcproj", "{89822BB0-494A-4822-B39F-8828FFBB33F5}" - ProjectSection(ProjectDependencies) = postProject - {036DFA58-A699-4EDC-8560-DA257B16DF9B} = {036DFA58-A699-4EDC-8560-DA257B16DF9B} - {DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE} = {DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE} - {9FFEA15D-094D-43C9-94DB-551EA49B1FCA} = {9FFEA15D-094D-43C9-94DB-551EA49B1FCA} - {EAD96717-53E5-4D12-9F04-596F54EEB22A} = {EAD96717-53E5-4D12-9F04-596F54EEB22A} - {B327F8A7-2D8F-4E5B-88F8-C719BB99A155} = {B327F8A7-2D8F-4E5B-88F8-C719BB99A155} - {64AC4653-466C-4AA1-A9E0-61B3877944CD} = {64AC4653-466C-4AA1-A9E0-61B3877944CD} - {1C54AC20-DA61-4E7F-96D0-1438EB3D4C10} = {1C54AC20-DA61-4E7F-96D0-1438EB3D4C10} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RadialUndistort", "RadialUndistort.vcproj", "{671EBC7C-3CD7-4BBC-A32A-A7FC8CBF761B}" - ProjectSection(ProjectDependencies) = postProject - {EAD96717-53E5-4D12-9F04-596F54EEB22A} = {EAD96717-53E5-4D12-9F04-596F54EEB22A} - {1C54AC20-DA61-4E7F-96D0-1438EB3D4C10} = {1C54AC20-DA61-4E7F-96D0-1438EB3D4C10} - {64AC4653-466C-4AA1-A9E0-61B3877944CD} = {64AC4653-466C-4AA1-A9E0-61B3877944CD} - {036DFA58-A699-4EDC-8560-DA257B16DF9B} = {036DFA58-A699-4EDC-8560-DA257B16DF9B} - {9FFEA15D-094D-43C9-94DB-551EA49B1FCA} = {9FFEA15D-094D-43C9-94DB-551EA49B1FCA} - {DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE} = {DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE} - {B327F8A7-2D8F-4E5B-88F8-C719BB99A155} = {B327F8A7-2D8F-4E5B-88F8-C719BB99A155} - EndProjectSection +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.30723.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bundler", "Bundler.vcxproj", "{1F292560-62CF-4A80-A157-A2EE06A4F461}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "5point", "..\lib\5point\5point.vcxproj", "{ECDBE0BF-6E8D-4A37-B7F9-E415FEDFE367}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imagelib", "..\lib\imagelib\imagelib.vcxproj", "{9FFEA15D-094D-43C9-94DB-551EA49B1FCA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "matrix", "..\lib\matrix\matrix.vcxproj", "{036DFA58-A699-4EDC-8560-DA257B16DF9B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sba-1.5", "..\lib\sba-1.5\sba-1.5.vcxproj", "{731F2109-1E74-4509-AC90-683C092614AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfm-driver", "..\lib\sfm-driver\sfm-driver.vcxproj", "{19073530-AA3E-411E-B869-3C68BED3D9AE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ann_1.1_char", "..\lib\ann_1.1_char\ann_1.1_char.vcxproj", "{80759706-388F-475A-B149-E96A0516AAE1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyMatchFull", "KeyMatchFull.vcxproj", "{70C25E8E-3069-470E-BEAD-5134BF98ACC0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt", "..\lib\getopt\getopt.vcxproj", "{726E00FB-025B-42D4-83B4-1BD5F15DD1F4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cblas", "..\lib\cblas\cblas.vcxproj", "{EAD96717-53E5-4D12-9F04-596F54EEB22A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clapack", "..\lib\clapack\clapack.vcxproj", "{DCA45EA3-CE31-4D66-87E4-89D85BEE8BAE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "f2c", "..\lib\f2c\f2c.vcxproj", "{1C54AC20-DA61-4E7F-96D0-1438EB3D4C10}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cminpack", "..\lib\cminpack\cminpack.vcxproj", "{B327F8A7-2D8F-4E5B-88F8-C719BB99A155}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "..\lib\jpeg\jpeg.vcxproj", "{64AC4653-466C-4AA1-A9E0-61B3877944CD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bundle2PMVS", "Bundle2PMVS.vcxproj", "{89822BB0-494A-4822-B39F-8828FFBB33F5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RadialUndistort", "RadialUndistort.vcxproj", "{671EBC7C-3CD7-4BBC-A32A-A7FC8CBF761B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/vc++/Bundler.v12.suo b/vc++/Bundler.v12.suo new file mode 100644 index 0000000000000000000000000000000000000000..582f9753f44189f8646068fe4733b079eb481075 GIT binary patch literal 28672 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 VfB)IoH=g|AEOKWw-LY + + + + Debug + Win32 + + + Release + Win32 + + + + {1F292560-62CF-4A80-A157-A2EE06A4F461} + Bundler + Win32Proj + + + + Application + v120 + Unicode + true + + + Application + v120 + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + ..\include;..\lib\matrix;..\lib\imagelib;..\lib\sfm-driver;..\lib\zlib\include;..\lib\ann_1.1_char\include;..\lib\getopt;..\lib\5point;..\lib\jpeg\src;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;__BUNDLER__;__BUNDLER_DISTR__;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + /FS %(AdditionalOptions) + + + zlib.lib;%(AdditionalDependencies) + ..\lib\zlib\lib;..\lib\jpeg\lib;%(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + + + ..\include;..\lib\matrix;..\lib\imagelib;..\lib\sfm-driver;..\lib\zlib\include;..\lib\ann_1.1_char\include;..\lib\getopt;..\lib\5point;..\lib\jpeg\src;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;__BUNDLER__;__BUNDLER_DISTR__;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + zlib.lib;%(AdditionalDependencies) + ..\lib\zlib\lib;..\lib\jpeg\lib;%(AdditionalLibraryDirectories) + true + Console + true + true + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {ecdbe0bf-6e8d-4a37-b7f9-e415fedfe367} + false + + + {80759706-388f-475a-b149-e96a0516aae1} + false + + + {ead96717-53e5-4d12-9f04-596f54eeb22a} + false + + + {dca45ea3-ce31-4d66-87e4-89d85bee8bae} + false + + + {b327f8a7-2d8f-4e5b-88f8-c719bb99a155} + false + + + {1c54ac20-da61-4e7f-96d0-1438eb3d4c10} + false + + + {726e00fb-025b-42d4-83b4-1bd5f15dd1f4} + false + + + {9ffea15d-094d-43c9-94db-551ea49b1fca} + false + + + {64ac4653-466c-4aa1-a9e0-61b3877944cd} + false + + + {036dfa58-a699-4edc-8560-da257b16df9b} + false + + + {731f2109-1e74-4509-ac90-683c092614af} + false + + + {19073530-aa3e-411e-b869-3c68bed3d9ae} + false + + + + + + \ No newline at end of file diff --git a/vc++/Bundler.vcxproj.filters b/vc++/Bundler.vcxproj.filters new file mode 100644 index 0000000..dc8052d --- /dev/null +++ b/vc++/Bundler.vcxproj.filters @@ -0,0 +1,159 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/vc++/KeyMatchFull.vcxproj b/vc++/KeyMatchFull.vcxproj new file mode 100644 index 0000000..17cc4f2 --- /dev/null +++ b/vc++/KeyMatchFull.vcxproj @@ -0,0 +1,106 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {70C25E8E-3069-470E-BEAD-5134BF98ACC0} + KeyMatchFull + Win32Proj + + + + Application + v120 + Unicode + true + + + Application + v120 + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + ..\lib\zlib\include; ..\lib\ann_1.1_char\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + /FS %(AdditionalOptions) + + + zlib.lib;%(AdditionalDependencies) + ..\lib\zlib\lib;%(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + + + ..\lib\zlib\include; ..\lib\ann_1.1_char\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + zlib.lib;%(AdditionalDependencies) + ..\lib\zlib\lib;%(AdditionalLibraryDirectories) + true + Console + true + true + MachineX86 + + + + + + + + + {80759706-388f-475a-b149-e96a0516aae1} + false + + + + + + \ No newline at end of file diff --git a/vc++/KeyMatchFull.vcxproj.filters b/vc++/KeyMatchFull.vcxproj.filters new file mode 100644 index 0000000..d28e2b7 --- /dev/null +++ b/vc++/KeyMatchFull.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/vc++/RadialUndistort.vcxproj b/vc++/RadialUndistort.vcxproj new file mode 100644 index 0000000..48aa03b --- /dev/null +++ b/vc++/RadialUndistort.vcxproj @@ -0,0 +1,126 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {671EBC7C-3CD7-4BBC-A32A-A7FC8CBF761B} + RadialUndistort + Win32Proj + + + + Application + v120 + Unicode + true + + + Application + v120 + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + ..\include;..\lib\imagelib;..\lib\matrix;..\lib\sfm-driver;..\lib\jpeg\src;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + /FS %(AdditionalOptions) + + + true + Console + MachineX86 + + + + + ..\include; ..\lib\imagelib; ..\lib\matrix; ..\lib\sfm-driver;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + + + + + {ead96717-53e5-4d12-9f04-596f54eeb22a} + false + + + {dca45ea3-ce31-4d66-87e4-89d85bee8bae} + false + + + {b327f8a7-2d8f-4e5b-88f8-c719bb99a155} + false + + + {1c54ac20-da61-4e7f-96d0-1438eb3d4c10} + false + + + {9ffea15d-094d-43c9-94db-551ea49b1fca} + false + + + {64ac4653-466c-4aa1-a9e0-61b3877944cd} + false + + + {036dfa58-a699-4edc-8560-da257b16df9b} + false + + + + + + \ No newline at end of file diff --git a/vc++/RadialUndistort.vcxproj.filters b/vc++/RadialUndistort.vcxproj.filters new file mode 100644 index 0000000..c3ba02f --- /dev/null +++ b/vc++/RadialUndistort.vcxproj.filters @@ -0,0 +1,21 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + Source Files + + + \ No newline at end of file