Commit graph

127 commits

Author SHA1 Message Date
Jeremy Bullock
686e82ae08 Fixed gif import (#924)
* fixed gif import
2016-11-24 11:11:57 +09:00
Jeremy Bullock
764038cd1a Spritesheet Export (#752)
Added 'spritesheet' for the output format options, supporting as follows:
- Crops transparent area from images
- Set output format (Grid, Vertical, Horizontal)
- Scale output
- Set padding
- Export text file along with spritesheet with info about image sizes, padding etc. . .
The result is compatible with Game Maker Studio.
2016-11-24 11:08:30 +09:00
Jeremy Bullock
edaab7f46d moved ffmpeg temp files to cache folder (#921)
Now the ffmpeg temporary export files will be saved in the cache folder.
close #918
2016-11-21 19:37:55 +09:00
Jeremy Bullock
3bb5efc4ee Quick Export Feature (#725)
* Added Fast Render to MP4 command which does not need to set anything in output settings.
2016-11-09 11:46:03 +09:00
Jeremy Bullock
3837a14436 fix for ffmpeg export range error (#828)
* This allows the export range to be specified and correctly exported in ffmpeg formats

close #779
2016-10-07 19:02:02 +09:00
Jeremy Bullock
2b9d8f3cc8 Show info for ffmpeg levels (#824)
* Show info of ffmpeg level in level settings
* added frame count to filebrowser

close #811
close #812
2016-10-07 18:59:06 +09:00
Jeremy Bullock
3b0af2f782 Fix for Multiple FFmpeg files with same name #813 (#827)
* Use full path for temp ffmpeg cache names. Which allows importing multiple ffmpeg type files with the same name but different locations.

close #813
2016-10-06 17:22:00 +09:00
Jeremy Bullock
779cdf5542 fix gif reader not getting all frames (#770)
changed frame counting method for GIF format in order to get frame duration properly
2016-09-28 15:52:57 +09:00
boombatower
0dbe175381 Replace else() with elseif(APPLE) to ensure quicktime not built on unix. 2016-09-09 22:28:19 -05:00
MCCCS
a0ce326e1b 🐛 Fix spelling mistakes 2016-09-07 16:28:50 +03:00
shun-iwasawa
27b0cfd38c clang formatting (#703) 2016-08-04 16:23:36 +09:00
turtletooth
04d8fdc45c FFmpeg Integration - mp4, webm, gif (#624)
* Webm and Gif Export

* added intermediate jpg conversion to save hard drive space

* Started preferences ffmpegPath selection

* grouped ffmpeg files together

* Working with intermediate format

* Fixed running multiple CPU cores for export

* audio works

* all working, need refactoring and error checking

* Changed Qt includes

* revisited Qt includes

* Clean up code, refactor file cleanup, clean up includes

* started gif import

* import working

* Removed import again, fixed export settings being remembered

* import working, bypassed precompute, back to single core export

* clang formatting applied

* added beta warnings in Preferences Popup

* fixed frame flipping and made looping gif default

* added toonzlibs

* added format checks

* added check to help t32bitsrv crash

* sliders for settings are back

* added customizable timeout for ffmpeg

* fixed gif fps and scale for no palette
2016-07-29 14:35:10 +09:00
Campbell Barton
5cfa877449 Quiet warnings
- duplicate headers in C source & header
- use const char arg
- invalid typedef
2016-07-23 05:23:17 +10:00
Campbell Barton
9ece9c0c92 Cleanup: CMake style
Use parens on newline, avoids diff-noise when adding values.
2016-07-23 04:59:47 +10:00
Campbell Barton
8c6c57f1b4 Enable missing-declarations warning (#643)
Finish ensuring symbols use headers correctly
2016-07-22 13:38:33 +09:00
Shinya Kitaoka
2a7129aa92 use std::unique_ptr<> instead of std::auto_ptr<> (#601) 2016-07-20 21:49:32 +09:00
Campbell Barton
4e9ecfd38b Fix crash reading level (TLZ) file (#637)
- double fclose call
  (readVersion closed the file, however this is already closed when the class is freed)

- buffer overrun reading a char pointer which isn't NULL terminated.
  use memcmp instead.
2016-07-14 20:52:12 +09:00
Campbell Barton
87094dbf7a Correct delete[] use (#629) 2016-07-14 15:56:52 +09:00
Campbell Barton
a9c3dad75a CMake: differentiate system includes (#604) 2016-07-09 00:47:11 +09:00
Campbell Barton
a9208f5aad Correct delete array usage (#599) 2016-07-08 13:43:56 +09:00
Shinya Kitaoka
7abdb2380a Merge pull request #547 from ideasman42/warn-undefined-pr
Quiet -Wundef warning
2016-07-06 20:42:14 +09:00
Shinya Kitaoka
47895a0d7b Merge pull request #578 from opentoonz/warning-cleanup-pr
Quiet warnings
2016-07-06 19:24:49 +09:00
Shinya Kitaoka
c08330d1ae Merge pull request #567 from opentoonz/cmake-cleanup-defines-pr
CMake: use multi-line defines
2016-07-06 13:56:49 +09:00
Shinya Kitaoka
8240663cb9 Merge pull request #554 from janisozaur/libpng
Add support for libpng<1.5
2016-07-06 13:26:51 +09:00
Campbell Barton
e05b0bbe1c Quiet warnings 2016-07-05 14:54:52 +10:00
Shinya Kitaoka
fd19c4eedf 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
2016-07-04 17:50:30 +09:00
Campbell Barton
f2d492861f CMake: use multi-line defines
Easier to read and avoids merge conflicts
2016-07-02 22:23:18 +10:00
Michał Janiszewski
01e73f88e4 Add support for libpng<1.5 2016-06-30 15:21:57 +02:00
Campbell Barton
d869b5f8e6 Quiet -Wundef warning
Exposes accidental typos when checking exact values of a define.
2016-06-30 12:28:26 +10:00
Campbell Barton
b130eca2da Workaround using C's abs on Linux
math.h is indirectly included, making abs return double on Linux.
2016-06-30 10:41:38 +10:00
Shinya Kitaoka
d1f6c4e95b REFACTORING: Add final specifiers (#537)
* add final specifiers

* apply clang-format

* fix for macOS
2016-06-29 15:17:12 +09:00
Campbell Barton
89a491484a Misc minor changes needed for building on Linux 2016-06-24 22:01:09 +10:00
Shinya Kitaoka
38fd868138 apply clang-format 2016-06-20 11:34:17 +09:00
Shinya Kitaoka
473e70432a add override specifier 2016-06-20 11:34:15 +09:00
Campbell Barton
deffae3359 Linux ifdef and defines (#454) 2016-06-17 17:48:03 +09:00
Campbell Barton
22fd3b0447 CMake: changes needed to build on Linux (#452)
Note that these are the main changes from the linux port.
Not a fully working linux port.
2016-06-16 13:52:02 +09:00
Shinya Kitaoka
120a6e041c apply clang-format 2016-06-15 15:43:10 +09:00
Shinya Kitaoka
9eb50de5fe Use std functions (#297)
* use std functions

* replace toInt        to std::stoi
* replace toDouble     to std::stod
* replace toString     to std::to_string
* replace toWideString to std::to_wstring

* fix for MacOS

* cosmetic change
2016-06-07 16:06:00 +09:00
Keisuke Ogaki
e6172ddf26 x64 or LP64 2016-06-02 19:28:29 +09:00
Keisuke Ogaki
876ca8276d fit to enable to compile 32bit modules 2016-06-02 16:13:45 +09:00
Keisuke Ogaki
8324720308 bugfix: less 32bit dependencies 2016-06-02 15:20:56 +09:00
Keisuke Ogaki
5ff9a72ca5 get layer name encoding from preference 2016-05-24 16:26:30 +09:00
Keisuke Ogaki
8b06ffc4e3 💄 force encoding in SJIS for psd layer name 2016-05-24 15:11:55 +09:00
Shinya Kitaoka
ba547e17d0 Reduce crashes on start-up (#340)
* reduce startup-crush problems

* fix error codes

* fixup! fix error codes
2016-05-23 16:46:06 +09:00
Campbell Barton
5ea53c8c6b Quiet GCC -Wparentheses warning with assignment (#310) 2016-05-20 17:37:59 +09:00
Keisuke Ogaki
cd46cc8362 Fix to stop creating zero-size image (#333)
* 🐛 systemvar path should not contain revision number

* 🐛 Don't forget break after case

* 🐛 avoid creating zero size image

* 🔥 remove duplicated assertion
2016-05-20 16:42:36 +09:00
Shinya Kitaoka
12c444ee0d use std::min and std::max (#318) 2016-05-18 13:03:37 +09:00
Shinya Kitaoka
8105532604 add #pragma once (#303) 2016-05-17 00:04:11 +09:00
Shinya Kitaoka
1660e0d627 Fix conflicts (Remove license and edition defines and code) (#291)
* Remove license support, and old editions

Previously, old code to support various editions of Toonz, as well as
license activiation code, was cluttering the repository.
Support for LINETEST is retained.

* fix conflicts
2016-05-16 20:45:31 +09:00
Shinya Kitaoka
d4642c34e8 Remove macros: CASE, __OR, and DEFAULT (#286)
* remove syntax macros: CASE, __OR, and DEFAULT

* define VC_EXTRALEAN

* remove meaningless comments
2016-05-13 19:49:17 +09:00
Campbell Barton
f08982dd33 CMake: cleanup indentation, remove redundant endif args 2016-04-27 21:48:12 +10:00
Shinya Kitaoka
85e0644e93 Merge pull request #245 from ideasman42/cleanup-gcc-Wcomment
Cleanup: gcc's -Wcomment warnings
2016-04-27 17:32:04 +09:00
Shinya Kitaoka
6526c73583 Fix t32bitsrv build conflicts (#211)
add #include <memory>, fix QT_PATH

* add #include <memory>

* fix QT_PATH
2016-04-27 15:04:18 +09:00
Campbell Barton
ea4f7e9dc2 Cleanup: gcc's -Wcomment warnings 2016-04-27 10:54:30 +10:00
Shinya Kitaoka
6f097405b3 Revert "Merge pull request #248 from skitaoka/fix/issue/134"
This reverts commit ebfd3b7b4d, reversing
changes made to 467e9d19ae.
2016-04-27 00:11:57 +09:00
Shinya Kitaoka
7bc9064955 fix convert vector image to raster image issue
- remove NEW_REGION_FILL macro
- use glBlendFuncSeparate
- some refactoring
2016-04-26 18:40:16 +09:00
Shinya Kitaoka
3bfa549e8b remove "using"
- using std::string;
- using std::wstring;
- using std::ostream;
- using std::istream;
- using std::iostream;
- using std::ostrstream;
- using std::istrstream;
- using std::fstream;
2016-04-21 16:23:15 +09:00
Shinya Kitaoka
2148c874dd remove using namespace std; from headers 2016-04-20 10:24:48 +09:00
Shinya Kitaoka
79e39bd35a remove 2016-04-20 10:24:46 +09:00
Shinya Kitaoka
4c5bd5e681 remove register 2016-04-20 10:24:45 +09:00
Shinya Kitaoka
9f5a1bd760 use _WIN32 instead of WIN32 2016-04-20 10:24:44 +09:00
Shinya Kitaoka
06e491a6f7 Merge pull request #62 from ideasman42/linux-header-case-fix
Linux: Use correct upper/lower case for includes
2016-04-15 13:42:35 +09:00
Shinya Kitaoka
e938cfcdc7 Merge pull request #63 from ideasman42/linux-basic-portability
Linux: Basic portability edits
2016-04-15 13:42:07 +09:00
Campbell Barton
d0e335dfee Fix include case 2016-04-12 02:58:51 +10:00
Campbell Barton
107701249b Basic edits for Linux portability 2016-04-12 02:56:45 +10:00
Campbell Barton
42d601e918 Use #error preprocessor
We had a report (that I can't confirm), that this caused errors.
Best to use `error` here.
2016-04-01 05:19:41 +11:00
kusano
ffc911474d Fix crash in initializing
In some enviroment, access violations occures in ICOpen.
Althogh this code seems to intended to handle SEH, structured exceptions are not catched in current configulation.
2016-03-27 01:02:54 +09:00
kusano
45254b4069 Fix libpng version in CMakeLists.txt 2016-03-24 05:01:24 +09:00
roentgen
87fce823c5 OSX: use presented libpng 2016-03-24 04:33:12 +09:00
roentgen
237d095463 Merge pull request #14 from opentoonz/fix-thirdparty-win
Visual Studioと更新されたthirdparty/でビルドができるように各種修正
2016-03-24 04:12:05 +09:00
kusano
6139acbd31 Make tiio_tif.cpp use io.h instead of unistd.h in Visual Studio 2016-03-24 04:04:53 +09:00
kusano
3f512259eb Update CMakeLists.txt for Visual Studio
- add libpng
- change libtiff path
2016-03-24 04:03:50 +09:00
fukasawa
13abb65b48 fixed aborting on png-level loading 2016-03-24 03:07:46 +09:00
fukasawa
e60969f67f moved to libpng and libtiff to thirdparty 2016-03-24 00:50:22 +09:00
roentgen
71f5e9deb4 moved RGBA64 support to libtiff from toonz/sources/image/tif 2016-03-23 04:32:55 +09:00
roentgen
19af1bad04 use cmake modules for superlu and lzo.
use pkg-config for usb, glew and lz4(not static).
(WIP) fixed getting kinda hack for tiff out to libtiff
2016-03-23 03:48:01 +09:00
Toshihiro Shimizu
890dddabbd first commit 2016-03-19 02:57:51 +09:00