[CinCV-commits] CinelerraCV.git (#1223) - master (branch) updated: v2.1.5-180-g6bcc866

git version control git at cinelerra-cv.org
Wed Jun 25 15:17:21 CEST 2014


The branch, master has been updated
       via  6bcc86606feb6983459518ebc3db65a548b2ac35 (commit)
       via  3862eb5f234a45327412f989f2b681d2e92c9384 (commit)
      from  9425aff54020c8667cfde22daa21c209aee7922e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6bcc86606feb6983459518ebc3db65a548b2ac35
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Wed Jun 25 15:16:38 2014 +0200

    Do not try to include picon_png.h in C41 plugin in tarball
    
    Correct build rules for the C41 plugin, to not try to include the
    generated file picon_png.h in the tarball when running 'make dist'.
    This change fixes the 'make distcheck' target.

commit 3862eb5f234a45327412f989f2b681d2e92c9384
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Wed Jun 25 15:15:49 2014 +0200

    Use array delete to release path_list in FileList.
    
    A crash report from E. Chalaron included a valgrind run showing that
    FileList::close_file() calls ArrayList<char*>::remove_all_objects() to
    remove the strings in the list, and the strings are allocated using
    new[].  But they are released using delete, not delete[].  Change code
    and tell ArrayList to use array delete instead.

-----------------------------------------------------------------------

Summary of changes:
 cinelerra/filelist.C    |    1 +
 plugins/C41/Makefile.am |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/cinelerra/filelist.C b/cinelerra/filelist.C
index cf00424..1c437a5 100644
--- a/cinelerra/filelist.C
+++ b/cinelerra/filelist.C
@@ -49,6 +49,7 @@ FileList::FileList(Asset *asset,
  : FileBase(asset, file)
 {
 	reset_parameters();
+	path_list.set_array_delete();
 	asset->video_data = 1;
 	this->list_prefix = list_prefix;
 	this->file_extension = file_extension;
diff --git a/plugins/C41/Makefile.am b/plugins/C41/Makefile.am
index 40370c3..c01d165 100644
--- a/plugins/C41/Makefile.am
+++ b/plugins/C41/Makefile.am
@@ -7,7 +7,6 @@ AM_CXXFLAGS = $(LARGEFILE_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/colors
 LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS)
 
-noinst_HEADERS = picon_png.h 
 EXTRA_DIST = picon.png
 
 BUILT_SOURCES = picon_png.h


hooks/post-receive
-- 
CinelerraCV.git (CinelerraCV)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CinelerraCV.git" (CinelerraCV).



More information about the cinelerra-commits mailing list