Commit graph

101 commits

Author SHA1 Message Date
Shinya Kitaoka
a09dc1b458 Merge pull request #61 from ideasman42/linux-frameserver-sysconf-fix
Linux: Frameserver system memory access
2016-04-15 13:42:46 +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
kusano
d652c1303c Workaround for crash in multiple monitors
See QTBUG-48288.
Qt may crash in handling WM_SIZE of m_sceneViewer in splash.finish(&w) in main.cpp.
To suppress sending WM_SIZE, set window position before splash.finish(&w).
WM_SIZE will not be sent if window poistion is not changed.
2016-04-14 05:01:56 +09:00
Keisuke Ogaki
e76b224937 fix to include cmath
this fixes commit#6dca1d3a6d64f6b55d5545fd209acc0f81aab9ec
in OSX, need to include cmath to use std::abs
2016-04-13 19:25:54 +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
kogaki
9fbffc4177 Merge pull request #163 from xenogenesi/fix-sceneviewer-rightbtn
non-windows: fake mouse right release event on contextMenuEvent
2016-04-13 14:19:52 +09:00
Shinya Kitaoka
8c5f687a8c Merge pull request #117 from jpumc/patch-oos-build-1
Fix CMAKE_MODULE_PATH for out-of-source build
2016-04-13 14:14:56 +09:00
Shinya Kitaoka
9c6c0f1688 Merge pull request #132 from janisozaur/parentheses
Encapsulate expressions in parentheses
2016-04-13 14:14:19 +09:00
Shinya Kitaoka
6dca1d3a6d Merge pull request #131 from janisozaur/abs
Fixes for abs()
2016-04-13 14:12:56 +09:00
Shinya Kitaoka
bbf7b2dac8 Merge pull request #120 from ideasman42/linux-preproc-error-fix
Use #error directive instead of explicit syntax error
2016-04-13 14:12:16 +09:00
Shinya Kitaoka
7ac5ba3eff Merge pull request #111 from OriginalAdric/fix_unrefd_locals
Fix unreferenced locals/labels warnings
2016-04-13 14:11:27 +09:00
Shinya Kitaoka
5f610203fc Merge pull request #70 from ideasman42/cmake-whitespace-cleanup
CMake: use spaces for indentation & whitespace edits
2016-04-13 14:10:04 +09:00
xenogenesi
456038b5ce non-windows: fake mouse right release event 2016-04-12 18:11:03 +02: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
acc5e60836 Remove ifdef's for cstring includes
These are needed on Linux for memcpy, memmove etc... but not unique to Linux of course.
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
tomosu
5545c5bfbd Merge pull request #151 from kogaki/fix/cmake_png_include
Fix cmake to be able to search custom libpng include path
2016-04-08 20:25:58 +09:00
tomosu
cb0b4d066f change clean-up location and add comment 2016-04-08 19:51:23 +09:00
tomo-suzuki
e6f45b6a60 add clean-up at the end of SceneViewer::contextMenuEvent 2016-04-08 11:56:21 +09:00
Keisuke Ogaki
b22d0cfb59 Add libpng include path search 2016-04-08 00:17:03 +09:00
Campbell Barton
5db682049d Remove redundant array allocation 2016-04-07 14:38:39 +10:00
Yuri Odagiri
6cd606de62 Merge pull request #47 from camjc/master
Fix: User facing typos throughout application
2016-04-06 12:19:10 +09:00
shun_iwasawa
49ff76e3d3 Merge remote-tracking branch 'origin/master' into revert_schematic_output_port 2016-04-04 19:05:17 +09:00
shun_iwasawa
22eaa48951 revert schematic output port 2016-04-04 19:03:52 +09: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
0585eef453 Fixes for abs()
abs() only returns integer values, while arguments and results are real
in the cases fixed.

Also fixes some unexpected tokens after `#endif`.
2016-04-03 02:23:59 +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
jpumc
a8cd98dd0c Fix CMAKE_MODULE_PATH for out-of-source build 2016-03-31 17:09:25 +03:00
brly
fed8a75dde Fix compile error on clang
Avoid 'chosen constructor is explicit in copy-initialization' error.
2016-03-31 01:24:00 +09:00
Adric Worley
fe9b8bc573 Fixes unused label warning.
Commented out instead of deleted, as label is referenced by FIXME comment and associated goto on lines 82-84.
2016-03-30 09:28:32 -04:00
Adric Worley
f63c1a0076 Fixes unreferenced local variable warnings.
Deleted variables in most cases. Commented out or moved to IFDEF where referenced by existing but disabled code.
2016-03-30 09:25:34 -04:00
roentgen
46416c1cad Merge pull request #64 from ideasman42/linux-resource-case-fix
Linux: Use lowercase for all resources (failed to build)
2016-03-30 02:09:49 +09:00
Campbell Barton
b696885d9a Fix error with ifdef blocks
noted by @linkmauve
2016-03-29 15:49:16 +11:00
Michael Cullen
b49802832b Fix build when libtiff exists on system
On OSX at least, if you have libtiff in your system include path,
it will use that instead of the bundled modified version even if
FindTIFF.cmake locates the correct version. This commit fixes that
by making sure the libtiff include directory is before the system
include paths.
2016-03-28 14:50:54 +01:00
Campbell Barton
3dcf6bfa09 CMake: use tab indentation & whitespace edits 2016-03-27 14:44:29 +11:00
Campbell Barton
cc5860ee72 Use lowercase for all resources (failed to build on Linux) 2016-03-27 11:50:14 +11:00
Campbell Barton
1db1c004b9 Linux: frameserver memory fix 2016-03-27 11:17:15 +11:00
roentgen
25e5605c50 Merge pull request #36 from ArseniyShestakov/fix-cmake-lettercase
Fix letter case in CMakeLists.txt
2016-03-27 02:11:52 +09: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
Cameron Chamberlain
bfee0019b7 Fix: User facing typos throughout application
- inbeteween -> inbetween
- abount -> about
- seleted -> selected
- successfull -> successful
- undefinied -> undefined
- colonnesdoivent (fr) -> colonnes doivent
- seleted (fr) -> sélectionnés
- cleeanup -> removed from translations,
  wasn't translated anyway and
  was removed from english codebase
2016-03-26 22:30:38 +11:00
Arseniy Shestakov
5e9e969bb2 Fix letter case in CMakeLists.txt 2016-03-26 06:16:40 +03:00
roentgen
7e185111a8 Merge pull request #33 from opentoonz/export-pluginsdk
added package_sdk.sh to export the sdk. and toonz_plugin_helper*.h ar…
2016-03-25 20:28:53 +09:00
roentgen
edd579074d added package_sdk.sh to export the sdk. and toonz_plugin_helper*.h are moved to utils dir to plublic developers 2016-03-25 20:25:20 +09:00
Toshihiro Shimizu
5dddbf3dad Merge pull request #24 from opentoonz/suppress-warning-C4819
Suppress warning C4819 in Visual Studio 2013
2016-03-25 19:40:52 +09:00
roentgen
f09e094840 Merge pull request #30 from opentoonz/fix-lzodriver
we always have thirdparty/lzo/driver. osx build never uses thirdpary/…
2016-03-25 18:55:07 +09:00
roentgen
3047bb2598 we always have thirdparty/lzo/driver. osx build never uses thirdpary/lzo/lzo-2.09 (was removed) 2016-03-25 18:42:18 +09:00
kusano
52db9569b3 Force Qt to use desktop OpenGL
since currently OpenToonz does not work with OpenGL of software or angle.
2016-03-25 02:37:28 +09:00