Commit Graph

976 Commits

Author SHA1 Message Date
FeRD (Frank Dana)
25b522589d Always catch-by-reference in C++11 2019-07-03 12:58:02 -04:00
FeRD (Frank Dana)
cb6ac21219 src/effects: Catch-by-reference 2019-07-03 06:29:32 -04:00
Jonathan Thomas
1b19ae7fe4 Merge pull request #249 from chad3814/crop
make use of crop_x, crop_y, crop_with, crop_height keyframes
2019-07-01 14:24:59 -05:00
Jonathan Thomas
3b62176f56 Merge pull request #262 from ferdnyc/fix-win32-install
Properly install DLL on Win32
2019-07-01 13:06:25 -05:00
Jonathan Thomas
67e2ae4c1b Merge branch 'develop' into cmake-owns-version
# Conflicts:
#	CMakeLists.txt
2019-07-01 12:30:56 -05:00
Jonathan Thomas
376170d7dd Merging work from @ferdnyc, to move version info to CMake, and other misc Cmake improvements. This was the easiest way to resolve the merge conflict for me (to apply it locally and commit it). 2019-07-01 12:24:50 -05:00
Jeff Shillitto
7b88e91de4 Merge branch 'develop' into pr/1 2019-06-27 14:10:35 +10:00
FeRD (Frank Dana)
cf9fbf4402 Properly install DLL on Win32
Adding a RUNTIME DESTINATION to the install for the library
target will install the DLL on Windows systems, so it no
longer has to be manually copied in the `.gitlab-ci.yml` script
2019-06-26 21:19:02 -04:00
jediserg
b851508c9f --add QtTextWriter (it's based on TextReader and use Qt instead image magick) 2019-06-25 03:41:28 -07:00
Chris Kirmse
572875b8d7 Merge remote-tracking branch 'upstream/develop' into develop 2019-06-24 10:00:22 -07:00
Chad Walker
e2677e4512 fix the crop_x and crop_y min and max 2019-06-22 20:19:34 -05:00
Chad Walker
094c378e67 add crop properties to json 2019-06-21 23:43:56 -05:00
Jonathan Thomas
9d09b65e70 Revert "Don't break Python install path detection on Debian" 2019-06-21 16:47:37 -05:00
Jonathan Thomas
eea1293d6d Merge pull request #229 from ferdnyc/debian-py-fix
Don't break Python install path detection on Debian
2019-06-21 16:32:27 -05:00
Jonathan Thomas
ac8876f810 Removing duplicated destructor definitions and implementations... so our virtual destructors will not break on older toolchains. 2019-06-21 15:57:41 -05:00
Jonathan Thomas
ffb5439a2e Merge pull request #224 from sparfenyuk/develop
Add virtual destructor for abstract classes
2019-06-21 15:47:08 -05:00
Jonathan Thomas
f11acef193 Merge pull request #180 from jeffski/text-background-box
Add a text background colored box option to the text reader
2019-06-21 15:39:57 -05:00
Jonathan Thomas
16bb22c238 Merge pull request #247 from SuslikV/patch-5
Add 2 new multiplexing presets for mp4, mov files
2019-06-21 15:25:55 -05:00
Jonathan Thomas
967f23b8a4 Merge pull request #245 from ferdnyc/license-block
Upgrade Doxygen documentation formatting/content
2019-06-21 00:24:54 -05:00
Frank Dana
a47d5b58fd Add backwards-compatible Imagemagick 7 support (#252)
* Add ImageMagick 7 compatibility

A new header, `imclude/MagickUtilities.h`, is created to hold the
compatibility `#define`s.

The image-conversion code in `src/Frame.cpp` received the only
major changes — instead of doing the export by hand (and having
to account for changes in the underlying API), it uses the
`MagickCore::ExportImagePixels()` function which does basically
the same work, but accounts for all of the API changes for us.
The API of that function is _unchanged_ from IM6 to IM7.

TODO: `MagickCore::ExportImagePixels()` will return an `exception`
struct if it encounters any problems. Currently the code ignores
that, which it should not.

* Add ImageMagick 7 compatibility

A new header, `imclude/MagickUtilities.h`, is created to hold the
compatibility `#define`s.

The image-conversion code in `src/Frame.cpp` received the only
major changes — instead of doing the export by hand (and having
to account for changes in the underlying API), it uses the
`MagickCore::ExportImagePixels()` function which does basically
the same work, but accounts for all of the API changes for us.
The API of that function is _unchanged_ from IM6 to IM7.

TODO: `MagickCore::ExportImagePixels()` will return an `exception`
struct if it encounters any problems. Currently the code ignores
that, which it should not.

Thanks @ferdnyc
2019-06-21 00:07:49 -05:00
Jonathan Thomas
faa3a34420 Merge pull request #256 from ferdnyc/deprecate-jsonreader
Remove Json:Reader
2019-06-20 18:07:26 -05:00
FeRD (Frank Dana)
744a4f3ec1 Remove Json:Reader
`Json::Reader` has been deprecated for some time, so we replace it with
`Json::CharReader` generated by a `Json::CharReaderBuilder`, or (in the
one instance where we have a stream as input) `Json::parseFromStream();`
2019-06-19 21:20:04 -04:00
FeRD (Frank Dana)
eab81b0b7d Upgrade jsoncpp to 1.8.4
This current version supports the new `Json::CharReader`, which
replaces the now-deprecated `Json::Reader`. It's necessary to
eliminate `Json::Reader` from libopenshot because using it
causes a flood of deprecation warnings when building with
system jsoncpp.

Also, the `thirdparty/jsoncpp` directory was generated using
the jsoncpp project's `amalgamate.py` tool, which condenses
the library down to a single C++ source file and two headers,
making it easier to incorporate into libopenshot.
2019-06-19 21:03:08 -04:00
Chad Walker
0fd335ab7b use source_image->width() and source_image->height() instead of scaled_source_width and scaled_source_height 2019-06-11 20:28:23 -05:00
Chad Walker
f82c01db2d make use of crop_x, crop_y, crop_with, crop_height keyframes 2019-06-11 17:29:35 -05:00