Chris Kirmse
572875b8d7
Merge remote-tracking branch 'upstream/develop' into develop
2019-06-24 10:00:22 -07:00
Jonathan Thomas
5f48fbf1a4
Merge pull request #251 from ferdnyc/crop-args
...
Crop.h: Remove nonexistent color argument
2019-06-21 00:25:29 -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
FeRD (Frank Dana)
4455f77bd9
Crop.h: Remove nonexistent color argument
...
Doxygen caught this one: the default constructor for Crop()
doesn't take an argument 'color', though it was documented to.
2019-06-12 21:27:53 -04:00
FeRD (Frank Dana)
f170fdd009
Update copyright range to current year
2019-06-11 06:48:32 -04:00
FeRD (Frank Dana)
0327c2ab5c
Remove license block from documentation comment
2019-06-09 08:31:04 -04:00
Chris Kirmse
650d3ec820
fix grammar error with possessive its and update sample for audio parameter
2019-03-14 09:26:56 -07:00
Jonathan Thomas
da01a2c4cb
Adding "reader" property for Mask effect, to allow the user to adjust the image or video used by the mask effect.
2018-08-02 00:42:14 -05:00
Jonathan Thomas
244fac4df8
Adding new crop effect, which can also be animated for some very cool effects.
2018-03-05 02:12:37 -06:00
Jonathan Thomas
df2b59cf24
Optimize and improve speed of Mask effect (used by transitions). This is way faster than before now!
2018-03-03 23:16:47 -06:00
Jonathan Thomas
7f9fc30203
Adding new Color Shift effect, which can shift any color (RGBA) with infinite wrapping (and full supports animation).
2018-03-03 18:02:14 -06:00
Jonathan Thomas
3034bbe273
Adding new Pixelate video effect, which pixelates a portion (or all) of a frame's image, and is fully animatable.
2018-02-09 16:43:43 -06:00
Jonathan Thomas
8c1da9798b
Adding new video effect: Bars, which allow for animating colored bars around your video, such as a letterbox effect.
2018-02-09 02:37:05 -06:00
Jonathan Thomas
c159fde729
Adding new wave video effect, which can be animated in a ton of ways to create lots of cool wave distortion effects.
2018-02-08 03:51:32 -06:00
Jonathan Thomas
c81d42629d
Adding Hue video effect, to adjust the hue of a frame's image, which can also be animated with a keyframe
2018-02-06 02:26:35 -06:00
Jonathan Thomas
4a9f2a0a00
Adding new effect: Shift, an infinite pixel shifting effect which can be animated and wrap images in any direction.
2018-02-06 00:51:59 -06:00
Jonathan Thomas
566c8f5a82
Spelling and typo fixes. Thanks Gelma for the pull request
2018-01-06 02:22:05 -06:00
Jonathan Thomas
2fcb35ddcc
Removing throw statements from header files (thanks Peter)
2017-10-26 18:44:35 -05:00
Jonathan Thomas
c95db460d6
Big update! Updating all "long int" frame number types to int64_t, so all 3 OSes will produce the same depth and precision on frame numbers. Also removing variable bitrate support temporarily, since it causes more problems than it solves.
2017-09-28 16:03:01 -05:00
Jonathan Thomas
f12ffe692b
Migrating tr1 to std, adding C++11 support to build scripts, fixing crash in FFmpegReader (caused by shared_ptr, buffer, and last_video_frame corruption). Much improved stability with this change. Thanks to Craig and Peter for the help!
2017-08-20 17:37:39 -05:00
Jonathan Thomas
4439131a82
Fixed regression for ImageMagick enabled builds
2016-02-23 10:04:07 -06:00
Jonathan Thomas
45f1b8c5ac
Making ImageMagick completely optional. This will simplify packaging on Windows and Mac. Also, reprogrammed Display, DisplayWaveform, Save, and Thumbnail methods, which are much faster now (using Qt).
2016-02-23 00:27:03 -06:00
Jonathan Thomas
6f1bee9b65
Fixing version # bug with 0.0.10... Apparently my build system can't handle 2 digit #s, haha. Bumping version to 0.1.0, and fixing a documentation bug.
2016-02-08 21:52:25 -06:00
Jonathan Thomas
3731b22317
Added a new effect: Blur. It has the ability to box blur, horizontal and vertical blur, and gaussian blur. All of these settings are keyframeable and can be animated.
2015-11-09 00:12:21 -06:00
