dcpomatic.git
4 years agoTry to fix no-stretch / no-scale for non-square pixels (#1636). v2.15.30
Carl Hetherington [Fri, 8 Nov 2019 16:21:19 +0000 (17:21 +0100)]
Try to fix no-stretch / no-scale for non-square pixels (#1636).

4 years agoRemove duplicate log introduced by previos.
Carl Hetherington [Wed, 6 Nov 2019 21:28:44 +0000 (22:28 +0100)]
Remove duplicate log introduced by previos.

4 years agoMore logging when finding assets to put in reels.
Carl Hetherington [Wed, 6 Nov 2019 21:27:04 +0000 (22:27 +0100)]
More logging when finding assets to put in reels.

4 years agoTry to ignore exceptions thrown from boost::filesystem::is_symlink (#1662).
Carl Hetherington [Wed, 6 Nov 2019 12:48:17 +0000 (13:48 +0100)]
Try to ignore exceptions thrown from boost::filesystem::is_symlink (#1662).

4 years agoDifferentiate between stop and suspend in player.
Carl Hetherington [Tue, 5 Nov 2019 22:01:24 +0000 (23:01 +0100)]
Differentiate between stop and suspend in player.
This and the previous commit somewhat improve the previously
terrible behaviour when seeking during playback, probably
introduced by the idle update stuff.

4 years agoDon't request idle get if we are starting playback again.
Carl Hetherington [Tue, 5 Nov 2019 20:20:32 +0000 (21:20 +0100)]
Don't request idle get if we are starting playback again.

4 years agoRemove dubious _buffers_mutex and maintain a lock on _mutex for
Carl Hetherington [Tue, 5 Nov 2019 20:09:37 +0000 (21:09 +0100)]
Remove dubious _buffers_mutex and maintain a lock on _mutex for
the whole of ::audio.  Otherwise changes to pending seeks can be
mixed up with audio being put into the ringbuffer.

4 years agoProvide some test references.
Carl Hetherington [Tue, 5 Nov 2019 07:49:03 +0000 (08:49 +0100)]
Provide some test references.

4 years agoYet more waking (in hash computation).
Carl Hetherington [Mon, 4 Nov 2019 23:04:21 +0000 (00:04 +0100)]
Yet more waking (in hash computation).

4 years agoMerge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x v2.15.29
Carl Hetherington [Mon, 4 Nov 2019 21:05:24 +0000 (22:05 +0100)]
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x

4 years agoHack for python 3 compatibility (Fedora 31).
Carl Hetherington [Mon, 4 Nov 2019 21:04:44 +0000 (22:04 +0100)]
Hack for python 3 compatibility (Fedora 31).

4 years agoAdd some new Waker calls.
Carl Hetherington [Mon, 4 Nov 2019 19:44:13 +0000 (20:44 +0100)]
Add some new Waker calls.

4 years agoFix incorrect images when cropping without stretch.
Carl Hetherington [Mon, 4 Nov 2019 15:38:14 +0000 (16:38 +0100)]
Fix incorrect images when cropping without stretch.
Always overallocate images so that Image::crop_scale_window is always
safe from over-reading buffers.  Relates to #1654 and probably #1653.

4 years agoFix out-of-bounds read when cropping JPEG2000 images (#1654).
Carl Hetherington [Mon, 4 Nov 2019 11:04:30 +0000 (12:04 +0100)]
Fix out-of-bounds read when cropping JPEG2000 images (#1654).

4 years agoAdd a test to expose #1654, on valgrind at least.
Carl Hetherington [Mon, 4 Nov 2019 09:06:38 +0000 (10:06 +0100)]
Add a test to expose #1654, on valgrind at least.

4 years agoTweak hack program.
Carl Hetherington [Mon, 4 Nov 2019 09:04:40 +0000 (10:04 +0100)]
Tweak hack program.

4 years agoDon't bother limiting supporters by until date.
Carl Hetherington [Sun, 3 Nov 2019 23:30:17 +0000 (00:30 +0100)]
Don't bother limiting supporters by until date.

4 years agoIncrease fudge factor at the boundary between audio signal and silence.
Carl Hetherington [Fri, 1 Nov 2019 10:25:20 +0000 (11:25 +0100)]
Increase fudge factor at the boundary between audio signal and silence.

4 years agoAdd missing reel type call to test.
Carl Hetherington [Fri, 1 Nov 2019 09:09:40 +0000 (10:09 +0100)]
Add missing reel type call to test.

4 years agoMore detailed test logger.
Carl Hetherington [Fri, 1 Nov 2019 07:21:33 +0000 (08:21 +0100)]
More detailed test logger.

4 years agoTweak test now that can_reference_audio correctly succeeds when there is no overlappi...
Carl Hetherington [Thu, 31 Oct 2019 22:59:08 +0000 (23:59 +0100)]
Tweak test now that can_reference_audio correctly succeeds when there is no overlapping audio.

4 years agoMake separate reels for parts of the timeline with no video when
Carl Hetherington [Thu, 31 Oct 2019 20:45:41 +0000 (21:45 +0100)]
Make separate reels for parts of the timeline with no video when
we are in REEL_TYPE_BY_VIDEO_CONTENT mode.  This fixes VF creation
with gaps.  Also the implementation of Film::reels() is cleaner now.

4 years agoFix incorrect reels when the first content is not at time 0.
Carl Hetherington [Thu, 31 Oct 2019 19:34:53 +0000 (20:34 +0100)]
Fix incorrect reels when the first content is not at time 0.
With REELTYPE_BY_VIDEO_CONTENT the first reel would not start at 0.

4 years agoKeep default export name even if the user changes the format (#1584).
Carl Hetherington [Thu, 31 Oct 2019 21:21:02 +0000 (22:21 +0100)]
Keep default export name even if the user changes the format (#1584).

4 years agoPrevent reference/reel setting controls getting stuck when referenced
Carl Hetherington [Thu, 31 Oct 2019 21:11:36 +0000 (22:11 +0100)]
Prevent reference/reel setting controls getting stuck when referenced
content is moved with reel mode 'single' enabled (#1645).

4 years agoAdd python script to summarise some film metadata.
Carl Hetherington [Thu, 31 Oct 2019 16:26:20 +0000 (17:26 +0100)]
Add python script to summarise some film metadata.

4 years agoSet fade in/out using content frame rate rather than DCP rate (#1642).
Carl Hetherington [Thu, 31 Oct 2019 15:01:58 +0000 (16:01 +0100)]
Set fade in/out using content frame rate rather than DCP rate (#1642).

4 years agoAdd comment.
Carl Hetherington [Thu, 31 Oct 2019 15:01:37 +0000 (16:01 +0100)]
Add comment.

4 years agoFix dying butler on changing CPL from one without to one with v2.15.28
Carl Hetherington [Wed, 30 Oct 2019 21:39:58 +0000 (21:39 +0000)]
Fix dying butler on changing CPL from one without to one with
subtitles (#1641).

Forward-port from da39ed1516f2463f8a9bf4795a94f23d420c9ca3 in master.

4 years agoFix incorrectly-placed set +e when building universal binaries. v2.15.27
Carl Hetherington [Sun, 27 Oct 2019 21:54:36 +0000 (22:54 +0100)]
Fix incorrectly-placed set +e when building universal binaries.

4 years agoFix thinko in previous.
Carl Hetherington [Sun, 27 Oct 2019 20:18:10 +0000 (21:18 +0100)]
Fix thinko in previous.

4 years agoProtect cross-thread access to _pending_images.
Carl Hetherington [Sun, 27 Oct 2019 12:11:32 +0000 (13:11 +0100)]
Protect cross-thread access to _pending_images.

4 years agoAvoid unnecessary re-writes of video assets if they are staying the same (#1638). v2.15.26
Carl Hetherington [Wed, 23 Oct 2019 22:24:24 +0000 (00:24 +0200)]
Avoid unnecessary re-writes of video assets if they are staying the same (#1638).

This is particularly useful as it avoids the hard-link-breaking
copy step which is necessary if you're going to re-write the
video asset with new IDs.

4 years agoPut encryption key into the video identifier so that it is re-made if the key changes.
Carl Hetherington [Thu, 24 Oct 2019 10:47:08 +0000 (12:47 +0200)]
Put encryption key into the video identifier so that it is re-made if the key changes.

4 years agoPrevent player folding audio to 2 channel if "default DCP audio channels" is set...
Carl Hetherington [Fri, 25 Oct 2019 22:51:26 +0000 (00:51 +0200)]
Prevent player folding audio to 2 channel if "default DCP audio channels" is set to 2.

4 years agoPrevent calls to erase with invalid keys.
Carl Hetherington [Fri, 25 Oct 2019 22:43:35 +0000 (00:43 +0200)]
Prevent calls to erase with invalid keys.

4 years agoOnly notarize thin OSX builds.
Carl Hetherington [Thu, 24 Oct 2019 22:45:37 +0000 (00:45 +0200)]
Only notarize thin OSX builds.

4 years agoMerge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x v2.15.25
Carl Hetherington [Mon, 21 Oct 2019 16:42:03 +0000 (18:42 +0200)]
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x

4 years agoTweak error handling in make_osx.
Carl Hetherington [Mon, 21 Oct 2019 16:41:55 +0000 (18:41 +0200)]
Tweak error handling in make_osx.

4 years agoMerge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x
Carl Hetherington [Mon, 21 Oct 2019 15:25:16 +0000 (17:25 +0200)]
Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x

4 years agoCopy with progress updates when we might copy long files (#1574).
Carl Hetherington [Mon, 21 Oct 2019 15:25:04 +0000 (17:25 +0200)]
Copy with progress updates when we might copy long files (#1574).

4 years agoAdd notarization steps to make_dmg.sh v2.15.24
Carl Hetherington [Sat, 19 Oct 2019 18:33:17 +0000 (20:33 +0200)]
Add notarization steps to make_dmg.sh

4 years agoRename dcpomatic_sleep -> dcpomatic_sleep_seconds.
Carl Hetherington [Sun, 20 Oct 2019 22:59:59 +0000 (00:59 +0200)]
Rename dcpomatic_sleep -> dcpomatic_sleep_seconds.

4 years agoRemove hard-coded environment location in OS X build.
Carl Hetherington [Sun, 20 Oct 2019 21:38:57 +0000 (23:38 +0200)]
Remove hard-coded environment location in OS X build.

4 years agoISDCF name fixes with > 6 channels and HI/VI (#1633).
Carl Hetherington [Fri, 18 Oct 2019 15:48:13 +0000 (17:48 +0200)]
ISDCF name fixes with > 6 channels and HI/VI (#1633).

4 years agoAllow thin builds (target name osx-64).
Carl Hetherington [Wed, 9 Oct 2019 21:47:29 +0000 (23:47 +0200)]
Allow thin builds (target name osx-64).

4 years agoFix assertion failure on making a VF, in certain circumstances.
Carl Hetherington [Tue, 15 Oct 2019 22:04:53 +0000 (22:04 +0000)]
Fix assertion failure on making a VF, in certain circumstances.

These circumstances were a VF which refers to at least one complete
reel of audio from a OV before adding more audio of its own.

Forward-porter from 392d675f5799671abbcf1a9a47820321bcbdcca2 in master.

4 years agoFix confusing error in windows where it would complain about : in full pathnames...
Carl Hetherington [Tue, 15 Oct 2019 08:13:58 +0000 (10:13 +0200)]
Fix confusing error in windows where it would complain about : in full pathnames if creating a directory failed.

4 years agoMissed indent.
Carl Hetherington [Mon, 14 Oct 2019 23:01:44 +0000 (01:01 +0200)]
Missed indent.

4 years agoPrune some dependencies and add Ubuntu 19.10.
Carl Hetherington [Mon, 14 Oct 2019 20:24:33 +0000 (22:24 +0200)]
Prune some dependencies and add Ubuntu 19.10.

4 years agoAdd a comment. v2.15.23
Carl Hetherington [Mon, 14 Oct 2019 13:59:26 +0000 (15:59 +0200)]
Add a comment.

4 years agoAdd option to use lld.
Carl Hetherington [Mon, 14 Oct 2019 14:48:21 +0000 (16:48 +0200)]
Add option to use lld.

4 years agoRemove unused bits.
Carl Hetherington [Mon, 14 Oct 2019 14:44:01 +0000 (16:44 +0200)]
Remove unused bits.

4 years agoRemove an optimisation to not run the body of ContentPanel::check_selection
Carl Hetherington [Mon, 14 Oct 2019 10:25:04 +0000 (12:25 +0200)]
Remove an optimisation to not run the body of ContentPanel::check_selection
if it is called with an unchanged selection.  It breaks updates
of the available tabs when a OV is added to a VF DCP.

4 years agoMerge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x
Carl Hetherington [Mon, 14 Oct 2019 09:24:48 +0000 (11:24 +0200)]
Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x

4 years agoRemove python 2 style print now that we are importing print_function from future.
Carl Hetherington [Mon, 14 Oct 2019 09:23:07 +0000 (11:23 +0200)]
Remove python 2 style print now that we are importing print_function from future.

4 years agoHide the upmixers unless an "advanced" configuration option is ticked. v2.15.22
Carl Hetherington [Sun, 13 Oct 2019 21:47:33 +0000 (23:47 +0200)]
Hide the upmixers unless an "advanced" configuration option is ticked.

The upmixers are not of sufficient quality to always be an improvement,
and anecdotally it seems that some users see them and hope one will
be a silver bullet.

4 years agoFix failure to load OV after adding a VF to a project.
Carl Hetherington [Sun, 13 Oct 2019 21:47:17 +0000 (23:47 +0200)]
Fix failure to load OV after adding a VF to a project.

This has the same cause as
19f51503621a57794bd79bac053c9e6549a69f46
i.e. the DCPDecoder re-use optimisation.  This commit tries to
re-fix 19f515 in a more general way which also takes into account
the OV/VF bug.  It also adds a unit test.

4 years agoTweak hint.
Carl Hetherington [Sun, 13 Oct 2019 20:28:36 +0000 (22:28 +0200)]
Tweak hint.

4 years agoMerge branch 'v2.15.x' of ssh://main.carlh.net/home/carl/git/dcpomatic into v2.15.x
Carl Hetherington [Thu, 10 Oct 2019 18:16:46 +0000 (20:16 +0200)]
Merge branch 'v2.15.x' of ssh://main.carlh.net/home/carl/git/dcpomatic into v2.15.x

4 years agoAllow debug builds with no internet connection. Also add missing patron.
Carl Hetherington [Wed, 9 Oct 2019 20:08:02 +0000 (22:08 +0200)]
Allow debug builds with no internet connection.  Also add missing patron.

4 years agoFix deadlock in test.
Carl Hetherington [Wed, 9 Oct 2019 10:43:44 +0000 (12:43 +0200)]
Fix deadlock in test.

4 years agoFix cross-thread access to info files. May help with #1618.
Carl Hetherington [Tue, 8 Oct 2019 22:43:22 +0000 (00:43 +0200)]
Fix cross-thread access to info files.  May help with #1618.

4 years agoPython 3 and bug fix hacks.
Carl Hetherington [Mon, 7 Oct 2019 22:52:11 +0000 (00:52 +0200)]
Python 3 and bug fix hacks.

4 years agoMerge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x v2.15.21
Carl Hetherington [Sat, 5 Oct 2019 19:27:28 +0000 (21:27 +0200)]
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x

4 years agoMissing file in manual build.
Carl Hetherington [Sat, 5 Oct 2019 19:27:20 +0000 (21:27 +0200)]
Missing file in manual build.

4 years agoMerge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
Carl Hetherington [Thu, 3 Oct 2019 23:22:36 +0000 (01:22 +0200)]
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x

4 years agoRemove long-defunct .travis.yml.
Carl Hetherington [Thu, 3 Oct 2019 23:22:30 +0000 (01:22 +0200)]
Remove long-defunct .travis.yml.

4 years agoAdd xattr command to remove things from .apps that codesign does not like.
Carl Hetherington [Thu, 3 Oct 2019 17:47:39 +0000 (19:47 +0200)]
Add xattr command to remove things from .apps that codesign does not like.
It says:

resource fork, Finder information, or similar detritus not allowed

I'm not sure why this suddenly became necessary.

Forward-ported from 5b1c0d804847978e32bc4ce4de43f148c366f9da in master.

4 years agoImprove OpenFileError so that it doesn't say "opening for read" v2.15.20
Carl Hetherington [Sun, 29 Sep 2019 21:28:57 +0000 (23:28 +0200)]
Improve OpenFileError so that it doesn't say "opening for read"
in one case where it should say "opening for read/write".

Also add some unit tests for ReelWriter.

4 years agoIgnore ccls stuff.
Carl Hetherington [Sun, 29 Sep 2019 00:15:16 +0000 (02:15 +0200)]
Ignore ccls stuff.

4 years agoFix failure to playback encrypted DCPs, introduced when adding DCPDecoder re-use...
Carl Hetherington [Sun, 22 Sep 2019 21:59:49 +0000 (23:59 +0200)]
Fix failure to playback encrypted DCPs, introduced when adding DCPDecoder re-use optimisation.

4 years agoFix duplicate shortcut in menu.
Carl Hetherington [Sun, 22 Sep 2019 21:36:32 +0000 (23:36 +0200)]
Fix duplicate shortcut in menu.

4 years agoUse content video frame rate rather than the DCP one when reading
Carl Hetherington [Fri, 20 Sep 2019 08:22:10 +0000 (10:22 +0200)]
Use content video frame rate rather than the DCP one when reading
trim start/end back from the UI.  See #1607.

4 years agoAdd a warning log when an assertion gets hit.
Carl Hetherington [Thu, 19 Sep 2019 22:11:25 +0000 (00:11 +0200)]
Add a warning log when an assertion gets hit.

Forward-ported from 4141f01e25abd5050db09ff85da47ff059909669 in master.

4 years agoTidy some grammar and remove a silly colloquialism.
Carl Hetherington [Fri, 13 Sep 2019 21:17:03 +0000 (22:17 +0100)]
Tidy some grammar and remove a silly colloquialism.

4 years agopot/merge. v2.15.19
Carl Hetherington [Mon, 9 Sep 2019 01:01:49 +0000 (02:01 +0100)]
pot/merge.

4 years agoStop crashing when running the hints check on films with silent/black gaps.
Carl Hetherington [Mon, 9 Sep 2019 00:18:54 +0000 (01:18 +0100)]
Stop crashing when running the hints check on films with silent/black gaps.

4 years agoHandle errors a little better when scanning for closed captions (in hints).
Carl Hetherington [Sun, 8 Sep 2019 23:27:23 +0000 (00:27 +0100)]
Handle errors a little better when scanning for closed captions (in hints).

4 years agoFix timeline selection under scroll.
Carl Hetherington [Sun, 8 Sep 2019 22:57:03 +0000 (23:57 +0100)]
Fix timeline selection under scroll.

4 years agoNew hack. v2.15.18
Carl Hetherington [Sun, 8 Sep 2019 00:49:52 +0000 (01:49 +0100)]
New hack.

4 years agoMake sure subtitle exports have .xml extension.
Carl Hetherington [Sun, 8 Sep 2019 00:19:35 +0000 (01:19 +0100)]
Make sure subtitle exports have .xml extension.

4 years agoWrite empty files when exporting subtitles and finding none.
Carl Hetherington [Sun, 8 Sep 2019 00:11:55 +0000 (01:11 +0100)]
Write empty files when exporting subtitles and finding none.

4 years agoStop double-click on the splitter divider from doing anything (#1601). v2.15.17
Carl Hetherington [Wed, 4 Sep 2019 23:28:32 +0000 (00:28 +0100)]
Stop double-click on the splitter divider from doing anything (#1601).

4 years agoRemove extra space.
Carl Hetherington [Tue, 3 Sep 2019 20:42:14 +0000 (21:42 +0100)]
Remove extra space.

4 years agoMissing AppImage Encode Server build.
Carl Hetherington [Tue, 3 Sep 2019 09:50:03 +0000 (10:50 +0100)]
Missing AppImage Encode Server build.

Forward-ported from 3c7d19089d60b3e36e83e27e55778b3f331e26ee in master.

4 years agoDon't force 24fps onto every DCP made by dcpomatic_create (#1598).
Carl Hetherington [Tue, 3 Sep 2019 00:14:44 +0000 (01:14 +0100)]
Don't force 24fps onto every DCP made by dcpomatic_create (#1598).

4 years agoFix missing log in dcpomatic_create (#1597).
Carl Hetherington [Tue, 3 Sep 2019 00:04:28 +0000 (01:04 +0100)]
Fix missing log in dcpomatic_create (#1597).

4 years agoExit with code 0 on dcpomatic2_create --version (#1599).
Carl Hetherington [Mon, 2 Sep 2019 23:53:23 +0000 (00:53 +0100)]
Exit with code 0 on dcpomatic2_create --version (#1599).

4 years agoFixes for Debian 10 and unstable builds.
Carl Hetherington [Mon, 2 Sep 2019 19:23:25 +0000 (20:23 +0100)]
Fixes for Debian 10 and unstable builds.

Forward-ported from 446255b74f38f299c2e73260293dce291666fb73 in 2.14.x.

4 years agoTry to fix swaroop-studio build on RPM distros.
Carl Hetherington [Sat, 31 Aug 2019 23:56:56 +0000 (00:56 +0100)]
Try to fix swaroop-studio build on RPM distros.

4 years agoPrimitive subtitle export feature. v2.15.16
Carl Hetherington [Sat, 31 Aug 2019 01:03:01 +0000 (02:03 +0100)]
Primitive subtitle export feature.

4 years agoMake player more tolerant of some DCP errors.
Carl Hetherington [Fri, 30 Aug 2019 22:16:21 +0000 (23:16 +0100)]
Make player more tolerant of some DCP errors.

4 years agoSlightly better errors when the player fails to load a DCP.
Carl Hetherington [Tue, 27 Aug 2019 21:34:37 +0000 (22:34 +0100)]
Slightly better errors when the player fails to load a DCP.

4 years agoAdd Luproduction as patron.
Carl Hetherington [Fri, 23 Aug 2019 11:40:37 +0000 (12:40 +0100)]
Add Luproduction as patron.

4 years agoAllow specification of audio forensic marking (in KDMs) for some channels only. ...
Carl Hetherington [Sun, 11 Aug 2019 21:56:59 +0000 (22:56 +0100)]
Allow specification of audio forensic marking (in KDMs) for some channels only.  Default to enabling forensic marking for video and audio (up to and including channel 12).  Fixes #1498.

4 years agoAvoid random black gaps between bits of content A and B when v2.15.15
Carl Hetherington [Tue, 30 Jul 2019 23:07:06 +0000 (00:07 +0100)]
Avoid random black gaps between bits of content A and B when
content B has had its start trimmed.  In this case when we seek
inaccurately in A we previously also seeked inaccurately in B.
This meant that at the transition the first frame we see of B
may not be the first frame of B.

After this we seek accurately in B so that we definitely get to the
start of it.

This is especially important if the start of B has been trimmed to
within two keyframes so that an inaccurate seek is not sufficient.

4 years agoAdd some more pixfmts to the hack.
Carl Hetherington [Tue, 30 Jul 2019 23:07:00 +0000 (00:07 +0100)]
Add some more pixfmts to the hack.

4 years agoUse ISDCF name as a default export filename (#1584).
Carl Hetherington [Thu, 25 Jul 2019 15:49:46 +0000 (16:49 +0100)]
Use ISDCF name as a default export filename (#1584).

4 years agoTrim after _ in current name when enabling 'Use ISDCF name' (#1513).
Carl Hetherington [Thu, 25 Jul 2019 15:31:58 +0000 (16:31 +0100)]
Trim after _ in current name when enabling 'Use ISDCF name' (#1513).