Commit graph

261 commits

Author SHA1 Message Date
turtletooth
f8ebe3b803 Merge pull request #575 from shun-iwasawa/pencil_test_viewer
Pencil test feature
2016-07-08 09:00:24 -06:00
Shinya Kitaoka
7abdb2380a Merge pull request #547 from ideasman42/warn-undefined-pr
Quiet -Wundef warning
2016-07-06 20:42:14 +09:00
shun_iwasawa
21a6b6ba06 pencil test popup 2016-07-06 20:06:20 +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
af8faa4452 Merge pull request #558 from janisozaur/use-after-free
Prevent containerH being used after it was freed
2016-07-06 12:01:08 +09:00
shun-iwasawa
7c216ea4e6 Merge pull request #566 from opentoonz/fix-delete-pr
Correct missing [] from delete
2016-07-05 17:13:31 +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
Jeremy Bullock
f44848c78d reverted stage::inch change, should be its own PR 2016-07-03 00:15:54 -06:00
Campbell Barton
c39a8a4b75 Correct incorrect delete 2016-07-02 22:22:01 +10:00
Jeremy Bullock
20a966a908 set stage::inch to 120 2016-06-30 23:46:29 -06:00
Jeremy Bullock
b99ed3bab6 added shun-iwasawa's suggestions 2016-06-30 21:41:31 -06:00
Michał Janiszewski
1d0596c8d8 Prevent containerH being used after it was freed 2016-06-30 17:25:47 +02:00
Michał Janiszewski
b86749e216 isnan fixes
isnan was used without specifying namespace
2016-06-30 13:42:20 +02:00
Michał Janiszewski
c8607f3d7a Fix SDL includes in tnzbase
SDL headers are installed to /usr/include/SDL2 which was in conflict
with explicit way they were included previously.
2016-06-30 10:55:55 +02:00
Campbell Barton
620578b1a0 Fix missing array specifier from delete 2016-06-30 14:37:43 +10: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
1c6681c983 Merge pull request #525 from ideasman42/linux-opengl-pr
Changes needed to build OpenGL files with Linux
2016-06-30 08:25:57 +10:00
shun-iwasawa
55327d15ae Merge pull request #467 from ideasman42/linux-tsound-pr
Linux support for tsound (SDL2), from pr #51
2016-06-29 18:55:41 +09: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
Campbell Barton
301bdb149a Changes needed to build OpenGL files with Linu 2016-06-24 21:38:08 +10:00
Shinya Kitaoka
bc8b18dbfd Merge pull request #518 from ideasman42/linux-isnan-pr
Use cmath instead of defining isnan (Linux build-fix)
2016-06-24 19:47:47 +09:00
Campbell Barton
3b073728d4 Use cmath instead of defining isnan
Needed for building on Linux
2016-06-24 06:41:58 +10:00
Michał Janiszewski
7a49c6c7d4 Fix string streams 2016-06-23 20:33:47 +02:00
Campbell Barton
747d5c5395 Linux support for tfont (Qt), from pr #51 (#466)
Credit goes to François Revol for this work.
2016-06-23 19:40:37 +09:00
tomosu
00e4b3908e Merge pull request #465 from janisozaur/close-file
Pass file to be closed
2016-06-23 18:30:41 +09:00
tomosu
965183e43c Merge pull request #475 from skitaoka/refactoring/add-override
REFACTORING: add override specifiers
2016-06-23 17:03:53 +09:00
shun-iwasawa
e6d98dae08 Merge pull request #432 from walkerka/master
[Done] Brush stroke stabilizer.
2016-06-22 12:28:23 +09:00
walkerka
e1e7c459ab removed stressful assertion. 2016-06-21 19:15:55 +08: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
36d03a96ea Linux support for tsound (SDL2), from pr #51
Credit goes to François Revol for this work.
2016-06-17 21:51:29 +10:00
Michał Janiszewski
9eefd20810 Pass file to be closed 2016-06-17 12:52:05 +02:00
Campbell Barton
deffae3359 Linux ifdef and defines (#454) 2016-06-17 17:48:03 +09:00
Shinya Kitaoka
120a6e041c apply clang-format 2016-06-15 15:43:10 +09:00
tomosu
eea0acf6fa Use stringstream instead of strstream (#431)
* replace strstream with string stream

* all change

Signed-off-by: tomosu <tomosu@users.noreply.github.com>

* small changes
2016-06-13 21:50:05 +09:00
Shinya Kitaoka
ee259ffaf7 remove duplicated constants (#296) 2016-06-13 21:37:09 +09:00
tomosu
5162807399 use stringstream instead og strstream (#398) 2016-06-09 12:45:20 +09:00
shun-iwasawa
99b9e225b0 enable debug build (#421) 2016-06-08 17:51:40 +09:00
turtletooth
1526ec939f Changed default resolution to 1920 x 1080 (#385)
* Changed default resolution

* Resizes view to fit the window on the first time it is shown only.  Otherwise new resolution may seem too big.
2016-06-07 17:46:11 +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
Campbell Barton
5ea53c8c6b Quiet GCC -Wparentheses warning with assignment (#310) 2016-05-20 17:37:59 +09:00
shun-iwasawa
5ddd75cc52 fix magnet tool crash (#324) 2016-05-18 20:45:12 +09:00
shun-iwasawa
fc0e222c4a fix minimize raster memory fragmentation option (#322) 2016-05-18 14:37:27 +09:00
Shinya Kitaoka
12c444ee0d use std::min and std::max (#318) 2016-05-18 13:03:37 +09:00
Keisuke Ogaki
71a0aa4bb0 🐛 systemvar path should not contain revision number (#316) 2016-05-17 21:38:09 +09:00
Shinya Kitaoka
8105532604 add #pragma once (#303) 2016-05-17 00:04:11 +09:00
Shinya Kitaoka
7be7e612c4 Fix a version text (Rewrite update check) (#290)
* Rewrite update check

Before release, the update URL will need to be changed to an official
one.

* remove syntax macros: CASE, __OR, and DEFAULT

* define VC_EXTRALEAN

* modify the URL of opentoonz-version.txt

* fix a type of updateUrl

* remove meanless comments
2016-05-16 14:16:01 +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
shun_iwasawa
db3444ca99 fix angle unit (degree sign) expression 2016-04-27 18:37:49 +09: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
911b7e916a Merge pull request #247 from ideasman42/cleanup-gcc-Wwrite-strings
Cleanup: gcc's -Wwrite-strings warning
2016-04-27 17:24:52 +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
4aa85c3899 Cleanup: -Wwrite-strings warning 2016-04-27 10:55:26 +10: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
Michał Janiszewski
28790b32b9 Plug memory leak in common 2016-04-25 22:24:05 +02:00
Michał Janiszewski
e69068915f Remove assignment from assert condition 2016-04-25 22:23:31 +02:00
Michał Janiszewski
5e553c07ee Drop unnecessary dereference 2016-04-25 22:04:42 +02:00
Michał Janiszewski
50e38f736b Plug some memory leaks 2016-04-25 21:54:56 +02:00
Michał Janiszewski
b82824518a Make sure all the sqrt coeffs have space for storage 2016-04-25 21:54:52 +02:00
Michał Janiszewski
f91771fdbe Plug memory leak in psd.cpp 2016-04-25 21:54:48 +02:00
Shinya Kitaoka
cd2d2022b0 Merge pull request #225 from ideasman42/linux-preproc-tweaks
Minor changes to preproc checks needed for building on Linux
2016-04-25 17:25:42 +09:00
Shinya Kitaoka
7e54c42979 Merge pull request #224 from ideasman42/linux-config-path
Use ~/.config on Linux/Unix
2016-04-25 17:12:02 +09:00
Campbell Barton
e6d9f6df9d Use ~/.config on Linux/Unix 2016-04-25 14:04:00 +10:00
Campbell Barton
07f3e872bd Minor changes to preproc checks needed for building on Linux 2016-04-24 16:33:04 +10:00
Campbell Barton
3191db5857 Correct class use with TTimer on Linux 2016-04-24 16:28:19 +10: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
eabf183e6e fix namespace 2016-04-20 10:24:52 +09:00
Shinya Kitaoka
bb1d046db8 remove using namespace DVGui; from headers 2016-04-20 10:24:49 +09:00
Shinya Kitaoka
2148c874dd remove using namespace std; from headers 2016-04-20 10:24:48 +09:00
Shinya Kitaoka
42bfb61883 remove delete[] 2016-04-20 10:24:47 +09:00
Shinya Kitaoka
6a4e01532c remove 2016-04-20 10:24:46 +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
Keisuke Ogaki
3c27c43f43 Merge pull request #191 from tomosu/fix_vector_thumbnail_and_crash_in_preview
fix vector preview problems
2016-04-19 18:51:28 +09:00
Shinya Kitaoka
5f2af016ab add move constructors 2016-04-19 16:54:53 +09:00
tomosu
04cb6c4a49 deleted unused code 2016-04-19 13:14:11 +09:00
shun_iwasawa
fe7dd3b14f fix convert image bug 2016-04-18 23:23:21 +09:00
kogaki
5bbc3c26fa Revert "Remove strstream" 2016-04-18 22:16:18 +09:00
kogaki
417c1d6f96 Merge pull request #169 from skitaoka/fix/remove-strstream
Remove strstream
2016-04-18 19:14:23 +09:00
tomosu
794bf5dc65 fix vector preview problems 2016-04-18 17:22:43 +09:00
Shinya Kitaoka
07d4ebbb34 Merge pull request #186 from ideasman42/linux-include-auto_ptr-fix
Include memory, needed for auto_ptr references
2016-04-18 13:29:40 +09:00
Campbell Barton
40cabe2c56 Include memory, needed for auto_ptr references 2016-04-17 15:56:16 +10:00
Shinya Kitaoka
94f329e8fb fix tsound_mac.cpp 2016-04-15 18:03:25 +09:00
Shinya Kitaoka
c3fda32ba4 fix TOfflineGL::Imp 2016-04-15 14:42:51 +09:00
Shinya Kitaoka
a85aeb719a Merge remote-tracking branch 'upstream/master' into fix/reduce-boost-dependencies
# Conflicts:
#	toonz/sources/include/tfarmtask.h
2016-04-15 14:28:42 +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
Shinya Kitaoka
fa76aefa90 cosmetic change 2016-04-14 19:36:34 +09:00
Shinya Kitaoka
262a92f130 use smart pointer for m_imp 2016-04-14 19:15:09 +09:00
Shinya Kitaoka
e5734ac437 replace smart pointers 2016-04-14 16:51:50 +09:00
Shinya Kitaoka
791cd10a98 Merge pull request #147 from ideasman42/tstroke-remove-redundant-array
Remove redundant array allocation
2016-04-13 14:58:08 +09:00
Shinya Kitaoka
16a82fca96 Merge branch 'stringstream' of https://github.com/janisozaur/opentoonz into janisozaur-stringstream 2016-04-13 14:18:53 +09:00
Shinya Kitaoka
9c6c0f1688 Merge pull request #132 from janisozaur/parentheses
Encapsulate expressions in parentheses
2016-04-13 14:14:19 +09:00
Campbell Barton
d0e335dfee Fix include case 2016-04-12 02:58:51 +10:00
Campbell Barton
0648b484bf Use if defined(...) style 2016-04-12 02:56:45 +10:00
Campbell Barton
b66df2a0d6 Use strtok_r for Linux
Makes sense to use same logic for OSX and Linux
2016-04-12 02:56:45 +10:00
Campbell Barton
107701249b Basic edits for Linux portability 2016-04-12 02:56:45 +10:00
Campbell Barton
5db682049d Remove redundant array allocation 2016-04-07 14:38:39 +10:00
Michał Janiszewski
b1cc3ceeac Encapsulate expressions in parentheses
Some expressions appear to be confusing, adding parentheses removes
doubt in those cases.
2016-04-03 02:24:43 +02:00
Michał Janiszewski
df394d6939 Move to stringstream
std::strstream is deprecated, stringstream is the suggested replacement.
2016-04-03 02:22:18 +02: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
fukasawa
39e85d1a80 Merge remote-tracking branch 'origin' into fix-thirdparty 2016-03-24 00:56:29 +09:00
kusano
a0ab5dec40 Fix the compile error in tflash.h
Member functions with argument of vector<TSegment> or vector<TQuadratic> cannot be inline defined.
2016-03-24 00:43:29 +09:00
brly
9e73b85832 Remove TFlash::Imp class and sources/common files 2016-03-23 23:32:56 +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