Commit Graph

445 Commits

Author SHA1 Message Date
Jonathan Thomas
5f331e24df Merge pull request #265 from ferdnyc/catch-by-reference
Exceptions: catch-by-reference and other cleanup
2019-07-29 16:27:40 -05:00
Jonathan Thomas
f3354d997a Merge pull request #264 from ferdnyc/inline-av_err2str
FFmpegUtilities: inline av_make_error_string
2019-07-29 16:25:37 -05:00
Frank Dana
47d69779b6 Fix override syntax
Overrides go at the end of the declaration. Qt also has the `Q_DECL_OVERRIDE` preprocessor define, which expands to `override` only when building the code using C++11 or higher.
2019-07-16 12:28:00 -04:00
nick black
4a1d133da8 PlayerDemo: declare keyPressEvent() override 2019-07-16 10:37:45 -04:00
Frank Dana
86e610bfc8 Fix parameter documentation for brightness
The range was listed as 0 – 100, but implemented as -1 – +1. Edited documentation to reflect reality.

Reported by @jeffski like a year and a half ago.
Fixes #71
2019-07-10 04:48:31 -04:00
FeRD (Frank Dana)
80765147b9 Exceptions.h: fixes for noexcept, unused vars, std::
Some fixes for `-Wall`-readiness:
* Removed `using namespace std;` from the header and
  added `std::` prefixes where needed (`std::string`)
* Replaced `throw ()` in declarations with `noexcept`,
  as `throw ()` is [deprecated in c++11][1]
* Several exception classes had a `file_path` member
  variable, despite never using it. Removed the
  unused class member.

[1]:<https://en.cppreference.com/w/cpp/language/noexcept_spec>
2019-07-03 13:12:02 -04:00
FeRD (Frank Dana)
db51ea1ee0 FFmpegUtilities: inline av_make_error_string
Avoids warnings about the function being unused, if compiling
with `-Wall`

Borrowed from:
222f145230/src/zm_ffmpeg.h (L241)
2019-07-03 03:33:52 -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