fd19c4 Support Visual Studio 2015 (#544)

116 files Authored by Shinya Kitaoka 8 years ago , Committed by Keisuke Ogaki 8 years ago ,
116 files changed. 475 lines added. 601 lines removed.
.gitattributes
file added
+2
doc/how_to_build_win.md
file modified
+7 -0
doc/how_to_build_win_ja.md
file modified
+7 -0
thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9.lib
file removed
-0
thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2013.lib
file added
+3
thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2013_64.lib
file added
+3
thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2015.lib
file added
+3
thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_2015_64.lib
file added
+3
thirdparty/LibJPEG/jpeg-9/lib/LibJPEG-9_64.lib
file removed
-0
thirdparty/LibJPEG/jpeg-9/prj/LibJPEG/LibJPEG.vcxproj
file modified
+5 -5
thirdparty/Lz4/Lz4_131/lz4_32.lib
file modified
+0 -0
thirdparty/Lz4/Lz4_131/lz4_64.lib
file modified
+0 -0
thirdparty/glew/glew-1.9.0/bin/32bit/glew32.dll
file modified
+0 -0
thirdparty/glew/glew-1.9.0/bin/32bit/glew32mx.dll
file modified
+0 -0
thirdparty/glew/glew-1.9.0/bin/64bit/glew32.dll
file modified
+0 -0
thirdparty/glew/glew-1.9.0/bin/64bit/glew32mx.dll
file modified
+0 -0
thirdparty/glew/glew-1.9.0/lib/glew32.lib
file modified
+0 -0
thirdparty/glew/glew-1.9.0/lib/glew32mx.lib
file modified
+0 -0
thirdparty/glew/glew-1.9.0/lib/glew32mxs.lib
file modified
+0 -0
thirdparty/glew/glew-1.9.0/lib/glew32s.lib
file modified
+0 -0
thirdparty/glew/glew-1.9.0/lib/glew64.lib
file modified
+0 -0
thirdparty/glew/glew-1.9.0/lib/glew64mx.lib
file modified
+0 -0
thirdparty/glew/glew-1.9.0/lib/glew64mxs.lib
file modified
+0 -0
thirdparty/glew/glew-1.9.0/lib/glew64s.lib
file modified
+0 -0
thirdparty/glut/3.7.6/lib/glut32.dll
file modified
+0 -0
thirdparty/glut/3.7.6/lib/glut32.lib
file modified
+0 -0
thirdparty/glut/3.7.6/lib/glut64.dll
file modified
+0 -0
thirdparty/glut/3.7.6/lib/glut64.lib
file modified
+0 -0
thirdparty/libpng-1.6.21/lib/libpng16.lib
file removed
-0
thirdparty/libpng-1.6.21/lib/libpng16_2013.lib
file added
+3
thirdparty/libpng-1.6.21/lib/libpng16_2013_64.lib
file added
+3
thirdparty/libpng-1.6.21/lib/libpng16_2013_64d.lib
file added
+3
thirdparty/libpng-1.6.21/lib/libpng16_2013d.lib
file added
+3
thirdparty/libpng-1.6.21/lib/libpng16_2015.lib
file added
+3
thirdparty/libpng-1.6.21/lib/libpng16_2015_64.lib
file added
+3
thirdparty/libpng-1.6.21/lib/libpng16_2015_64d.lib
file added
+3
thirdparty/libpng-1.6.21/lib/libpng16_2015d.lib
file added
+3
thirdparty/libpng-1.6.21/lib/libpng16_64.lib
file removed
-0
thirdparty/libpng-1.6.21/lib/libpng16_64d.lib
file removed
-0
thirdparty/libpng-1.6.21/lib/libpng16d.lib
file removed
-0
thirdparty/libpng-1.6.21/projects/vstudio/libpng/libpng.vcxproj
file modified
+9 -9
thirdparty/libpng-1.6.21/projects/vstudio/pnglibconf/pnglibconf.vcxproj
file modified
+3 -3
thirdparty/libpng-1.6.21/projects/vstudio/pngstest/pngstest.vcxproj
file modified
+9 -9
thirdparty/libpng-1.6.21/projects/vstudio/pngtest/pngtest.vcxproj
file modified
+9 -9
thirdparty/libpng-1.6.21/projects/vstudio/pngunknown/pngunknown.vcxproj
file modified
+9 -9
thirdparty/libpng-1.6.21/projects/vstudio/pngvalid/pngvalid.vcxproj
file modified
+9 -9
thirdparty/libpng-1.6.21/projects/vstudio/zlib/zlib.vcxproj
file modified
+9 -9
thirdparty/lzo/2.03/LZO_lib/lzo2.lib
file modified
+0 -0
thirdparty/lzo/2.03/LZO_lib/lzo2_64.lib
file modified
+0 -0
thirdparty/lzo/2.03/lzo2.dll
file modified
+0 -0
thirdparty/lzo/2.03/lzo2.lib
file modified
+0 -0
thirdparty/openblas/libopenblas_32.lib
file modified
+0 -0
thirdparty/openblas/libopenblas_64.lib
file modified
+0 -0
thirdparty/superlu/SuperLU_2013_32.d.lib
file added
+3
thirdparty/superlu/SuperLU_2013_32.lib
file added
+3
thirdparty/superlu/SuperLU_2013_64.d.lib
file added
+3
thirdparty/superlu/SuperLU_2013_64.lib
file added
+3
thirdparty/superlu/SuperLU_2015_32.d.lib
file added
+3
thirdparty/superlu/SuperLU_2015_32.lib
file added
+3
thirdparty/superlu/SuperLU_2015_64.d.lib
file added
+3
thirdparty/superlu/SuperLU_2015_64.lib
file added
+3
thirdparty/superlu/SuperLU_32.d.lib
file removed
-0
thirdparty/superlu/SuperLU_32.lib
file removed
-0
thirdparty/superlu/SuperLU_4.1/lib/libsuperlu_4.0.lib
file modified
+0 -0
thirdparty/superlu/SuperLU_4.1/prj/SuperLU/SuperLU.sln
file modified
+5 -3
thirdparty/superlu/SuperLU_64.d.lib
file removed
-0
thirdparty/superlu/SuperLU_64.lib
file removed
-0
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3.lib
file removed
-0
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013.lib
file added
+3
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013_64.lib
file added
+3
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013_64d.lib
file added
+3
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2013d.lib
file added
+3
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015.lib
file added
+3
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015_64.lib
file added
+3
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015_64d.lib
file added
+3
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_2015d.lib
file added
+3
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_64.lib
file removed
-0
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3_64d.lib
file removed
-0
thirdparty/tiff-4.0.3/lib/LibTIFF-4.0.3d.lib
file removed
-0
thirdparty/tiff-4.0.3/prj/LibTIFF/LibTIFF.vcxproj
file modified
+5 -5
thirdparty/zlib-1.2.8/lib/zlib-1.2.8.lib
file removed
-0
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013.lib
file added
+3
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013_64.lib
file added
+3
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013_64d.lib
file added
+3
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2013d.lib
file added
+3
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015.lib
file added
+3
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015_64.lib
file added
+3
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015_64d.lib
file added
+3
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_2015d.lib
file added
+3
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_64.lib
file removed
-0
thirdparty/zlib-1.2.8/lib/zlib-1.2.8_64d.lib
file removed
-0
thirdparty/zlib-1.2.8/lib/zlib-1.2.8d.lib
file removed
-0
thirdparty/zlib-1.2.8/prj/zlib/zlib.vcxproj
file modified
+5 -5
thirdparty/zlib-1.2.8/prj/zlib/zlib.vcxproj.filters
file modified
+26 -26
toonz/sources/CMakeLists.txt
file modified
+25 -11
toonz/sources/common/tiio/movsettings.cpp
file modified
+12 -10
toonz/sources/common/tsound/tsound_sdl.cpp
file modified
+1 -1
toonz/sources/common/tsound/tsound_x.cpp
file modified
+38 -38
toonz/sources/common/twain/ttwain_stateW.c
file modified
+5 -2
toonz/sources/common/twain/twain.h
file modified
+68 -71
toonz/sources/image/mov/tiio_mov.h
file modified
+14 -12
toonz/sources/image/pli/pli_io.cpp
file modified
+0 -11
toonz/sources/image/tiio.cpp
file modified
+14 -2
toonz/sources/include/movsettings.h
file modified
+11 -11
toonz/sources/include/toonz4.6/raster.h
file modified
+25 -22
toonz/sources/include/toonzqt/updatechecker.h
file modified
+1 -0
toonz/sources/tnzbase/tscanner/tscanner.cpp
file modified
+1 -1
toonz/sources/tnzext/tlin/tlin_cblas_wrap.cpp
file modified
+8 -1
toonz/sources/toonz/cleanuppopup.cpp
file modified
+3 -1
toonz/sources/toonz/cleanupsettingspopup.cpp
file modified
+8 -12
toonz/sources/toonz/psdsettingspopup.cpp
file modified
+2 -2
toonz/sources/toonzlib/autopos.cpp
file modified
+0 -166
toonz/sources/toonzlib/cleanupparameters.cpp
file modified
+0 -2
toonz/sources/toonzqt/docklayout.cpp
file modified
+9 -16
toonz/sources/toonzqt/infoviewer.cpp
file modified
+1 -3
toonz/sources/toonzqt/tonecurvefield.cpp
file modified
+2 -105
    Support Visual Studio 2015 (#544)
    
    * 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

    
        
file added
+2
file modified
+7 -0
file modified
+7 -0
file modified
+0 -0
file modified
+0 -0
file modified
+25 -11
file modified
+14 -2