razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Support Visual Studio 2015 (#544)

Browse source 
* Small changes, for some reason VS 2015 can't link cprintf and they added a second function std::map::count and bind couldn't resolve the function. Substituted with a lambda-expression.

* Created all 64bit version of the 3rd party libs.

* Cleanup popup opens CleanupSettings instead of CleanupSettingsPane. Not finished, panel is wrong now (also uses CleanupSettings).

* Tried to get Twain working, failed.

* When there are more then 3 peg holes create additional holes.

* When a hole touches the boundary it should still be considered a hole.

* Do not compare dot size against fixed size. Will not work in some scan resolutions. Used the same value (PERCENT * max dot size) as later in the code in compare_dots.

* When there are more than three peg holes the code looked for the best fit and used that. The problem was, that the middle hole was used as center for auto center. For three peg holes that is correct, but does not work for more than three. Now the best fit is calculated and from there the offset of the middle of the three best fit holes is calculated and applied.

* One of the last changes broke VS2015 compatibility, it chocked on a missing include.

* fix for msvs2013

* revert autopos.cpp

* apply clang-format

* use GIT-LFS
This commit is contained in:
Shinya Kitaoka 2016-07-04 17:50:30 +09:00 committed by Keisuke Ogaki
parent 18f19a087d
commit fd19c4eedf
116 changed files with 468 additions and 594 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitattributes vendored Normal file
View file

@ -0,0 +1,2 @@
*.lib filter=lfs diff=lfs merge=lfs -text
*.dll filter=lfs diff=lfs merge=lfs -text

7
doc/how_to_build_win.md
View file

@ -59,6 +59,13 @@ Rename the following files:
- `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tiffconf.vc.h` → `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tiffconf.h`
- `$opentoonz/thirdparty/libpng-1.6.21/scripts/pnglibconf.h.prebuilt` → `$opentoonz/thirdparty/libpng-1.6.21/pnglibconf.h`
Add a guard for snprintf at tif_config.h(50):
```
+#if _MSC_VER < 1900
#define snprintf _snprintf
+#endif
```
## Building
1. Open `$opentoonz/toonz/build/OpenToonz.sln` and change to `Release`
2. The output will be in `$opentoonz/toonz/build/Release`

7
doc/how_to_build_win_ja.md
View file

@ -56,6 +56,13 @@ Visual Studio 2013とQt 5.6でビルドできることを確認しています
- `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tiffconf.vc.h` → `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tiffconf.h`
- `$opentoonz/thirdparty/libpng-1.6.21/scripts/pnglibconf.h.prebuilt` → `$opentoonz/thirdparty/libpng-1.6.21/pnglibconf.h`
`tif_config.h` の 50 行目あたりに下記の修正を加えます:
```
+#if _MSC_VER < 1900
#define snprintf _snprintf
+#endif
```
## ビルド
1. `$opentoonz/toonz/build/OpenToonz.sln`を開いてRelease構成を選択してビルドします
2. `$opentoonz/toonz/build/Release`にファイルが生成されます

BIN
thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9.lib vendored
View file

Binary file not shown.

3
thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2013.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:98a2e2d1ebb2656551cfa940f0c6c7370b2dab3660ba9d305c0d2ac2b21638f5
size 2493752

3
thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2013_64.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dd1f0ee4a952b127fa96390e88d693415aa8da621270557d039b07e0fc2738b1
size 2516870

3
thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2015.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2e3ee5c4fe4c1f33f7cac77363db8c69ec7dfdea1cf6d656ea0f46860b244cd2
size 6654474

3
thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2015_64.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:53fde671ed29e2cf712642120dc23e1ae9ba2e9106ef2dcf73a523690c475a0d
size 6687860

BIN
thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_64.lib vendored
View file

Binary file not shown.

10
thirdparty/LibJPEG/jpeg-9/prj/LibJPEG/LibJPEG.vcxproj vendored
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -27,27 +27,27 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

BIN
thirdparty/Lz4/Lz4_131/lz4_32.lib vendored
View file

Binary file not shown.

BIN
thirdparty/Lz4/Lz4_131/lz4_64.lib vendored
View file

Binary file not shown.

BIN
thirdparty/glew/glew-1.9.0/bin/32bit/glew32.dll vendored
View file

Binary file not shown.

BIN
thirdparty/glew/glew-1.9.0/bin/32bit/glew32mx.dll vendored
View file

Binary file not shown.

BIN
thirdparty/glew/glew-1.9.0/bin/64bit/glew32.dll vendored
View file

Binary file not shown.

BIN
thirdparty/glew/glew-1.9.0/bin/64bit/glew32mx.dll vendored
View file

Binary file not shown.

BIN
thirdparty/glew/glew-1.9.0/lib/glew32.lib vendored
View file

Binary file not shown.

BIN
thirdparty/glew/glew-1.9.0/lib/glew32mx.lib vendored
View file

Binary file not shown.

BIN
thirdparty/glew/glew-1.9.0/lib/glew32mxs.lib vendored
View file

Binary file not shown.

BIN
thirdparty/glew/glew-1.9.0/lib/glew32s.lib vendored
View file

Binary file not shown.

BIN
thirdparty/glew/glew-1.9.0/lib/glew64.lib vendored
View file

Binary file not shown.

BIN
thirdparty/glew/glew-1.9.0/lib/glew64mx.lib vendored
View file

Binary file not shown.

BIN
thirdparty/glew/glew-1.9.0/lib/glew64mxs.lib vendored
View file

Binary file not shown.

BIN
thirdparty/glew/glew-1.9.0/lib/glew64s.lib vendored
View file

Binary file not shown.

BIN
thirdparty/glut/3.7.6/lib/glut32.dll vendored
View file

Binary file not shown.

BIN
thirdparty/glut/3.7.6/lib/glut32.lib vendored
View file

Binary file not shown.

BIN
thirdparty/glut/3.7.6/lib/glut64.dll vendored
View file

Binary file not shown.

BIN
thirdparty/glut/3.7.6/lib/glut64.lib vendored
View file

Binary file not shown.

BIN
thirdparty/libpng-1.6.21/lib/libpng16.lib vendored
View file

Binary file not shown.

3
thirdparty/libpng-1.6.21/lib/libpng16_2013.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d524d8a30a7f4db740cacf0df6e30094038a8d4fc0fe31c173f263dc1eab80c6
size 1664856

3
thirdparty/libpng-1.6.21/lib/libpng16_2013_64.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7633fee94be82dd5b4306087d48fb3355da5e31f65dc65e524c906101ede8aa9
size 1685508

3
thirdparty/libpng-1.6.21/lib/libpng16_2013_64d.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:80f9061022636468b0210c4593e5068ca5effaf31f9f773588c07f8bfd06ce3a
size 1338884

3
thirdparty/libpng-1.6.21/lib/libpng16_2013d.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9f14eb2031a8deb31b42f10b41b0f88bdde539f7e604ad7c9c77ca07fdeadd99
size 1152430

3
thirdparty/libpng-1.6.21/lib/libpng16_2015.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1d6be973caafd36b6dcf9b8fcb2d030ad2e0c3c523527fad7bbf7da9f9ba5b6e
size 56118

3
thirdparty/libpng-1.6.21/lib/libpng16_2015_64.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b4bdc9d683bea03f63d1b1f5f7f5c35669a959b59f9a9a0ef265bbf088241846
size 1712226

3
thirdparty/libpng-1.6.21/lib/libpng16_2015_64d.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a7853ab6972d0f56a0562d05ce1e3532f0dc4dec75359137f1ae9b7e0b19899b
size 1328584

3
thirdparty/libpng-1.6.21/lib/libpng16_2015d.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:be7784d0f86cf87b9dd965a32707e1a999b059d57fbeddb4066a033200e0fbc9
size 56118

BIN
thirdparty/libpng-1.6.21/lib/libpng16_64.lib vendored
View file

Binary file not shown.

BIN
thirdparty/libpng-1.6.21/lib/libpng16_64d.lib vendored
View file

Binary file not shown.

BIN
thirdparty/libpng-1.6.21/lib/libpng16d.lib vendored
View file

Binary file not shown.

18
thirdparty/libpng-1.6.21/projects/vstudio/libpng/libpng.vcxproj vendored
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug Library|Win32">
<Configuration>Debug Library</Configuration>
@ -45,45 +45,45 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

6
thirdparty/libpng-1.6.21/projects/vstudio/pnglibconf/pnglibconf.vcxproj vendored
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
@ -20,14 +20,14 @@
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(SolutionDir)\zlib.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

18
thirdparty/libpng-1.6.21/projects/vstudio/pngstest/pngstest.vcxproj vendored
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug Library|Win32">
<Configuration>Debug Library</Configuration>
@ -44,42 +44,42 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

18
thirdparty/libpng-1.6.21/projects/vstudio/pngtest/pngtest.vcxproj vendored
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug Library|Win32">
<Configuration>Debug Library</Configuration>
@ -44,42 +44,42 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

18
thirdparty/libpng-1.6.21/projects/vstudio/pngunknown/pngunknown.vcxproj vendored
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug Library|Win32">
<Configuration>Debug Library</Configuration>
@ -44,42 +44,42 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

18
thirdparty/libpng-1.6.21/projects/vstudio/pngvalid/pngvalid.vcxproj vendored
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug Library|Win32">
<Configuration>Debug Library</Configuration>
@ -44,42 +44,42 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

18
thirdparty/libpng-1.6.21/projects/vstudio/zlib/zlib.vcxproj vendored
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug Library|Win32">
<Configuration>Debug Library</Configuration>
@ -56,27 +56,27 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@ -86,11 +86,11 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

BIN
thirdparty/lzo/2.03/LZO_lib/lzo2.lib vendored
View file

Binary file not shown.

BIN
thirdparty/lzo/2.03/LZO_lib/lzo2_64.lib vendored
View file

Binary file not shown.

BIN
thirdparty/lzo/2.03/lzo2.dll vendored
View file

Binary file not shown.

BIN
thirdparty/lzo/2.03/lzo2.lib vendored
View file

Binary file not shown.

BIN
thirdparty/openblas/libopenblas_32.lib vendored
View file

Binary file not shown.

BIN
thirdparty/openblas/libopenblas_64.lib vendored
View file

Binary file not shown.

3
thirdparty/superlu/SuperLU_2013_32.d.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cba5a4786d3ebc023574dfc96d805b2abd8ac530ed8eb4f4d5a1c38f86686a7d
size 2045134

3
thirdparty/superlu/SuperLU_2013_32.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:85f6c472a61cd56b8ff924b7432f35c5527bf09bcbcdd9f789ebd1d4afe93847
size 3007274

3
thirdparty/superlu/SuperLU_2013_64.d.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8a821bebd460291f2900194c56ba26f118ba18d261eaac022a15f6ad96248b7d
size 2313496

3
thirdparty/superlu/SuperLU_2013_64.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0424b4c170b2013021c33eb4661baf5a54333c2af8bb7ac7fa9a56057f05493d
size 3053094

3
thirdparty/superlu/SuperLU_2015_32.d.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:13127d7d806edabd46ab5f5cda7153bb5dab371ea99d963116814fe13cdfaf95
size 2051218

3
thirdparty/superlu/SuperLU_2015_32.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f178f968d07b3c946507c5efec4bca34e2b970a2437b158dd19c675972cffa04
size 15460614

3
thirdparty/superlu/SuperLU_2015_64.d.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:61d3062ef35e057607a4c47ee97003f284721183bf7a375eb05bddaa2c95cdcf
size 2405788

3
thirdparty/superlu/SuperLU_2015_64.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:003b983d6fcc9ab5b86f115ecda0d69529121e69fd987990f14c7f4353343807
size 15006298

BIN
thirdparty/superlu/SuperLU_32.d.lib vendored
View file

Binary file not shown.

BIN
thirdparty/superlu/SuperLU_32.lib vendored
View file

Binary file not shown.

BIN
thirdparty/superlu/SuperLU_4.1/lib/libsuperlu_4.0.lib vendored
View file

Binary file not shown.

8
thirdparty/superlu/SuperLU_4.1/prj/SuperLU/SuperLU.sln vendored
View file

@ -1,7 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SuperLU", "SuperLU.vcproj", "{CE6D481F-D1A9-45D9-B1BC-31723CC03F82}"
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 14 for Windows Desktop
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SuperLU", "SuperLU.vcxproj", "{CE6D481F-D1A9-45D9-B1BC-31723CC03F82}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

BIN
thirdparty/superlu/SuperLU_64.d.lib vendored
View file

Binary file not shown.

BIN
thirdparty/superlu/SuperLU_64.lib vendored
View file

Binary file not shown.

BIN
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3.lib vendored
View file

Binary file not shown.

3
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:89c01765c3108dfd6e3ebf793250a3da123193c7a1c256ed785a42a72157fcd4
size 3293724

3
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013_64.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:65fc3676ea3f1716639cd80a50921134fc148227bb27448fa195fef30219053e
size 3307736

3
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013_64d.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:04fbb1f045853101f78076eac6773718237dfb89dabf712217528f5bf018a88f
size 1730990

3
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013d.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:79ec3503f8654a7bd7feabe7f62617be2b5eca7a03820630ecab6c99b890ffc7
size 1963882

3
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3a7941d8d8a8278ea62ead65f63af9bce7801614ee2e5f629ca107a14fc60594
size 6199378

3
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015_64.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:931554a80f424a46e248c3f7f95ac3ee039b3f54e0f379ef1aab04462e715f86
size 6227900

3
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015_64d.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:10f1b5baecb1e850ca8994e4f6f4347f9426ddb77b841178ee734fb609c0370f
size 2094704

3
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015d.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c4dfbbc0a9446626227bd6ea2a930b5b3dc83d2295c08459bc3b6f6920e288d7
size 1859564

BIN
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_64.lib vendored
View file

Binary file not shown.

BIN
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_64d.lib vendored
View file

Binary file not shown.

BIN
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3d.lib vendored
View file

Binary file not shown.

10
thirdparty/tiff-4.0.3/prj/LibTIFF/LibTIFF.vcxproj vendored
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -85,27 +85,27 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

BIN
thirdparty/zlib-1.2.8/lib/zlib-1.2.8.lib vendored
View file

Binary file not shown.

3
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:891a625fd0bc015e65d7005c8445b0ff74befb8d028bef303fb9cc63a15445af
size 449120

3
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013_64.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d60bb202e3a94885014d0edb100b76f9e421afe12693693b0a316a31ea1b9274
size 458468

3
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013_64d.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:60bd0552d5c852c5877e589856aae72a5619e5485ff457a7665a6c1243ea34fe
size 278548

3
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013d.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9a971e5b0d7dbef04506b7d17330f658721f6c41b96935986cf07bc727f10a26
size 305120

3
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2eda63665387de539ce96b136b1dd0f9699ec093f1c91b846e0374b1ed9f1c2f
size 809418

3
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015_64.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8015f2fdddc5b470d589e49dccb8acb561fb63cb05284e5ff9cbb479a7c3c25d
size 817990

3
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015_64d.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ed006dc3e4e5c415743af576ebe4967d883f88b0f9765fffe65555e2e426e123
size 351702

3
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015d.lib vendored Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9c0b237f20384c74575569fd0a299b103b3e2596443604eb336d5a03af86d2f7
size 308484

BIN
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_64.lib vendored
View file

Binary file not shown.

BIN
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_64d.lib vendored
View file

Binary file not shown.

BIN
thirdparty/zlib-1.2.8/lib/zlib-1.2.8d.lib vendored
View file

Binary file not shown.

10
thirdparty/zlib-1.2.8/prj/zlib/zlib.vcxproj vendored
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -27,27 +27,27 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

52
thirdparty/zlib-1.2.8/prj/zlib/zlib.vcxproj.filters vendored
View file

@ -15,84 +15,84 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\crc32.h">
<ClInclude Include="..\..\crc32.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\deflate.h">
<ClInclude Include="..\..\deflate.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\gzguts.h">
<ClInclude Include="..\..\gzguts.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\inffast.h">
<ClInclude Include="..\..\inffast.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\inffixed.h">
<ClInclude Include="..\..\inffixed.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\inflate.h">
<ClInclude Include="..\..\inflate.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\inftrees.h">
<ClInclude Include="..\..\inftrees.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\trees.h">
<ClInclude Include="..\..\trees.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\zconf.h">
<ClInclude Include="..\..\zconf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\zlib.h">
<ClInclude Include="..\..\zlib.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\zutil.h">
<ClInclude Include="..\..\zutil.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\adler32.c">
<ClCompile Include="..\..\adler32.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\compress.c">
<ClCompile Include="..\..\compress.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\crc32.c">
<ClCompile Include="..\..\crc32.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\deflate.c">
<ClCompile Include="..\..\deflate.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\gzclose.c">
<ClCompile Include="..\..\gzclose.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\gzlib.c">
<ClCompile Include="..\..\gzlib.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\gzread.c">
<ClCompile Include="..\..\gzread.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\gzwrite.c">
<ClCompile Include="..\..\gzwrite.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\infback.c">
<ClCompile Include="..\..\infback.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\inffast.c">
<ClCompile Include="..\..\inffast.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\inflate.c">
<ClCompile Include="..\..\inflate.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\inftrees.c">
<ClCompile Include="..\..\inftrees.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\trees.c">
<ClCompile Include="..\..\trees.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\uncompr.c">
<ClCompile Include="..\..\uncompr.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\zutil.c">
<ClCompile Include="..\..\zutil.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>

36
toonz/sources/CMakeLists.txt
View file

@ -14,10 +14,18 @@ message("Thirdpary Library Search path:" ${THIRDPARTY_LIBS_HINTS})
if(WIN32)
message("Windows System")
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(QT_PATH "C:/Qt/Qt5.6.0_32/5.6/msvc2013" CACHE PATH "Qt instlattion directory")
if(MSVC_VERSION GREATER 1800)
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(QT_PATH "C:/Qt/5.6/msvc2015" CACHE PATH "Qt instlattion directory")
else()
set(QT_PATH "C:/Qt/5.6/msvc2015_64" CACHE PATH "Qt instlattion directory")
endif()
else()
set(QT_PATH "C:/Qt/Qt5.6.0/5.6/msvc2013_64" CACHE PATH "Qt instlattion directory")
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(QT_PATH "C:/Qt/Qt5.6.0_32/5.6/msvc2013" CACHE PATH "Qt instlattion directory")
else()
set(QT_PATH "C:/Qt/Qt5.6.0/5.6/msvc2013_64" CACHE PATH "Qt instlattion directory")
endif()
endif()
if(NOT EXISTS ${QT_PATH})
message("Specify QT_PATH properly")
@ -155,22 +163,28 @@ if(WIN32)
set(PLATFORM2 _64)
endif()
if(MSVC_VERSION GREATER 1800)
set(MSVC_LIB_VERSION 2015)
else()
set(MSVC_LIB_VERSION 2013)
endif()
set(GLUT_LIB ${SDKROOT}/glut/3.7.6/lib/glut${PLATFORM}.lib)
set(GL_LIB opengl32.lib)
set(Z_LIB
optimized ${SDKROOT}/zlib-1.2.8/lib/zlib-1.2.8${PLATFORM2}.lib
debug ${SDKROOT}/zlib-1.2.8/lib/zlib-1.2.8${PLATFORM2}d.lib)
set(JPEG_LIB ${SDKROOT}/LibJPEG/jpeg-9/lib/LibJPEG-9${PLATFORM2}.lib)
optimized ${SDKROOT}/zlib-1.2.8/lib/zlib-1.2.8_${MSVC_LIB_VERSION}${PLATFORM2}.lib
debug ${SDKROOT}/zlib-1.2.8/lib/zlib-1.2.8_${MSVC_LIB_VERSION}${PLATFORM2}d.lib)
set(JPEG_LIB ${SDKROOT}/LibJPEG/jpeg-9/lib/LibJPEG-9_${MSVC_LIB_VERSION}${PLATFORM2}.lib)
set(TIFF_INCLUDE_DIR ${SDKROOT}/tiff-4.0.3/libtiff)
set(TIFF_LIB
optimized ${SDKROOT}/tiff-4.0.3/lib/LibTIFF-4.0.3${PLATFORM2}.lib
debug ${SDKROOT}/tiff-4.0.3/lib/LibTIFF-4.0.3${PLATFORM2}d.lib)
optimized ${SDKROOT}/tiff-4.0.3/lib/LibTIFF-4.0.3_${MSVC_LIB_VERSION}${PLATFORM2}.lib
debug ${SDKROOT}/tiff-4.0.3/lib/LibTIFF-4.0.3_${MSVC_LIB_VERSION}${PLATFORM2}d.lib)
set(PNG_LIB
optimized ${SDKROOT}/libpng-1.6.21/lib/libpng16${PLATFORM2}.lib
debug ${SDKROOT}/libpng-1.6.21/lib/libpng16${PLATFORM2}d.lib)
optimized ${SDKROOT}/libpng-1.6.21/lib/libpng16_${MSVC_LIB_VERSION}${PLATFORM2}.lib
debug ${SDKROOT}/libpng-1.6.21/lib/libpng16_${MSVC_LIB_VERSION}${PLATFORM2}d.lib)
set(GLEW_LIB ${SDKROOT}/glew/glew-1.9.0/lib/glew${PLATFORM}.lib)
set(LZ4_LIB ${SDKROOT}/Lz4/Lz4_131/lz4_${PLATFORM}.lib)
set(SUPERLU_LIB ${SDKROOT}/superlu/SuperLU_${PLATFORM}.lib)
set(SUPERLU_LIB ${SDKROOT}/superlu/SuperLU_${MSVC_LIB_VERSION}_${PLATFORM}.lib)
set(OPENBLAS_LIB ${SDKROOT}/openblas/libopenblas_${PLATFORM}.lib)
set(USB_LIB) # unused
if(PLATFORM EQUAL 32)

22
toonz/sources/common/tiio/movsettings.cpp
View file

@ -18,13 +18,14 @@
#pragma warning(disable : 4996)
#endif
#define list List
#define map Map
#define iterator Iterator
#define float_t Float_t
#define int_fast8_t QT_int_fast8_t
#define int_fast16_t QT_int_fast16_t
#define uint_fast16_t QT_uint_fast16_t
#define list QuickTime_list
#define map QuickTime_map
#define iterator QuickTime_iterator
#define float_t QuickTime_float_t
#define GetProcessInformation QuickTime_GetProcessInformation
#define int_fast8_t QuickTime_int_fast8_t
#define int_fast16_t QuickTime_int_fast16_t
#define uint_fast16_t QuickTime_uint_fast16_t
#include "QTML.h"
#include "Movies.h"
@ -39,9 +40,10 @@
#undef map
#undef iterator
#undef float_t
#undef QT_int_fast8_t
#undef QT_int_fast16_t
#undef QT_uint_fast16_t
#undef GetProcessInformation
#undef int_fast8_t
#undef int_fast16_t
#undef uint_fast16_t
#else

2
toonz/sources/common/tsound/tsound_sdl.cpp
View file

@ -284,7 +284,7 @@ void TSoundOutputDeviceImp::play(const TSoundTrackP &st, TINT32 s0, TINT32 s1,
#endif
// myData->maxPacketSize = fileASBD.mFramesPerPacket *
//fileASBD.mBytesPerFrame;
// fileASBD.mBytesPerFrame;
{
// TThread::ScopedLock sl(MutexOut);
m_isPlaying = true;

62
toonz/sources/common/tsound/tsound_x.cpp
View file

@ -58,44 +58,44 @@ public:
bool verifyRate();
};
if (!isInterfaceSupported(AL_DEFAULT_OUTPUT, AL_SPEAKER_IF_TYPE))
return false; // throw TException("Speakers are not supported");
if (!isInterfaceSupported(AL_DEFAULT_OUTPUT, AL_SPEAKER_IF_TYPE))
return false; // throw TException("Speakers are not supported");
int dev = alGetResourceByName(AL_SYSTEM, (char *)"Headphone/Speaker",
AL_DEVICE_TYPE);
if (!dev) return false; // throw TException("invalid device speakers");
int dev =
alGetResourceByName(AL_SYSTEM, (char *)"Headphone/Speaker", AL_DEVICE_TYPE);
if (!dev) return false; // throw TException("invalid device speakers");
pvbuf[0].param = AL_DEFAULT_OUTPUT;
pvbuf[0].value.i = dev;
alSetParams(AL_SYSTEM, pvbuf, 1);
pvbuf[0].param = AL_DEFAULT_OUTPUT;
pvbuf[0].value.i = dev;
alSetParams(AL_SYSTEM, pvbuf, 1);
ALfixed buf[2] = {alDoubleToFixed(0), alDoubleToFixed(0)};
ALfixed buf[2] = {alDoubleToFixed(0), alDoubleToFixed(0)};
config = alNewConfig();
// qui devo metterci gli altoparlanti e poi setto i valori per il default
// output
pvbuf[0].param = AL_RATE;
pvbuf[0].value.ll = alDoubleToFixed((double)format.m_sampleRate);
pvbuf[1].param = AL_GAIN;
pvbuf[1].value.ptr = buf;
pvbuf[1].sizeIn = 8;
pvbuf[2].param = AL_INTERFACE;
pvbuf[2].value.i = AL_SPEAKER_IF_TYPE;
config = alNewConfig();
// qui devo metterci gli altoparlanti e poi setto i valori per il default
// output
pvbuf[0].param = AL_RATE;
pvbuf[0].value.ll = alDoubleToFixed((double)format.m_sampleRate);
pvbuf[1].param = AL_GAIN;
pvbuf[1].value.ptr = buf;
pvbuf[1].sizeIn = 8;
pvbuf[2].param = AL_INTERFACE;
pvbuf[2].value.i = AL_SPEAKER_IF_TYPE;
if (alSetParams(AL_DEFAULT_OUTPUT, pvbuf, 3) < 0) return false;
// throw TException("Unable to set params for output device");
if (alSetParams(AL_DEFAULT_OUTPUT, pvbuf, 3) < 0) return false;
// throw TException("Unable to set params for output device");
if (alSetChannels(config, format.m_channelCount) == -1)
return false; // throw TException("Error to setting audio hardware.");
if (alSetChannels(config, format.m_channelCount) == -1)
return false; // throw TException("Error to setting audio hardware.");
int bytePerSample = format.m_bitPerSample >> 3;
switch (bytePerSample) {
case 3:
bytePerSample++;
break;
default:
break;
}
int bytePerSample = format.m_bitPerSample >> 3;
switch (bytePerSample) {
case 3:
bytePerSample++;
break;
default:
break;
}
bool TSoundOutputDeviceImp::doOpenDevice(const TSoundTrackFormat &format) {
#ifdef __sgi

7
toonz/sources/common/twain/ttwain_stateW.c
View file

@ -26,7 +26,8 @@ int TTWAIN_LoadSourceManagerPD(void) {
GetWindowsDirectory(winDir, _MAX_PATH);
if (!winDir[0]) return FALSE;
strcat(winDir, "\\");
strcat(winDir, "\\system32\\");
// strcat(winDir, "\\");
strcat(winDir, DSM_FILENAME);
hDSMLib = LoadLibrary(winDir);
@ -51,8 +52,10 @@ return FALSE;
FreeLibrary(hDSMLib);
hDSMLib = NULL;
}
} else
} else {
DWORD err = GetLastError();
TTwainData.DSM_Entry = 0;
}
return (TTWAIN_GetState() >= TWAIN_SM_LOADED);
}
/*---------------------------------------------------------------------------*/

139
toonz/sources/common/twain/twain.h
View file

@ -1434,14 +1434,10 @@ typedef struct {
*/
#define DF_DSM2 0x10000000L /* added to the identity by the DSM */
#define DF_APP2 \
0x20000000L /* Set by the App to indicate it would \ \ \ \ \
prefer to use DSM2 */
0x20000000L /* Set by the App to indicate it would prefer to use DSM2 */
#define DF_DS2 \
0x40000000L /* Set by the DS to indicate it would \ \ \ \ \
prefer to use DSM2 */
#define DG_MASK \
0xFFFFL /* all Data Groups limited to 16 bit. Added for 2.1 \ \ \ \
*/
0x40000000L /* Set by the DS to indicate it would prefer to use DSM2 */
#define DG_MASK 0xFFFFL /* all Data Groups limited to 16 bit. Added for 2.1 */
/****************************************************************************
* *
@ -1488,19 +1484,16 @@ typedef struct {
/* misplaced */
#define DAT_ICCPROFILE \
0x0401 /* TW_MEMORY Added 1.91 This Data Argument is misplaced but \ \
\ \
\ \ \
0x0401 /* TW_MEMORY Added 1.91 This Data Argument is misplaced but \ \ \
belongs to the DG_IMAGE Data Group */
#define DAT_IMAGEMEMFILEXFER \
0x0402 /* TW_IMAGEMEMXFER Added 1.91 This Data Argument is misplaced but \ \
0x0402 /* TW_IMAGEMEMXFER Added 1.91 This Data Argument is misplaced but \
\ \
\ \ \
belongs to the DG_IMAGE Data Group */
#define DAT_ENTRYPOINT \
0x0403 /* TW_ENTRYPOINT Added 2.0 This Data Argument is misplaced but \ \
\ \
\ \ \
belongs to the DG_CONTROL Data Group */
/****************************************************************************
@ -1845,54 +1838,60 @@ typedef struct {
#define TWRC_INFONOTSUPPORTED 8
#define TWRC_DATANOTAVAILABLE 9
/* Condition Codes: Application gets these by doing DG_CONTROL DAT_STATUS
* MSG_GET. */
// Condition Codes: Application gets these
// by doing DG_CONTROL DAT_STATUS MSG_GET.
#define TWCC_CUSTOMBASE 0x8000
#define TWCC_SUCCESS 0 /* It worked! */
#define TWCC_BUMMER 1 /* Failure due to unknown causes */
#define TWCC_LOWMEMORY 2 /* Not enough memory to perform operation */
#define TWCC_NODS 3 /* No Data Source */
#define TWCC_MAXCONNECTIONS \
4 /* DS is connected to max possible applications */
#define TWCC_OPERATIONERROR \
5 /* DS or DSM reported error, application shouldn't */
#define TWCC_BADCAP 6 /* Unknown capability */
#define TWCC_BADPROTOCOL 9 /* Unrecognized MSG DG DAT combination */
#define TWCC_BADVALUE 10 /* Data parameter out of range */
#define TWCC_SEQERROR 11 /* DG DAT MSG out of expected sequence */
#define TWCC_BADDEST \
12 /* Unknown destination Application/Source in DSM_Entry */
#define TWCC_CAPUNSUPPORTED \
13 /* Capability not supported by source */
#define TWCC_CAPBADOPERATION \
14 /* Operation not supported by capability */
#define TWCC_CAPSEQERROR \
15 /* Capability has dependancy on other capability \ \ \ \
*/
#define TWCC_DENIED \
16 /* File System operation is denied (file is protected) Added 1.8 */
#define TWCC_FILEEXISTS \
17 /* Operation failed because file already exists. Added 1.8 */
#define TWCC_FILENOTFOUND \
18 /* File not found Added 1.8 */
#define TWCC_NOTEMPTY \
19 /* Operation failed because directory is not empty Added 1.8 */
#define TWCC_PAPERJAM \
20 /* The feeder is jammed Added 1.8 */
#define TWCC_PAPERDOUBLEFEED \
21 /* The feeder detected multiple pages Added 1.8 */
#define TWCC_FILEWRITEERROR \
22 /* Error writing the file (meant for things like disk full \ \ \ \
conditions)Added 1.8 */
#define TWCC_CHECKDEVICEONLINE \
23 /* The device went offline prior to or during this operation Added 1.8 */
#define TWCC_INTERLOCK 24 /* Added 2.0 */
#define TWCC_DAMAGEDCORNER 25 /* Added 2.0 */
#define TWCC_FOCUSERROR 26 /* Added 2.0 */
#define TWCC_DOCTOOLIGHT 27 /* Added 2.0 */
#define TWCC_DOCTOODARK 28 /* Added 2.0 */
#define TWCC_NOMEDIA 29 /* Added 2.1 */
// It worked!
#define TWCC_SUCCESS 0
// Failure due to unknown causes
#define TWCC_BUMMER 1
// Not enough memory to perform operation
#define TWCC_LOWMEMORY 2
// No Data Source
#define TWCC_NODS 3
// DS is connected to max possible applications
#define TWCC_MAXCONNECTIONS 4
// DS or DSM reported error, application shouldn't
#define TWCC_OPERATIONERROR 5
// Unknown capability
#define TWCC_BADCAP 6
// Unrecognized MSG DG DAT combination
#define TWCC_BADPROTOCOL 9
// Data parameter out of range
#define TWCC_BADVALUE 10
// DG DAT MSG out of expected sequence
#define TWCC_SEQERROR 11
// Unknown destination Application/Source in DSM_Entry
#define TWCC_BADDEST 12
// Capability not supported by source
#define TWCC_CAPUNSUPPORTED 13
// Operation not supported by capability
#define TWCC_CAPBADOPERATION 14
// Capability has dependancy on other capability
#define TWCC_CAPSEQERROR 15
// File System operation is denied (file is protected)
#define TWCC_DENIED 16 /* Added 1.8 */
// Operation failed because file already exists.
#define TWCC_FILEEXISTS 17 /* Added 1.8 */
// File not found
#define TWCC_FILENOTFOUND 18 /* Added 1.8 */
// Operation failed because directory is not empty
#define TWCC_NOTEMPTY 19 /* Added 1.8 */
// The feeder is jammed
#define TWCC_PAPERJAM 20 /* Added 1.8 */
// The feeder detected multiple pages
#define TWCC_PAPERDOUBLEFEED 21 /* Added 1.8 */
// Error writing the file (meant for things like disk full conditions)
#define TWCC_FILEWRITEERROR 22 /* Added 1.8 */
// The device went offline prior to or during this operation
#define TWCC_CHECKDEVICEONLINE 23 /* Added 1.8 */
#define TWCC_INTERLOCK 24 /* Added 2.0 */
#define TWCC_DAMAGEDCORNER 25 /* Added 2.0 */
#define TWCC_FOCUSERROR 26 /* Added 2.0 */
#define TWCC_DOCTOOLIGHT 27 /* Added 2.0 */
#define TWCC_DOCTOODARK 28 /* Added 2.0 */
#define TWCC_NOMEDIA 29 /* Added 2.1 */
/* bit patterns: for query the operation that are supported by the data source
* on a capability */
@ -1929,28 +1928,26 @@ typedef wchar_t TW_UNI512[512], FAR *pTW_UNI512;
#define TWFF_JPN 12 /* 1.91 */
#define DAT_TWUNKIDENTITY \
0x000b /* Additional message required for thunker to request the special \ \ \
\ \
identity information. */
#define DAT_SETUPFILEXFER2 \
0x0301 /* Data transfer via a file. deprecated - use DAT_SETUPFILEXFER \ \ \ \
instead*/
// Additional message required for thunker to request the special identity
// information.
#define DAT_TWUNKIDENTITY 0x000b
// Data transfer via a file. deprecated - use DAT_SETUPFILEXFER instead
#define DAT_SETUPFILEXFER2 0x0301
#define CAP_SUPPORTEDCAPSEXT 0x100c
#define CAP_FILESYSTEM // 0x????
#define CAP_PAGEMULTIPLEACQUIRE 0x1023 /* Added 1.8 */
#define CAP_PAPERBINDING 0x102f /* Added 1.8 */
#define CAP_PASSTHRU 0x1031 /* Added 1.8 */
#define CAP_POWERDOWNTIME \
0x1034 /* Added 1.8 */ // 0x1034 is reused by CAP_CAMERASIDE
// 0x1034 is reused by CAP_CAMERASIDE
#define CAP_POWERDOWNTIME 0x1034 /* Added 1.8 */
#define ACAP_AUDIOFILEFORMAT 0x1201 /* Added 1.8 */
#define MSG_CHECKSTATUS \
0x0201 /* Get status information - use MSG_GET instead */
// Get status information - use MSG_GET instead
#define MSG_CHECKSTATUS 0x0201
#define MSG_INVOKE_CALLBACK \
0x0903 /* Mac Only, deprecated - use DAT_NULL and MSG_xxx instead */
// Mac Only, deprecated - use DAT_NULL and MSG_xxx instead
#define MSG_INVOKE_CALLBACK 0x0903
#define TWSX_FILE2 3

Some files were not shown because too many files have changed in this diff Show more