Commit Graph

439 Commits

Author SHA1 Message Date
FeRD (Frank Dana)
2dc2fffa45 ZmqLogger: default AppendDebugMethod()'s extra params
Give the AppendDebugMethod() declaration a set of default values for
all parameters after the first. (It uses `""` and `-1.0`, which are
what callers were passing in anyway.) This way, callers have the
_option_ to eschew this kind of thing:
```
ZmqLogger::Instance()->AppendDebugMethod("Message", "start", start,
"length", length, "", -1, "", -1, "", -1, "", -1);
```
instead, they can use the functionally equivalent:
```
ZmqLogger::Instance()->AppendDebugMethod("Message", "start", start,
"length", length);
```
Passing meaningless args is the compiler's job, not the programmer's.
2019-07-03 14:06:44 -04: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
Frank Dana
8f42a9ff07 Fix tabs-vs-spaces indent in Timeline.h 2019-06-26 02:07:02 -04:00
Chris Kirmse
572875b8d7 Merge remote-tracking branch 'upstream/develop' into develop 2019-06-24 10:00:22 -07: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
67794f96d9 Merge pull request #234 from jeffski/fix-settings-include-path
Fix path to Settings.h
2019-06-21 14:23:53 -05: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
eisneinechse
d6eef8f0db Merge branch 'develop' into develop 2019-06-20 13:46:35 -07:00
eisneinechse
c54a3705ff Update FFmpegUtilities.h
Warnings are now silenced in FFmpegUtilities.h, where it should be.
2019-06-20 13:41:03 -07:00
FeRD (Frank Dana)
0dcbc20921 Doxygen docs: Link to install docs
This adds references to all three `INSTALL-*.md` documents to
the main page text in `include/OpenShot.h`, replacing the previous
link to the PDF.
2019-06-12 22:55:54 -04: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)
5292661dec Also remove install guide ref from OpenShot.h 2019-06-12 21:26:18 -04:00
FeRD (Frank Dana)
9261f46772 More copyright, missed a few older ones 2019-06-11 06:51:37 -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
Jonathan Thomas
2b308c6d59 Update Frame.h 2019-06-08 12:23:26 -05:00
Jeff Shillitto
855fd85de2 Fix path to Settings.h 2019-06-01 19:38:40 +10:00
Jonathan Thomas
13e74b147a Adding new CheckPixel method to validate a specific pixel color 2019-05-31 19:02:28 -05:00
Jonathan Thomas
9ffd6a6f75 Fixing crash when destructing Timeline/Clips/FrameMapper 2019-05-13 23:55:03 -05:00
Jonathan Thomas
968e472c73 Tweak how Timeline manages the cache object (sometimes itself, and sometimes by the user if they call SetCache) 2019-05-13 17:11:40 -05:00