Merged branch 'master' from opentoonz with conflicts resolved

Author: manongjohn

.gitignore

@@ -13,6 +13,7 @@ Thumbs.db
 
 # bundled thirdparty libraries
 /thirdparty/boost
+/thirdparty/libjpeg-turbo64
 /thirdparty/lzo
 /thirdparty/tiff-4.0.3
 /thirdparty/LibJPEG/jpeg-9

appveyor.yml

@@ -2,33 +2,30 @@ version: 1.4.0.{build}
 pull_requests:
   do_not_increment_build_number: true
 skip_tags: true
-image: Visual Studio 2015
+image: Visual Studio 2019
 configuration:
 - Debug
 - Release
 platform: x64
 clone_depth: 1
-# C:\Qt\5.9 is mapped to C:\Qt\5.9.n for backward compatibility
+cache: c:\tools\vcpkg\installed
 install:
 - cmd: >-
     choco install opencv
-    
-    cd thirdparty
 
-    copy /Y LibJPEG\jpeg-9\jconfig.vc LibJPEG\jpeg-9\jconfig.h
+    cd thirdparty
 
     copy /Y tiff-4.0.3\libtiff\tif_config.vc.h tiff-4.0.3\libtiff\tif_config.h
 
     copy /Y tiff-4.0.3\libtiff\tiffconf.vc.h tiff-4.0.3\libtiff\tiffconf.h
 
     copy /Y libpng-1.6.21\scripts\pnglibconf.h.prebuilt libpng-1.6.21\pnglibconf.h
 
-
     cd ../toonz
 
     mkdir %PLATFORM% && cd %PLATFORM%
 
-    cmake ..\sources -G "Visual Studio 14 2015 Win64" -DQT_PATH="C:\Qt\5.9\msvc2015_64" -DBOOST_ROOT="C:\Libraries\boost_1_60_0" -DOpenCV_DIR="C:\Tools\opencv\build"
+    cmake ..\sources -G "Visual Studio 16 2019" -Ax64 -DQT_PATH="C:\Qt\5.15.2\msvc2019_64" -DBOOST_ROOT="C:\Libraries\boost_1_73_0" -DOpenCV_DIR="C:\Tools\opencv\build"
 build:
   project: $(APPVEYOR_BUILD_FOLDER)\toonz\$(PLATFORM)\ALL_BUILD.vcxproj
   parallel: true
@@ -39,7 +36,7 @@ after_build:
 
     move %CONFIGURATION%\*.* %CONFIGURATION%\OpenToonz
 
-    C:\Qt\5.9\msvc2015_64\bin\windeployqt.exe %CONFIGURATION%\OpenToonz\OpenToonz.exe
+    C:\Qt\5.15.2\msvc2019_64\bin\windeployqt.exe %CONFIGURATION%\OpenToonz\OpenToonz.exe
 
     copy /Y ..\..\thirdparty\glut\3.7.6\lib\glut64.dll %CONFIGURATION%\OpenToonz
 
@@ -53,9 +50,7 @@ after_build:
     
     copy /Y ..\..\thirdparty\libmypaint\dist\64\libmypaint-1-4-0.dll %CONFIGURATION%\OpenToonz
 
-    copy /Y ..\..\thirdparty\libjpeg-turbo64\dist\turbojpeg.dll %CONFIGURATION%\OpenToonz
-
-    copy /Y "C:\Tools\opencv\build\x64\vc14\bin\opencv_world412.dll" %CONFIGURATION%\OpenToonz
+    copy /Y "C:\Tools\opencv\build\x64\vc15\bin\opencv_world412.dll" %CONFIGURATION%\OpenToonz
 
     mkdir "%CONFIGURATION%\OpenToonz stuff"
 

doc/how_to_build_linux.md

@@ -19,12 +19,8 @@ Building OpenToonz from source requires the following dependencies:
 ### Installing Dependencies on Debian / Ubuntu 16.04 (Xenial)
 
 ```
-$ sudo apt-get install build-essential git cmake freeglut3-dev libboost-all-dev libegl1-mesa-dev libfreetype6-dev libgles2-mesa-dev libglew-dev libglib2.0-dev libjpeg-dev libjpeg-turbo8-dev libjson-c-dev liblz4-dev liblzma-dev liblzo2-dev libpng-dev libsuperlu-dev libusb-1.0-0-dev pkg-config qt5-default qtbase5-dev libqt5svg5-dev qtscript5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev qtmultimedia5-dev qtwayland5 libqt5multimedia5-plugins
-```
-
-Find a PPA respository for Qt 5.9 or later and install the following:
-```
-$ sudo apt-get install -y qt59multimedia qt59script qt59serialport qt59svg qt59tools
+$sudo apt-get install build-essential git cmake pkg-config libboost-all-dev qt5-default qtbase5-dev libqt5svg5-dev qtscript5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev qtmultimedia5-dev libqt5multimedia5-plugins libqt5serialport5-dev libsuperlu-dev 
+liblz4-dev libusb-1.0-0-dev liblzo2-dev libpng-dev libjpeg-dev libglew-dev freeglut3-dev libfreetype6-dev libjson-c-dev qtwayland5 libmypaint-dev libopencv-dev libturbojpeg-dev
 ```
 
 Find a PPA repository for MyPaint 1.3 and install the following:
@@ -39,6 +35,7 @@ $ sudo apt-get install -y libopencv-dev
 
 Notes:
 * It's possible we also need `libgsl2` (or maybe `libopenblas-dev`)
+* We may also need `libegl1-mesa-dev libgles2-mesa-dev libglib2.0-dev liblzma-dev`
 * For Qt, MyPaint and OpenCV, you can alternatively build and install from source.
 
 ### Installing Dependencies on Fedora

doc/how_to_build_win.md

@@ -18,7 +18,7 @@ This software can be built using Visual Studio 2015 or above and Qt 5.9 (later Q
 ### Qt
 - https://www.qt.io/download-open-source/
 - Qt is a cross-platform GUI framework.
-- Install Qt 5.9 (64-bit version, tested up to 5.9.9) with the [Qt Online Installer for Windows](http://download.qt.io/official_releases/online_installers/qt-unified-windows-x86-online.exe).
+- Install Qt 5.9 or higher (64-bit version, tested up to 5.9.9) with the [Qt Online Installer for Windows](http://download.qt.io/official_releases/online_installers/qt-unified-windows-x86-online.exe).
 
 ### boost
 - Boost 1.55.0 or later is required (tested up to 1.61.0).
@@ -27,6 +27,15 @@ This software can be built using Visual Studio 2015 or above and Qt 5.9 (later Q
 - Install the following patch (Make the changes listed in the patch file), if you use Boost 1.55.0 with Visual Studio 2013.
 - https://svn.boost.org/trac/boost/attachment/ticket/9369/vc12_fix_has_member_function_callable_with.patch
 
+### OpenCV
+- v4.1.0 and later
+- https://opencv.org/
+- On configuring with CMake or in the environmental variables, specify `OpenCV_DIR` to the `build` folder in the install folder of OpenCV (like `C:/opencv/build`).
+
+### libjpeg-turbo
+- https://www.libjpeg-turbo.org/
+- Copy the lib and include folders from libjpeg-turbo64 into `$opentoonz/thirdparty/libjpeg-turbo64`.
+
 ## Acquiring the Source Code
 - Note: You can also perform these next commands with Github for Desktop client.
 - Clone the base repository.
@@ -67,21 +76,15 @@ Rename the following files:
 - Compile the build.
 - The output will be in the corresponding folder in `$opentoonz/toonz/build/`
 
-## Building with extended stop motion support for webcams and Canon DSLR cameras.
- You will need three additional libraries.
-- [OpenCV](https://opencv.org/) (v4.1.0 and later)
-  - [libjpeg-turbo](https://www.libjpeg-turbo.org/)
-  - The Canon SDK.  This requires applying for the Canon developer program and downloading the SDK.
+## Building with Canon DSLR camera support
+ You will need the Canon SDK. This requires applying for the Canon developer program and downloading the SDK.
 
-Copy the following folders into the `$opentoonz/thirdparty` folder.
-  - Copy the Header and library folders from the Canon SDK to `$opentoonz/thirdparty/canon`
-    - Make sure that the library is the one from the EDSDK_64 folder.
-  - Copy the lib and include folders from libjpeg-turbo64 into `$opentoonz/thirdparty/libjpeg-turbo64`.
+- Copy the Header and library folders from the Canon SDK to `$opentoonz/thirdparty/canon`
+  - Make sure that the library is the one from the EDSDK_64 folder.
 
-Check the checkbox in CMake to build with stop motion support.
-On configuring with CMake or in the environmental variables, specify `OpenCV_DIR` to the `build` folder in the install folder of OpenCV (like `C:/opencv/build`).
+Check the `WITH_CANON` checkbox in CMake to build with Canon DSLR camera support.
 
-To run the program with stop motion support, you will need to copy the .dll files from opencv2, libjpeg-turbo and the Canon SDK into the folder where your project is built.
+To run the program with Canon DSLR camera support, you will need to copy the .dll files from the Canon SDK into the folder where your project is built.
 
 ## Running the Program
 ### Setting Up the Program's Path
@@ -118,6 +121,8 @@ To run the program with stop motion support, you will need to copy the .dll file
 3. Copy the following files to the same folder as `OpenToonz.exe`
   - `$opentoonz/thirdparty/glut/3.7.6/lib/glut64.dll`
   - `$opentoonz/thirdparty/glew/glew-1.9.0/bin/64bit/glew32.dll`
+  - `turbojpeg.dll` from libjpeg-turbo package
+  - `opencv_world***.dll` from OpenCV package
 
 4. Copy the `srv` folder from the previous OpenToonz installation to the same folder as `OpenToonz.exe`
   - If there is no `srv` folder, OpenToonz can still be used.  However, various file formats such as `mov` cannot be used.