diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..f3c14f1 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.lib filter=lfs diff=lfs merge=lfs -text +*.dll filter=lfs diff=lfs merge=lfs -text diff --git a/doc/how_to_build_win.md b/doc/how_to_build_win.md index bf513bd..158acaa 100644 --- a/doc/how_to_build_win.md +++ b/doc/how_to_build_win.md @@ -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` diff --git a/doc/how_to_build_win_ja.md b/doc/how_to_build_win_ja.md index cb63fb3..eaf4a8f 100644 --- a/doc/how_to_build_win_ja.md +++ b/doc/how_to_build_win_ja.md @@ -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`にファイルが生成されます diff --git a/thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9.lib b/thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9.lib deleted file mode 100644 index 6befc62..0000000 Binary files a/thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9.lib and /dev/null differ diff --git a/thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2013.lib b/thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2013.lib new file mode 100644 index 0000000..2d90099 --- /dev/null +++ b/thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2013.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98a2e2d1ebb2656551cfa940f0c6c7370b2dab3660ba9d305c0d2ac2b21638f5 +size 2493752 diff --git a/thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2013_64.lib b/thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2013_64.lib new file mode 100644 index 0000000..7c26200 --- /dev/null +++ b/thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2013_64.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd1f0ee4a952b127fa96390e88d693415aa8da621270557d039b07e0fc2738b1 +size 2516870 diff --git a/thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2015.lib b/thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2015.lib new file mode 100644 index 0000000..fb815b1 --- /dev/null +++ b/thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2015.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e3ee5c4fe4c1f33f7cac77363db8c69ec7dfdea1cf6d656ea0f46860b244cd2 +size 6654474 diff --git a/thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2015_64.lib b/thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2015_64.lib new file mode 100644 index 0000000..b2493e2 --- /dev/null +++ b/thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2015_64.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53fde671ed29e2cf712642120dc23e1ae9ba2e9106ef2dcf73a523690c475a0d +size 6687860 diff --git a/thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_64.lib b/thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_64.lib deleted file mode 100644 index 6a8c67b..0000000 Binary files a/thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_64.lib and /dev/null differ diff --git a/thirdparty/LibJPEG/jpeg-9/prj/LibJPEG/LibJPEG.vcxproj b/thirdparty/LibJPEG/jpeg-9/prj/LibJPEG/LibJPEG.vcxproj index 70ba9d2..c8edfcf 100644 --- a/thirdparty/LibJPEG/jpeg-9/prj/LibJPEG/LibJPEG.vcxproj +++ b/thirdparty/LibJPEG/jpeg-9/prj/LibJPEG/LibJPEG.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,27 +27,27 @@ StaticLibrary true MultiByte - v120 + v140 StaticLibrary true MultiByte - v120 + v140 StaticLibrary false true MultiByte - v120 + v140 StaticLibrary false true MultiByte - v120 + v140 diff --git a/thirdparty/Lz4/Lz4_131/lz4_32.lib b/thirdparty/Lz4/Lz4_131/lz4_32.lib index b84990b..87aaeb8 100644 Binary files a/thirdparty/Lz4/Lz4_131/lz4_32.lib and b/thirdparty/Lz4/Lz4_131/lz4_32.lib differ diff --git a/thirdparty/Lz4/Lz4_131/lz4_64.lib b/thirdparty/Lz4/Lz4_131/lz4_64.lib index 6fb261c..4b46d9c 100644 Binary files a/thirdparty/Lz4/Lz4_131/lz4_64.lib and b/thirdparty/Lz4/Lz4_131/lz4_64.lib differ diff --git a/thirdparty/glew/glew-1.9.0/bin/32bit/glew32.dll b/thirdparty/glew/glew-1.9.0/bin/32bit/glew32.dll index 53c041d..291feb4 100644 Binary files a/thirdparty/glew/glew-1.9.0/bin/32bit/glew32.dll and b/thirdparty/glew/glew-1.9.0/bin/32bit/glew32.dll differ diff --git a/thirdparty/glew/glew-1.9.0/bin/32bit/glew32mx.dll b/thirdparty/glew/glew-1.9.0/bin/32bit/glew32mx.dll index ddd865f..a7ae728 100644 Binary files a/thirdparty/glew/glew-1.9.0/bin/32bit/glew32mx.dll and b/thirdparty/glew/glew-1.9.0/bin/32bit/glew32mx.dll differ diff --git a/thirdparty/glew/glew-1.9.0/bin/64bit/glew32.dll b/thirdparty/glew/glew-1.9.0/bin/64bit/glew32.dll index 3a21d79..eafcdbd 100644 Binary files a/thirdparty/glew/glew-1.9.0/bin/64bit/glew32.dll and b/thirdparty/glew/glew-1.9.0/bin/64bit/glew32.dll differ diff --git a/thirdparty/glew/glew-1.9.0/bin/64bit/glew32mx.dll b/thirdparty/glew/glew-1.9.0/bin/64bit/glew32mx.dll index a010d0e..f7664f6 100644 Binary files a/thirdparty/glew/glew-1.9.0/bin/64bit/glew32mx.dll and b/thirdparty/glew/glew-1.9.0/bin/64bit/glew32mx.dll differ diff --git a/thirdparty/glew/glew-1.9.0/lib/glew32.lib b/thirdparty/glew/glew-1.9.0/lib/glew32.lib index 301a234..9731870 100644 Binary files a/thirdparty/glew/glew-1.9.0/lib/glew32.lib and b/thirdparty/glew/glew-1.9.0/lib/glew32.lib differ diff --git a/thirdparty/glew/glew-1.9.0/lib/glew32mx.lib b/thirdparty/glew/glew-1.9.0/lib/glew32mx.lib index 2f609f6..14ecb3f 100644 Binary files a/thirdparty/glew/glew-1.9.0/lib/glew32mx.lib and b/thirdparty/glew/glew-1.9.0/lib/glew32mx.lib differ diff --git a/thirdparty/glew/glew-1.9.0/lib/glew32mxs.lib b/thirdparty/glew/glew-1.9.0/lib/glew32mxs.lib index b6b31b6..f10728f 100644 Binary files a/thirdparty/glew/glew-1.9.0/lib/glew32mxs.lib and b/thirdparty/glew/glew-1.9.0/lib/glew32mxs.lib differ diff --git a/thirdparty/glew/glew-1.9.0/lib/glew32s.lib b/thirdparty/glew/glew-1.9.0/lib/glew32s.lib index 589a5bb..4fc2243 100644 Binary files a/thirdparty/glew/glew-1.9.0/lib/glew32s.lib and b/thirdparty/glew/glew-1.9.0/lib/glew32s.lib differ diff --git a/thirdparty/glew/glew-1.9.0/lib/glew64.lib b/thirdparty/glew/glew-1.9.0/lib/glew64.lib index 1982f98..53e7fb7 100644 Binary files a/thirdparty/glew/glew-1.9.0/lib/glew64.lib and b/thirdparty/glew/glew-1.9.0/lib/glew64.lib differ diff --git a/thirdparty/glew/glew-1.9.0/lib/glew64mx.lib b/thirdparty/glew/glew-1.9.0/lib/glew64mx.lib index 53e03b2..cbd6963 100644 Binary files a/thirdparty/glew/glew-1.9.0/lib/glew64mx.lib and b/thirdparty/glew/glew-1.9.0/lib/glew64mx.lib differ diff --git a/thirdparty/glew/glew-1.9.0/lib/glew64mxs.lib b/thirdparty/glew/glew-1.9.0/lib/glew64mxs.lib index 6e731b2..144bbbd 100644 Binary files a/thirdparty/glew/glew-1.9.0/lib/glew64mxs.lib and b/thirdparty/glew/glew-1.9.0/lib/glew64mxs.lib differ diff --git a/thirdparty/glew/glew-1.9.0/lib/glew64s.lib b/thirdparty/glew/glew-1.9.0/lib/glew64s.lib index 4316171..47a5dce 100644 Binary files a/thirdparty/glew/glew-1.9.0/lib/glew64s.lib and b/thirdparty/glew/glew-1.9.0/lib/glew64s.lib differ diff --git a/thirdparty/glut/3.7.6/lib/glut32.dll b/thirdparty/glut/3.7.6/lib/glut32.dll index a0c08b2..d112649 100644 Binary files a/thirdparty/glut/3.7.6/lib/glut32.dll and b/thirdparty/glut/3.7.6/lib/glut32.dll differ diff --git a/thirdparty/glut/3.7.6/lib/glut32.lib b/thirdparty/glut/3.7.6/lib/glut32.lib index b93eff8..b9f0291 100644 Binary files a/thirdparty/glut/3.7.6/lib/glut32.lib and b/thirdparty/glut/3.7.6/lib/glut32.lib differ diff --git a/thirdparty/glut/3.7.6/lib/glut64.dll b/thirdparty/glut/3.7.6/lib/glut64.dll index 5df6d98..b253b41 100644 Binary files a/thirdparty/glut/3.7.6/lib/glut64.dll and b/thirdparty/glut/3.7.6/lib/glut64.dll differ diff --git a/thirdparty/glut/3.7.6/lib/glut64.lib b/thirdparty/glut/3.7.6/lib/glut64.lib index d5f244d..ba5a93c 100644 Binary files a/thirdparty/glut/3.7.6/lib/glut64.lib and b/thirdparty/glut/3.7.6/lib/glut64.lib differ diff --git a/thirdparty/libpng-1.6.21/lib/libpng16.lib b/thirdparty/libpng-1.6.21/lib/libpng16.lib deleted file mode 100644 index 80935af..0000000 Binary files a/thirdparty/libpng-1.6.21/lib/libpng16.lib and /dev/null differ diff --git a/thirdparty/libpng-1.6.21/lib/libpng16_2013.lib b/thirdparty/libpng-1.6.21/lib/libpng16_2013.lib new file mode 100644 index 0000000..b093a1a --- /dev/null +++ b/thirdparty/libpng-1.6.21/lib/libpng16_2013.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d524d8a30a7f4db740cacf0df6e30094038a8d4fc0fe31c173f263dc1eab80c6 +size 1664856 diff --git a/thirdparty/libpng-1.6.21/lib/libpng16_2013_64.lib b/thirdparty/libpng-1.6.21/lib/libpng16_2013_64.lib new file mode 100644 index 0000000..0fb210e --- /dev/null +++ b/thirdparty/libpng-1.6.21/lib/libpng16_2013_64.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7633fee94be82dd5b4306087d48fb3355da5e31f65dc65e524c906101ede8aa9 +size 1685508 diff --git a/thirdparty/libpng-1.6.21/lib/libpng16_2013_64d.lib b/thirdparty/libpng-1.6.21/lib/libpng16_2013_64d.lib new file mode 100644 index 0000000..3f7fa81 --- /dev/null +++ b/thirdparty/libpng-1.6.21/lib/libpng16_2013_64d.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80f9061022636468b0210c4593e5068ca5effaf31f9f773588c07f8bfd06ce3a +size 1338884 diff --git a/thirdparty/libpng-1.6.21/lib/libpng16_2013d.lib b/thirdparty/libpng-1.6.21/lib/libpng16_2013d.lib new file mode 100644 index 0000000..c8b5a40 --- /dev/null +++ b/thirdparty/libpng-1.6.21/lib/libpng16_2013d.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f14eb2031a8deb31b42f10b41b0f88bdde539f7e604ad7c9c77ca07fdeadd99 +size 1152430 diff --git a/thirdparty/libpng-1.6.21/lib/libpng16_2015.lib b/thirdparty/libpng-1.6.21/lib/libpng16_2015.lib new file mode 100644 index 0000000..ca4827f --- /dev/null +++ b/thirdparty/libpng-1.6.21/lib/libpng16_2015.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d6be973caafd36b6dcf9b8fcb2d030ad2e0c3c523527fad7bbf7da9f9ba5b6e +size 56118 diff --git a/thirdparty/libpng-1.6.21/lib/libpng16_2015_64.lib b/thirdparty/libpng-1.6.21/lib/libpng16_2015_64.lib new file mode 100644 index 0000000..a10d494 --- /dev/null +++ b/thirdparty/libpng-1.6.21/lib/libpng16_2015_64.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4bdc9d683bea03f63d1b1f5f7f5c35669a959b59f9a9a0ef265bbf088241846 +size 1712226 diff --git a/thirdparty/libpng-1.6.21/lib/libpng16_2015_64d.lib b/thirdparty/libpng-1.6.21/lib/libpng16_2015_64d.lib new file mode 100644 index 0000000..c52ca83 --- /dev/null +++ b/thirdparty/libpng-1.6.21/lib/libpng16_2015_64d.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7853ab6972d0f56a0562d05ce1e3532f0dc4dec75359137f1ae9b7e0b19899b +size 1328584 diff --git a/thirdparty/libpng-1.6.21/lib/libpng16_2015d.lib b/thirdparty/libpng-1.6.21/lib/libpng16_2015d.lib new file mode 100644 index 0000000..a94d492 --- /dev/null +++ b/thirdparty/libpng-1.6.21/lib/libpng16_2015d.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be7784d0f86cf87b9dd965a32707e1a999b059d57fbeddb4066a033200e0fbc9 +size 56118 diff --git a/thirdparty/libpng-1.6.21/lib/libpng16_64.lib b/thirdparty/libpng-1.6.21/lib/libpng16_64.lib deleted file mode 100644 index 9eec319..0000000 Binary files a/thirdparty/libpng-1.6.21/lib/libpng16_64.lib and /dev/null differ diff --git a/thirdparty/libpng-1.6.21/lib/libpng16_64d.lib b/thirdparty/libpng-1.6.21/lib/libpng16_64d.lib deleted file mode 100644 index 72efb87..0000000 Binary files a/thirdparty/libpng-1.6.21/lib/libpng16_64d.lib and /dev/null differ diff --git a/thirdparty/libpng-1.6.21/lib/libpng16d.lib b/thirdparty/libpng-1.6.21/lib/libpng16d.lib deleted file mode 100644 index d245f14..0000000 Binary files a/thirdparty/libpng-1.6.21/lib/libpng16d.lib and /dev/null differ diff --git a/thirdparty/libpng-1.6.21/projects/vstudio/libpng/libpng.vcxproj b/thirdparty/libpng-1.6.21/projects/vstudio/libpng/libpng.vcxproj index 6820cf3..c1ab30f 100644 --- a/thirdparty/libpng-1.6.21/projects/vstudio/libpng/libpng.vcxproj +++ b/thirdparty/libpng-1.6.21/projects/vstudio/libpng/libpng.vcxproj @@ -1,5 +1,5 @@  - + Debug Library @@ -45,45 +45,45 @@ DynamicLibrary MultiByte true - v120 + v140 DynamicLibrary MultiByte true - v120 + v140 StaticLibrary MultiByte - v120 + v140 StaticLibrary MultiByte - v120 + v140 DynamicLibrary true MultiByte - v120 + v140 DynamicLibrary true MultiByte - v120 + v140 StaticLibrary MultiByte - v120 + v140 StaticLibrary MultiByte - v120 + v140 diff --git a/thirdparty/libpng-1.6.21/projects/vstudio/pnglibconf/pnglibconf.vcxproj b/thirdparty/libpng-1.6.21/projects/vstudio/pnglibconf/pnglibconf.vcxproj index 47ad860..e241749 100644 --- a/thirdparty/libpng-1.6.21/projects/vstudio/pnglibconf/pnglibconf.vcxproj +++ b/thirdparty/libpng-1.6.21/projects/vstudio/pnglibconf/pnglibconf.vcxproj @@ -1,5 +1,5 @@  - + Release @@ -20,14 +20,14 @@ false true MultiByte - v120 + v140 Application false true MultiByte - v120 + v140 diff --git a/thirdparty/libpng-1.6.21/projects/vstudio/pngstest/pngstest.vcxproj b/thirdparty/libpng-1.6.21/projects/vstudio/pngstest/pngstest.vcxproj index 4eb7a21..45c8368 100644 --- a/thirdparty/libpng-1.6.21/projects/vstudio/pngstest/pngstest.vcxproj +++ b/thirdparty/libpng-1.6.21/projects/vstudio/pngstest/pngstest.vcxproj @@ -1,5 +1,5 @@  - + Debug Library @@ -44,42 +44,42 @@ Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 diff --git a/thirdparty/libpng-1.6.21/projects/vstudio/pngtest/pngtest.vcxproj b/thirdparty/libpng-1.6.21/projects/vstudio/pngtest/pngtest.vcxproj index 510f327..dcbbb4c 100644 --- a/thirdparty/libpng-1.6.21/projects/vstudio/pngtest/pngtest.vcxproj +++ b/thirdparty/libpng-1.6.21/projects/vstudio/pngtest/pngtest.vcxproj @@ -1,5 +1,5 @@  - + Debug Library @@ -44,42 +44,42 @@ Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 diff --git a/thirdparty/libpng-1.6.21/projects/vstudio/pngunknown/pngunknown.vcxproj b/thirdparty/libpng-1.6.21/projects/vstudio/pngunknown/pngunknown.vcxproj index 783e87f..c5b9da6 100644 --- a/thirdparty/libpng-1.6.21/projects/vstudio/pngunknown/pngunknown.vcxproj +++ b/thirdparty/libpng-1.6.21/projects/vstudio/pngunknown/pngunknown.vcxproj @@ -1,5 +1,5 @@  - + Debug Library @@ -44,42 +44,42 @@ Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 diff --git a/thirdparty/libpng-1.6.21/projects/vstudio/pngvalid/pngvalid.vcxproj b/thirdparty/libpng-1.6.21/projects/vstudio/pngvalid/pngvalid.vcxproj index 5495e91..2ab56b2 100644 --- a/thirdparty/libpng-1.6.21/projects/vstudio/pngvalid/pngvalid.vcxproj +++ b/thirdparty/libpng-1.6.21/projects/vstudio/pngvalid/pngvalid.vcxproj @@ -1,5 +1,5 @@  - + Debug Library @@ -44,42 +44,42 @@ Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 diff --git a/thirdparty/libpng-1.6.21/projects/vstudio/zlib/zlib.vcxproj b/thirdparty/libpng-1.6.21/projects/vstudio/zlib/zlib.vcxproj index 04fc82c..973cb47 100644 --- a/thirdparty/libpng-1.6.21/projects/vstudio/zlib/zlib.vcxproj +++ b/thirdparty/libpng-1.6.21/projects/vstudio/zlib/zlib.vcxproj @@ -1,5 +1,5 @@  - + Debug Library @@ -56,27 +56,27 @@ StaticLibrary - v120 + v140 StaticLibrary - v120 + v140 StaticLibrary - v120 + v140 StaticLibrary - v120 + v140 StaticLibrary - v120 + v140 StaticLibrary - v120 + v140 StaticLibrary @@ -86,11 +86,11 @@ StaticLibrary - v120 + v140 StaticLibrary - v120 + v140 diff --git a/thirdparty/lzo/2.03/LZO_lib/lzo2.lib b/thirdparty/lzo/2.03/LZO_lib/lzo2.lib index caf95cc..9bdb7ee 100644 Binary files a/thirdparty/lzo/2.03/LZO_lib/lzo2.lib and b/thirdparty/lzo/2.03/LZO_lib/lzo2.lib differ diff --git a/thirdparty/lzo/2.03/LZO_lib/lzo2_64.lib b/thirdparty/lzo/2.03/LZO_lib/lzo2_64.lib index 383ec9c..ece8c41 100644 Binary files a/thirdparty/lzo/2.03/LZO_lib/lzo2_64.lib and b/thirdparty/lzo/2.03/LZO_lib/lzo2_64.lib differ diff --git a/thirdparty/lzo/2.03/lzo2.dll b/thirdparty/lzo/2.03/lzo2.dll index eefedbd..657ba97 100644 Binary files a/thirdparty/lzo/2.03/lzo2.dll and b/thirdparty/lzo/2.03/lzo2.dll differ diff --git a/thirdparty/lzo/2.03/lzo2.lib b/thirdparty/lzo/2.03/lzo2.lib index 383ec9c..ece8c41 100644 Binary files a/thirdparty/lzo/2.03/lzo2.lib and b/thirdparty/lzo/2.03/lzo2.lib differ diff --git a/thirdparty/openblas/libopenblas_32.lib b/thirdparty/openblas/libopenblas_32.lib index d4ddb41..6e7f8ef 100644 Binary files a/thirdparty/openblas/libopenblas_32.lib and b/thirdparty/openblas/libopenblas_32.lib differ diff --git a/thirdparty/openblas/libopenblas_64.lib b/thirdparty/openblas/libopenblas_64.lib index c88c350..e2081dc 100644 Binary files a/thirdparty/openblas/libopenblas_64.lib and b/thirdparty/openblas/libopenblas_64.lib differ diff --git a/thirdparty/superlu/SuperLU_2013_32.d.lib b/thirdparty/superlu/SuperLU_2013_32.d.lib new file mode 100644 index 0000000..dcfe7a4 --- /dev/null +++ b/thirdparty/superlu/SuperLU_2013_32.d.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cba5a4786d3ebc023574dfc96d805b2abd8ac530ed8eb4f4d5a1c38f86686a7d +size 2045134 diff --git a/thirdparty/superlu/SuperLU_2013_32.lib b/thirdparty/superlu/SuperLU_2013_32.lib new file mode 100644 index 0000000..0ab007a --- /dev/null +++ b/thirdparty/superlu/SuperLU_2013_32.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85f6c472a61cd56b8ff924b7432f35c5527bf09bcbcdd9f789ebd1d4afe93847 +size 3007274 diff --git a/thirdparty/superlu/SuperLU_2013_64.d.lib b/thirdparty/superlu/SuperLU_2013_64.d.lib new file mode 100644 index 0000000..31dcb85 --- /dev/null +++ b/thirdparty/superlu/SuperLU_2013_64.d.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a821bebd460291f2900194c56ba26f118ba18d261eaac022a15f6ad96248b7d +size 2313496 diff --git a/thirdparty/superlu/SuperLU_2013_64.lib b/thirdparty/superlu/SuperLU_2013_64.lib new file mode 100644 index 0000000..1498bcc --- /dev/null +++ b/thirdparty/superlu/SuperLU_2013_64.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0424b4c170b2013021c33eb4661baf5a54333c2af8bb7ac7fa9a56057f05493d +size 3053094 diff --git a/thirdparty/superlu/SuperLU_2015_32.d.lib b/thirdparty/superlu/SuperLU_2015_32.d.lib new file mode 100644 index 0000000..84a9e12 --- /dev/null +++ b/thirdparty/superlu/SuperLU_2015_32.d.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13127d7d806edabd46ab5f5cda7153bb5dab371ea99d963116814fe13cdfaf95 +size 2051218 diff --git a/thirdparty/superlu/SuperLU_2015_32.lib b/thirdparty/superlu/SuperLU_2015_32.lib new file mode 100644 index 0000000..5b2bd42 --- /dev/null +++ b/thirdparty/superlu/SuperLU_2015_32.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f178f968d07b3c946507c5efec4bca34e2b970a2437b158dd19c675972cffa04 +size 15460614 diff --git a/thirdparty/superlu/SuperLU_2015_64.d.lib b/thirdparty/superlu/SuperLU_2015_64.d.lib new file mode 100644 index 0000000..892b07c --- /dev/null +++ b/thirdparty/superlu/SuperLU_2015_64.d.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61d3062ef35e057607a4c47ee97003f284721183bf7a375eb05bddaa2c95cdcf +size 2405788 diff --git a/thirdparty/superlu/SuperLU_2015_64.lib b/thirdparty/superlu/SuperLU_2015_64.lib new file mode 100644 index 0000000..9f0321c --- /dev/null +++ b/thirdparty/superlu/SuperLU_2015_64.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:003b983d6fcc9ab5b86f115ecda0d69529121e69fd987990f14c7f4353343807 +size 15006298 diff --git a/thirdparty/superlu/SuperLU_32.d.lib b/thirdparty/superlu/SuperLU_32.d.lib deleted file mode 100644 index e5637a3..0000000 Binary files a/thirdparty/superlu/SuperLU_32.d.lib and /dev/null differ diff --git a/thirdparty/superlu/SuperLU_32.lib b/thirdparty/superlu/SuperLU_32.lib deleted file mode 100644 index 328b9c2..0000000 Binary files a/thirdparty/superlu/SuperLU_32.lib and /dev/null differ diff --git a/thirdparty/superlu/SuperLU_4.1/lib/libsuperlu_4.0.lib b/thirdparty/superlu/SuperLU_4.1/lib/libsuperlu_4.0.lib index 8033b8b..9f0321c 100644 Binary files a/thirdparty/superlu/SuperLU_4.1/lib/libsuperlu_4.0.lib and b/thirdparty/superlu/SuperLU_4.1/lib/libsuperlu_4.0.lib differ diff --git a/thirdparty/superlu/SuperLU_4.1/prj/SuperLU/SuperLU.sln b/thirdparty/superlu/SuperLU_4.1/prj/SuperLU/SuperLU.sln index d446da9..2de7bfb 100644 --- a/thirdparty/superlu/SuperLU_4.1/prj/SuperLU/SuperLU.sln +++ b/thirdparty/superlu/SuperLU_4.1/prj/SuperLU/SuperLU.sln @@ -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 diff --git a/thirdparty/superlu/SuperLU_64.d.lib b/thirdparty/superlu/SuperLU_64.d.lib deleted file mode 100644 index 7afc65d..0000000 Binary files a/thirdparty/superlu/SuperLU_64.d.lib and /dev/null differ diff --git a/thirdparty/superlu/SuperLU_64.lib b/thirdparty/superlu/SuperLU_64.lib deleted file mode 100644 index d2d2d60..0000000 Binary files a/thirdparty/superlu/SuperLU_64.lib and /dev/null differ diff --git a/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3.lib b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3.lib deleted file mode 100644 index 9ee0669..0000000 Binary files a/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3.lib and /dev/null differ diff --git a/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013.lib b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013.lib new file mode 100644 index 0000000..c1dc461 --- /dev/null +++ b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89c01765c3108dfd6e3ebf793250a3da123193c7a1c256ed785a42a72157fcd4 +size 3293724 diff --git a/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013_64.lib b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013_64.lib new file mode 100644 index 0000000..325a448 --- /dev/null +++ b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013_64.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65fc3676ea3f1716639cd80a50921134fc148227bb27448fa195fef30219053e +size 3307736 diff --git a/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013_64d.lib b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013_64d.lib new file mode 100644 index 0000000..4cce559 --- /dev/null +++ b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013_64d.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04fbb1f045853101f78076eac6773718237dfb89dabf712217528f5bf018a88f +size 1730990 diff --git a/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013d.lib b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013d.lib new file mode 100644 index 0000000..50e7964 --- /dev/null +++ b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013d.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79ec3503f8654a7bd7feabe7f62617be2b5eca7a03820630ecab6c99b890ffc7 +size 1963882 diff --git a/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015.lib b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015.lib new file mode 100644 index 0000000..cc151bc --- /dev/null +++ b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a7941d8d8a8278ea62ead65f63af9bce7801614ee2e5f629ca107a14fc60594 +size 6199378 diff --git a/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015_64.lib b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015_64.lib new file mode 100644 index 0000000..44cb16c --- /dev/null +++ b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015_64.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:931554a80f424a46e248c3f7f95ac3ee039b3f54e0f379ef1aab04462e715f86 +size 6227900 diff --git a/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015_64d.lib b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015_64d.lib new file mode 100644 index 0000000..3c547a8 --- /dev/null +++ b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015_64d.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10f1b5baecb1e850ca8994e4f6f4347f9426ddb77b841178ee734fb609c0370f +size 2094704 diff --git a/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015d.lib b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015d.lib new file mode 100644 index 0000000..dd05885 --- /dev/null +++ b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015d.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4dfbbc0a9446626227bd6ea2a930b5b3dc83d2295c08459bc3b6f6920e288d7 +size 1859564 diff --git a/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_64.lib b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_64.lib deleted file mode 100644 index 0f55555..0000000 Binary files a/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_64.lib and /dev/null differ diff --git a/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_64d.lib b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_64d.lib deleted file mode 100644 index e89ded0..0000000 Binary files a/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_64d.lib and /dev/null differ diff --git a/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3d.lib b/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3d.lib deleted file mode 100644 index f93f9c4..0000000 Binary files a/thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3d.lib and /dev/null differ diff --git a/thirdparty/tiff-4.0.3/prj/LibTIFF/LibTIFF.vcxproj b/thirdparty/tiff-4.0.3/prj/LibTIFF/LibTIFF.vcxproj index 1ee322a..b241a67 100644 --- a/thirdparty/tiff-4.0.3/prj/LibTIFF/LibTIFF.vcxproj +++ b/thirdparty/tiff-4.0.3/prj/LibTIFF/LibTIFF.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -85,27 +85,27 @@ StaticLibrary true MultiByte - v120 + v140 StaticLibrary true MultiByte - v120 + v140 StaticLibrary false true MultiByte - v120 + v140 StaticLibrary false true MultiByte - v120 + v140 diff --git a/thirdparty/zlib-1.2.8/lib/zlib-1.2.8.lib b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8.lib deleted file mode 100644 index f4400b2..0000000 Binary files a/thirdparty/zlib-1.2.8/lib/zlib-1.2.8.lib and /dev/null differ diff --git a/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013.lib b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013.lib new file mode 100644 index 0000000..8fff065 --- /dev/null +++ b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:891a625fd0bc015e65d7005c8445b0ff74befb8d028bef303fb9cc63a15445af +size 449120 diff --git a/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013_64.lib b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013_64.lib new file mode 100644 index 0000000..fad0ff8 --- /dev/null +++ b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013_64.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d60bb202e3a94885014d0edb100b76f9e421afe12693693b0a316a31ea1b9274 +size 458468 diff --git a/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013_64d.lib b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013_64d.lib new file mode 100644 index 0000000..bc3242d --- /dev/null +++ b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013_64d.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60bd0552d5c852c5877e589856aae72a5619e5485ff457a7665a6c1243ea34fe +size 278548 diff --git a/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013d.lib b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013d.lib new file mode 100644 index 0000000..39805e9 --- /dev/null +++ b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013d.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a971e5b0d7dbef04506b7d17330f658721f6c41b96935986cf07bc727f10a26 +size 305120 diff --git a/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015.lib b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015.lib new file mode 100644 index 0000000..d0a83ed --- /dev/null +++ b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2eda63665387de539ce96b136b1dd0f9699ec093f1c91b846e0374b1ed9f1c2f +size 809418 diff --git a/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015_64.lib b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015_64.lib new file mode 100644 index 0000000..2e9bf88 --- /dev/null +++ b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015_64.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8015f2fdddc5b470d589e49dccb8acb561fb63cb05284e5ff9cbb479a7c3c25d +size 817990 diff --git a/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015_64d.lib b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015_64d.lib new file mode 100644 index 0000000..c38f124 --- /dev/null +++ b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015_64d.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed006dc3e4e5c415743af576ebe4967d883f88b0f9765fffe65555e2e426e123 +size 351702 diff --git a/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015d.lib b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015d.lib new file mode 100644 index 0000000..14ba653 --- /dev/null +++ b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015d.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c0b237f20384c74575569fd0a299b103b3e2596443604eb336d5a03af86d2f7 +size 308484 diff --git a/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_64.lib b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_64.lib deleted file mode 100644 index f85e2be..0000000 Binary files a/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_64.lib and /dev/null differ diff --git a/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_64d.lib b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_64d.lib deleted file mode 100644 index 7f6cf4d..0000000 Binary files a/thirdparty/zlib-1.2.8/lib/zlib-1.2.8_64d.lib and /dev/null differ diff --git a/thirdparty/zlib-1.2.8/lib/zlib-1.2.8d.lib b/thirdparty/zlib-1.2.8/lib/zlib-1.2.8d.lib deleted file mode 100644 index a2cdb5e..0000000 Binary files a/thirdparty/zlib-1.2.8/lib/zlib-1.2.8d.lib and /dev/null differ diff --git a/thirdparty/zlib-1.2.8/prj/zlib/zlib.vcxproj b/thirdparty/zlib-1.2.8/prj/zlib/zlib.vcxproj index 352d2f5..9b356c7 100644 --- a/thirdparty/zlib-1.2.8/prj/zlib/zlib.vcxproj +++ b/thirdparty/zlib-1.2.8/prj/zlib/zlib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,27 +27,27 @@ StaticLibrary true MultiByte - v120 + v140 StaticLibrary true MultiByte - v120 + v140 StaticLibrary false true MultiByte - v120 + v140 StaticLibrary false true MultiByte - v120 + v140 diff --git a/thirdparty/zlib-1.2.8/prj/zlib/zlib.vcxproj.filters b/thirdparty/zlib-1.2.8/prj/zlib/zlib.vcxproj.filters index 57cbbe4..600167c 100644 --- a/thirdparty/zlib-1.2.8/prj/zlib/zlib.vcxproj.filters +++ b/thirdparty/zlib-1.2.8/prj/zlib/zlib.vcxproj.filters @@ -15,84 +15,84 @@ - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt index 92964dd..28fd634 100644 --- a/toonz/sources/CMakeLists.txt +++ b/toonz/sources/CMakeLists.txt @@ -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) diff --git a/toonz/sources/common/tiio/movsettings.cpp b/toonz/sources/common/tiio/movsettings.cpp index 9fe24f8..c0107bf 100644 --- a/toonz/sources/common/tiio/movsettings.cpp +++ b/toonz/sources/common/tiio/movsettings.cpp @@ -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 diff --git a/toonz/sources/common/tsound/tsound_sdl.cpp b/toonz/sources/common/tsound/tsound_sdl.cpp index 80ffaad..898c218 100644 --- a/toonz/sources/common/tsound/tsound_sdl.cpp +++ b/toonz/sources/common/tsound/tsound_sdl.cpp @@ -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; diff --git a/toonz/sources/common/tsound/tsound_x.cpp b/toonz/sources/common/tsound/tsound_x.cpp index 38cc8db..120acca 100644 --- a/toonz/sources/common/tsound/tsound_x.cpp +++ b/toonz/sources/common/tsound/tsound_x.cpp @@ -58,44 +58,44 @@ public: bool verifyRate(); }; - 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"); - - pvbuf[0].param = AL_DEFAULT_OUTPUT; - pvbuf[0].value.i = dev; - alSetParams(AL_SYSTEM, pvbuf, 1); - - 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; - - 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."); - - int bytePerSample = format.m_bitPerSample >> 3; - switch (bytePerSample) { - case 3: - bytePerSample++; - break; - default: - break; - } +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"); + +pvbuf[0].param = AL_DEFAULT_OUTPUT; +pvbuf[0].value.i = dev; +alSetParams(AL_SYSTEM, pvbuf, 1); + +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; + +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."); + +int bytePerSample = format.m_bitPerSample >> 3; +switch (bytePerSample) { +case 3: + bytePerSample++; + break; +default: + break; +} bool TSoundOutputDeviceImp::doOpenDevice(const TSoundTrackFormat &format) { #ifdef __sgi diff --git a/toonz/sources/common/twain/ttwain_stateW.c b/toonz/sources/common/twain/ttwain_stateW.c index 282efac..95d8f4c 100644 --- a/toonz/sources/common/twain/ttwain_stateW.c +++ b/toonz/sources/common/twain/ttwain_stateW.c @@ -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); } /*---------------------------------------------------------------------------*/ diff --git a/toonz/sources/common/twain/twain.h b/toonz/sources/common/twain/twain.h index 4e6695b..4ffd804 100644 --- a/toonz/sources/common/twain/twain.h +++ b/toonz/sources/common/twain/twain.h @@ -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 diff --git a/toonz/sources/image/mov/tiio_mov.h b/toonz/sources/image/mov/tiio_mov.h index 1793ec4..2e58cd8 100644 --- a/toonz/sources/image/mov/tiio_mov.h +++ b/toonz/sources/image/mov/tiio_mov.h @@ -12,13 +12,14 @@ // QuickTime includes namespace QuickTime { -#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" @@ -27,15 +28,16 @@ namespace QuickTime { #include "Sound.h" #include "QuickTimeComponents.h" -#include "tquicktime.h" - #undef list #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 + +#include "tquicktime.h" } // namespace QuickTime // Toonz includes diff --git a/toonz/sources/image/pli/pli_io.cpp b/toonz/sources/image/pli/pli_io.cpp index 14dbcea..e7c7867 100644 --- a/toonz/sources/image/pli/pli_io.cpp +++ b/toonz/sources/image/pli/pli_io.cpp @@ -280,18 +280,7 @@ UINT TStyleParam::getSize() { /*=====================================================================*/ -#ifdef _WIN32 #define CHECK_FOR_READ_ERROR(filePath) -#else -#define CHECK_FOR_READ_ERROR(filePath) \ - { \ - /*if (m_iChan.flags()&(ios::failbit|ios::eofbit)) \ \ \ \ \ - { \ \ \ \ \ - m_lastError = PREMATURE_EOF; \ \ \ \ \ - throw TImageException( filePath, "Error on reading file"); \ \ \ \ \ - }*/ \ - } -#endif #define CHECK_FOR_WRITE_ERROR(filePath) \ { \ diff --git a/toonz/sources/image/tiio.cpp b/toonz/sources/image/tiio.cpp index 336e6b0..047b936 100644 --- a/toonz/sources/image/tiio.cpp +++ b/toonz/sources/image/tiio.cpp @@ -22,14 +22,26 @@ #ifndef x64 -#define float_t Float_t -#define GetProcessInformation GetProcessInformation_ +#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 "QuickTimeComponents.h" #include "tquicktime.h" +#undef list +#undef map +#undef iterator #undef float_t #undef GetProcessInformation +#undef int_fast8_t +#undef int_fast16_t +#undef uint_fast16_t #endif diff --git a/toonz/sources/include/movsettings.h b/toonz/sources/include/movsettings.h index 37c4687..591d538 100644 --- a/toonz/sources/include/movsettings.h +++ b/toonz/sources/include/movsettings.h @@ -17,14 +17,14 @@ #ifdef _WIN32 -#define list List -#define map Map -#define iterator Iterator -#define float_t Float_t -#define GetProcessInformation GetProcessInformation_ -#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" @@ -40,9 +40,9 @@ #undef iterator #undef float_t #undef GetProcessInformation -#undef QT_int_fast8_t -#undef QT_int_fast16_t -#undef QT_uint_fast16_t +#undef int_fast8_t +#undef int_fast16_t +#undef uint_fast16_t #include "texception.h" #include "tpropertytype.h" diff --git a/toonz/sources/include/toonz4.6/raster.h b/toonz/sources/include/toonz4.6/raster.h index 65905c2..bba0854 100644 --- a/toonz/sources/include/toonz4.6/raster.h +++ b/toonz/sources/include/toonz4.6/raster.h @@ -31,28 +31,31 @@ typedef enum { } RAS_TYPE; #ifdef VECCHIO -' typedef enum { RAS_NONE, RAS_BW, /* 1 bit, B=0, W=1, first pixel in bit 7 */ RAS_WB, /* " , W=0, B=1, " */ RAS_GR8, /* grey tones, 8 bits */ RAS_CM8, /* color-mapped, 8 bits */ - RAS_GR16, /* grey tones, 16 bits */ - RAS_RGB16, /* RGB 5+6+5 bits, red most significant */ - RAS_RLEBW, /* 1 bit compressed(quick casm format) */ - RAS_RGB, /* 1 byte per color channel */ - RAS_RGB_, /* LPIXEL, matte channel ignored, for display */ - RAS_RGBM, /* LPIXEL, matte channel considered */ - RAS_RGBM64, /* SPIXEL, matte channel considered */ - RAS_RGB_64, /* SPIXEL, matte channel ignored */ - RAS_MBW16, /* 16 images of 1 bit per pixel, B=0, W=1 */ - RAS_CM8S4, /* cmapped, 8 bits, standard SGI 16-color colormap */ - RAS_CM8S8, /* cmapped, 8 bits, standard SGI 256-color colormap */ - RAS_CM16S4, /* cmapped, 16 bits, standard SGI 16-color colormap */ - RAS_CM16S8, /* cmapped, 16 bits, standard SGI 256-color colormap */ - RAS_CM16S12, /* cmapped, 16 bits, standard SGI+Toonz 4096-color colormap */ - // RAS_CM24, /* cmapped, 8+8+8 bits (ink, paint, ramp), +8 bits extra - // (MSB) */ - RAS_CM16, /* color-mapped, 16 bits */ - RAS_CM32, /* cmapped, 12+12+8 bits (ink, paint, ramp) */ - RAS_HOW_MANY -} -RAS_TYPE; +typedef enum { + RAS_NONE, + RAS_BW, // 1 bit, B=0, W=1, first pixel in bit 7 + RAS_WB, // " , W=0, B=1, " + RAS_GR8, // grey tones, 8 bits + RAS_CM8, // color-mapped, 8 bits + RAS_GR16, // grey tones, 16 bits + RAS_RGB16, // RGB 5+6+5 bits, red most significant + RAS_RLEBW, // 1 bit compressed(quick casm format) + RAS_RGB, // 1 byte per color channel/ + RAS_RGB_, // LPIXEL, matte channel ignored, for display + RAS_RGBM, // LPIXEL, matte channel considered + RAS_RGBM64, // SPIXEL, matte channel considered + RAS_RGB_64, // SPIXEL, matte channel ignored + RAS_MBW16, // 16 images of 1 bit per pixel, B=0, W=1 + RAS_CM8S4, // cmapped, 8 bits, standard SGI 16-color colormap + RAS_CM8S8, // cmapped, 8 bits, standard SGI 256-color colormap + RAS_CM16S4, // cmapped, 16 bits, standard SGI 16-color colormap + RAS_CM16S8, // cmapped, 16 bits, standard SGI 256-color colormap + RAS_CM16S12, // cmapped, 16 bits, standard SGI+Toonz 4096-color colormap + // RAS_CM24, // cmapped, 8+8+8 bits (ink, paint, ramp), +8 bits extra (MSB) + RAS_CM16, // color-mapped, 16 bits + RAS_CM32, // cmapped, 12+12+8 bits (ink, paint, ramp) + RAS_HOW_MANY +} RAS_TYPE; #endif typedef struct { diff --git a/toonz/sources/include/toonzqt/updatechecker.h b/toonz/sources/include/toonzqt/updatechecker.h index 71f8d36..32b4257 100644 --- a/toonz/sources/include/toonzqt/updatechecker.h +++ b/toonz/sources/include/toonzqt/updatechecker.h @@ -10,6 +10,7 @@ #include #include #include +#include #undef DVAPI #undef DVVAR diff --git a/toonz/sources/tnzbase/tscanner/tscanner.cpp b/toonz/sources/tnzbase/tscanner/tscanner.cpp index 2803436..2a3aeb8 100644 --- a/toonz/sources/tnzbase/tscanner/tscanner.cpp +++ b/toonz/sources/tnzbase/tscanner/tscanner.cpp @@ -377,7 +377,7 @@ TScanner *TScanner::instance() { if (!instanceEpson) instanceEpson = new TScannerEpson(); } - return (m_isTwain) ? instanceTwain : instanceEpson; + return (m_isTwain ? instanceTwain : instanceEpson); #endif } diff --git a/toonz/sources/tnzext/tlin/tlin_cblas_wrap.cpp b/toonz/sources/tnzext/tlin/tlin_cblas_wrap.cpp index 3187888..8e104f8 100644 --- a/toonz/sources/tnzext/tlin/tlin_cblas_wrap.cpp +++ b/toonz/sources/tnzext/tlin/tlin_cblas_wrap.cpp @@ -5,6 +5,14 @@ #include #include +#if defined(_MSC_VER) && (_MSC_VER >= 1900) +// dummy definition for linker +#include +extern "C" { +void __imp__cprintf(char const *const _Format) { _cprintf(_Format); } +} +#endif + // blasint may either be common 4 bytes or extended 8 (long)... // Replace this and REBUILD the CBLAS with extended int if needed. typedef int blasint; @@ -60,7 +68,6 @@ incx and incy are the increments in array access - ie x[incx * i] and y[incy * j] values only are considered (=> we'll use 1). */ - double *_x = const_cast(x); cblas_daxpy(n, 1.0, _x, 1, y, 1); diff --git a/toonz/sources/toonz/cleanuppopup.cpp b/toonz/sources/toonz/cleanuppopup.cpp index 3713965..252443d 100644 --- a/toonz/sources/toonz/cleanuppopup.cpp +++ b/toonz/sources/toonz/cleanuppopup.cpp @@ -676,7 +676,9 @@ bool CleanupPopup::analyzeCleanupList() { clt->m_frames.erase( std::remove_if(clt->m_frames.begin(), clt->m_frames.end(), - boost::bind(&TLevel::Table::count, table, _1)), + [table](TLevel::Table::key_type const &key) { + return table->count(key); + }), clt->m_frames.end()); } } diff --git a/toonz/sources/toonz/cleanupsettingspopup.cpp b/toonz/sources/toonz/cleanupsettingspopup.cpp index 593f4af..505bb65 100644 --- a/toonz/sources/toonz/cleanupsettingspopup.cpp +++ b/toonz/sources/toonz/cleanupsettingspopup.cpp @@ -847,22 +847,18 @@ public: //********************************************************************** // Open Popup Command //********************************************************************** - -/* -class CleanupSettingsFactory final : public TPanelFactory -{ +#if 0 +class CleanupSettingsFactory final : public TPanelFactory { public: - CleanupSettingsFactory() : TPanelFactory("CleanupSettings") {} - void initialize(TPanel* panel) - { - CleanupSettings* cleanupSettings = new CleanupSettings(panel); + void initialize(TPanel *panel) { + CleanupSettings *cleanupSettings = new CleanupSettings(panel); panel->setWidget(cleanupSettings); - bool ret = QObject::connect( - cleanupSettings, SIGNAL(windowTitleChanged(const QString&)), - panel, SLOT(setWindowTitle(const QString&))); + bool ret = QObject::connect(cleanupSettings, + SIGNAL(windowTitleChanged(const QString &)), + panel, SLOT(setWindowTitle(const QString &))); assert(ret); panel->setMinimumSize(320, 150); @@ -870,7 +866,7 @@ public: } } cleanupSettingsFactory; -*/ +#endif OpenFloatingPanel cleanupSettingsCommand(MI_CleanupSettings, "CleanupSettings", QObject::tr("Cleanup Settings")); diff --git a/toonz/sources/toonz/psdsettingspopup.cpp b/toonz/sources/toonz/psdsettingspopup.cpp index c30000a..d73ccf5 100644 --- a/toonz/sources/toonz/psdsettingspopup.cpp +++ b/toonz/sources/toonz/psdsettingspopup.cpp @@ -127,9 +127,9 @@ PsdSettingsPopup::PsdSettingsPopup() m_parentDir = new QLabel(tr("")); m_parentDir->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); m_parentDir->setFixedHeight(WidgetHeight); - QLabel *nmLbl = new QLabel(tr("Name:")); + QLabel *nmLbl = new QLabel(tr("Name:")); nmLbl->setObjectName("TitleTxtLabel"); - QLabel *ptLbl = new QLabel(tr("Path:")); + QLabel *ptLbl = new QLabel(tr("Path:")); ptLbl->setObjectName("TitleTxtLabel"); QGridLayout *grid = new QGridLayout(); grid->setColumnMinimumWidth(0, 65); diff --git a/toonz/sources/toonzlib/autopos.cpp b/toonz/sources/toonzlib/autopos.cpp index 68219ba..b596d64 100644 --- a/toonz/sources/toonzlib/autopos.cpp +++ b/toonz/sources/toonzlib/autopos.cpp @@ -230,177 +230,11 @@ found: /*---------------------------------------------------------------------------*/ -// static void make_bitcount (int b[256], int count_zeros) -//{ -// int i, j, xorValue; - -// xorValue = count_zeros ? 0xff : 0; -// for (i = 0; i < 256; i++) -// { -// b[i] = 0; -// for (j = i ^ xorValue; j; j &= j - 1) -// b[i]++; -// } -//} - -/*---------------------------------------------------------------------------*/ - -// static int autoalign_bw (UCHAR *buffer_bw, bool isWB /*true se WB, false se -// BW*/, -// int wrap, int lx, int ly, int pix_origin, -// int dpix_dx, int dpix_dy, int strip_width) -//{ -/* SOLTANTO PER MAIN SCAN VERTICALE */ -/* LA PARTE DOPO found FUNZIONA SOLO PER ly MULTIPLO DI 8 */ -/* LA PARTE PRIMA BUTTA VIA I BYTE FRAZIONARI */ -/* -int first_x[2], dx_dcol[2], target[2]; -int i, x, y, cols; -int col_value, threshold; -int consec_black_cols, consec_white_cols, black_strip_edge; -UCHAR *byte, *origin, white; -int delta_x, delta_bytes; -int ly_bytes, dbytes_dx, dbytes_dybytes; -int bitcount[256]; - -make_bitcount (bitcount, isWB); - -ly_bytes = ly / 8; -dbytes_dx = dpix_dx / 8; -dbytes_dybytes = dpix_dy; - -if (dpix_dy > 0 && (pix_origin & 7) != 0) - pix_origin = (pix_origin | 7) + 1; -if (dpix_dy < 0 && (pix_origin & 7) != 7) - pix_origin = (pix_origin & ~7) - 1; - -origin = buffer_bw + (pix_origin + 7) / 8; - -first_x[0] = 0; dx_dcol[0] = 1; target[0] = strip_width / 2; -first_x[1] = lx - 1; dx_dcol[1] = -1; target[1] = lx - 1 - strip_width / 2; - -threshold = ly / 2; - -for (i = 0; i < 2; i++) - { - consec_black_cols = 0; - consec_white_cols = 0; - black_strip_edge = 0; - for (x = first_x[i], cols = 0; cols < strip_width; x += dx_dcol[i], cols++) - { - col_value = 0; - byte = origin + x * dbytes_dx; - for (y = 0; y < ly_bytes; y++) - { - col_value += bitcount[*byte]; - byte += dbytes_dybytes; - } - if (col_value < threshold) - { - consec_white_cols = 0; - consec_black_cols++; - if (consec_black_cols >= AUTOAL_BLACK_COLS) - black_strip_edge = x; - } - else - { - consec_black_cols = 0; - consec_white_cols++; - if (consec_white_cols >= AUTOAL_WHITE_COLS && black_strip_edge) - goto found; - } - } - } -return FALSE; - -found: - -white = isWB ? 0 : 255; -for (x = first_x[i], cols = 0; cols < strip_width; x += dx_dcol[i], cols++) - { - byte = origin + x * dbytes_dx; - for (y = 0; y < ly_bytes; y++) - { - *byte = white; - byte += dbytes_dybytes; - } - } -delta_x = target[i] - black_strip_edge; -delta_bytes = delta_x * dbytes_dx; -if (delta_x > 0) - { - for (x = lx - 1 - delta_x; x >= 0; x--) - { - byte = origin + x * dbytes_dx; - for (y = 0; y < ly_bytes; y++) - { - *(byte + delta_bytes) = *byte; - byte += dbytes_dybytes; - } - } - for (x = lx - delta_x; x < lx; x++) - { - byte = origin + x * dbytes_dx; - for (y = 0; y < ly_bytes; y++) - { - *byte = white; - byte += dbytes_dybytes; - } - } - } -else if (delta_x < 0) - { - for (x = -delta_x; x < lx; x++) - { - byte = origin + x * dbytes_dx; - for (y = 0; y < ly_bytes; y++) - { - *(byte + delta_bytes) = *byte; - byte += dbytes_dybytes; - } - } - for (x = 0; x < -delta_x; x++) - { - byte = origin + x * dbytes_dx; - for (y = 0; y < ly_bytes; y++) - { - *byte = white; - byte += dbytes_dybytes; - } - } - } -return TRUE; -} -*/ - -/*---------------------------------------------------------------------------*/ - int do_autoalign(const TRasterImageP &image) { int wrap, lx, ly, mx, my; int pix_origin, dpix_dx, dpix_dy; int strip_width; - /* -Non viene presa in considerazione una eventuale savebox -*/ - /* -Per adesso non scrivo l'algo per wb con primary scan orizzontale, quindi: - -assert (image->orientation == TOR_LEFTBOT || - image->orientation == TOR_RIGHTBOT || - image->orientation == TOR_LEFTTOP || - image->orientation == TOR_RIGHTTOP ); -*/ - /* DAFARE -if ( image->orientation != TOR_LEFTBOT && - image->orientation != TOR_RIGHTBOT && - image->orientation != TOR_LEFTTOP && - image->orientation != TOR_RIGHTTOP ) -{ -tmsg_error(" autoalign error: bad image orientation"); -return FALSE; -} -*/ // assumo che sia sempre orientata nel modo corretto TRasterP ras = image->getRaster(); diff --git a/toonz/sources/toonzlib/cleanupparameters.cpp b/toonz/sources/toonzlib/cleanupparameters.cpp index 80a186e..548b993 100644 --- a/toonz/sources/toonzlib/cleanupparameters.cpp +++ b/toonz/sources/toonzlib/cleanupparameters.cpp @@ -122,8 +122,6 @@ void FdgManager::loadFieldGuideInfo() { else if (STR_EQ(label, "HOLE")) { sscanf(arg, "%d", &cnt); if (cnt >= (int)fdg_info.dots.size()) { - // tmsg_error("load field guide info error: bad hole number"); - // return FALSE; fdg_info.dots.push_back(CleanupTypes::DOT()); } } else if (STR_EQ(label, "X0")) diff --git a/toonz/sources/toonzqt/docklayout.cpp b/toonz/sources/toonzqt/docklayout.cpp index c8de5f4..0e6b94b 100644 --- a/toonz/sources/toonzqt/docklayout.cpp +++ b/toonz/sources/toonzqt/docklayout.cpp @@ -682,8 +682,7 @@ Region *DockLayout::dockItem(DockWidget *item, Region *r, int idx) { // which may slow down a bit - should be done only after a redistribute() and a // repaint() on // real-time docking. -Region *DockLayout::dockItemPrivate(DockWidget *item, Region *r, - int idx) { +Region *DockLayout::dockItemPrivate(DockWidget *item, Region *r, int idx) { // hide minimize button in FlipboolPanel item->onDock(true); @@ -864,10 +863,8 @@ bool DockLayout::undockItem(DockWidget *item) { //! Search for the \b nearest n-ple from a \b target one, under conditions: //!\b 1) nearest elements belong to \b fixed \b intervals; \b 2) their \b sum is //!\b fixed too. -void calculateNearest(std::vector target, - std::vector &nearest, - std::vector> intervals, - double sum) { +void calculateNearest(std::vector target, std::vector &nearest, + std::vector> intervals, double sum) { // Solving a small Lagrange multipliers problem to find solution on constraint // (2) assert(target.size() == intervals.size()); @@ -1208,8 +1205,7 @@ bool Region::subItemSize(DockWidget *item) { //! Checks insertion validity of \b item inside \b parentRegion at position \b //! insertionIdx. -bool DockLayout::isPossibleInsertion(DockWidget *item, - Region *parentRegion, +bool DockLayout::isPossibleInsertion(DockWidget *item, Region *parentRegion, int insertionIdx) { const int inf = 1000000; @@ -1266,8 +1262,7 @@ bool DockLayout::isPossibleInsertion(DockWidget *item, //! Checks insertion validity of \b item inside \b parentRegion at position \b //! insertionIdx. -bool DockLayout::isPossibleRemoval(DockWidget *item, - Region *parentRegion, +bool DockLayout::isPossibleRemoval(DockWidget *item, Region *parentRegion, int removalIdx) { // NOTE: parentRegion is necessarily !=0 or there's no need to check anything if (!parentRegion) return true; @@ -1597,9 +1592,8 @@ DockSeparator *DockDecoAllocator::newSeparator(DockLayout *owner, //! When inheriting a DockLayout class, new custom placeholders gets allocated //! by this method. -DockPlaceholder *DockDecoAllocator::newPlaceholder(DockWidget *owner, - Region *r, int idx, - int attributes) { +DockPlaceholder *DockDecoAllocator::newPlaceholder(DockWidget *owner, Region *r, + int idx, int attributes) { return new DockPlaceholder(owner, r, idx, attributes); } @@ -1608,9 +1602,8 @@ DockPlaceholder *DockDecoAllocator::newPlaceholder(DockWidget *owner, // BuildGeometry() method should not be called inside the base contructor - // because it's a virtual method. // So we provide this little inline... -DockPlaceholder *DockDecoAllocator::newPlaceBuilt(DockWidget *owner, - Region *r, int idx, - int attributes) { +DockPlaceholder *DockDecoAllocator::newPlaceBuilt(DockWidget *owner, Region *r, + int idx, int attributes) { DockPlaceholder *res = newPlaceholder(owner, r, idx, attributes); res->buildGeometry(); return res; diff --git a/toonz/sources/toonzqt/infoviewer.cpp b/toonz/sources/toonzqt/infoviewer.cpp index ec5a347..1bc0eef 100644 --- a/toonz/sources/toonzqt/infoviewer.cpp +++ b/toonz/sources/toonzqt/infoviewer.cpp @@ -171,9 +171,7 @@ void InfoViewerImp::onSliderChanged() { //---------------------------------------------------------------- namespace { -void setLabelStyle(QLabel *l) { - l->setObjectName("TitleTxtLabel"); -} +void setLabelStyle(QLabel *l) { l->setObjectName("TitleTxtLabel"); } } //---------------------------------------------------------------- diff --git a/toonz/sources/toonzqt/tonecurvefield.cpp b/toonz/sources/toonzqt/tonecurvefield.cpp index 5ea3f42..86bdada 100644 --- a/toonz/sources/toonzqt/tonecurvefield.cpp +++ b/toonz/sources/toonzqt/tonecurvefield.cpp @@ -353,8 +353,7 @@ void ChennelCurveEditor::moveCentralControlPoint(int index, double precDistance = (p.x() + d.x()) - precP.x(); // Caso particolare: Punto di controllo corrente == primo visibile, - // Punto di controllo - //successivo + // Punto di controllo successivo //== // l'ultimo // visibile @@ -366,8 +365,7 @@ void ChennelCurveEditor::moveCentralControlPoint(int index, if (nextDistance < 0) d = QPointF(nextP.x() - p.x(), d.y()); } // Caso particolare: Punto di controllo corrente == ultimo visibile, - // Punto di controllo - //precedente + // Punto di controllo precedente //== // primo // visibile @@ -406,107 +404,6 @@ void ChennelCurveEditor::moveCentralControlPoint(int index, //----------------------------------------------------------------------------- -/* Se due punti di controllo sono troppo vicini uno dei due viene eliminato. - Ritorna vero se un punto viene eliminato. - -Prima di richiamare il metodo nel move andava fatto questo controllo!!! -//Se il punto di controllo successivo, o precente, e' l'utlimo, o il primo, -blocco il -// movimento altrimenti elimino il punto di controllo successivo e richiamo il -move. -int nextPX = m_points.at(index+3).x(); -if(nextPX>m_margin && nextPX<=w && newX>nextPX) -{ - if(index+3 == pointCount-4) d = QPointF(0, d.y()); - else - { - moveCentralControlPoint(index, d); - return; - } -} -int precPX = m_points.at(index-3).x(); -if(precPX>=m_margin && precPX<=w && newX16 && precDistance>16) return false; - - //Se vado troppo vicino al punto di controllo precedente, o successivo, -lo elimino. - if(nextDistance<=16) - { - //Caso particolare: il successivo e' l'ultimo visibile; non -posso eliminare l'ultimo punto di controllo visibile. - if(index+3 == pointCount-4) - { - //Se il punto di controllo in index e' il primo visibile -sto gestendo il - // primo e l'ultimo punto, entrambi non possono essere -eliminati. - if(index == 3) - { - setPoint(index+1,nextP); - setPoint(index+2,p+delta); - return false; - } - else //Altrimenti elimino il penultimo. - { - removeControlPoint(index); - m_currentControlPointIndex += 3; - return true; - } - } - removeControlPoint(index+3); - return true; - } - if(precDistance<=16) - { - //Caso particolare: il precedente e' il primo visibile; non -posso eliminare il primo punto di controllo visibile. - if(index-3 == 3) - { - //Se il punto di controllo in index e' l'ultimo visibile -sto gestendo il - // primo e l'ultimo punto, entrambi non possono essere -eliminati. - if(index == pointCount-4) - { - setPoint(index-1,precP); - setPoint(index-2,p+delta); - return false; - } - else //Altrimenti elimino il secondo. - { - removeControlPoint(index); - return true; - } - } - removeControlPoint(index-3); - m_currentControlPointIndex += 3; - return true; - } - return false; -} -*/ - -//----------------------------------------------------------------------------- - void ChennelCurveEditor::addControlPoint(double percent) { QPainterPath path = getPainterPath(); QPointF p = path.pointAtPercent(percent);