[CinCV-commits] CinelerraCV.git (#1522) - master (branch) updated: v2.3-70-g4bf0026

git repository hosting git at cinelerra-cv.org
Tue Apr 12 18:17:06 CEST 2016


The branch, master has been updated
       via  4bf002694a59d211e6dc7506790f78aff68ffa6f (commit)
       via  ee178ba993cb0330e89a41fcfbab81f66e5122ce (commit)
       via  94c0a5d9d2b6e1e48eede7fca6c1955ab08e994b (commit)
      from  377abcca56b6f8d113527c577c48537b995b2fff (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 4bf002694a59d211e6dc7506790f78aff68ffa6f
Author: Einar Rünkaru <einarrunkaru at gmail.com>
Date:   Sat Apr 9 15:04:40 2016 +0300

    Do not define texts in bcfilebox.inc
    
    These texts are not useful outside the BC_FileBox class.
    Move the literals to BC_FileBox::columntype_to_text -
    this makes them normal translatable texts.
    Removed pointless breaks after return statements.

commit ee178ba993cb0330e89a41fcfbab81f66e5122ce
Author: Einar Rünkaru <einarrunkaru at gmail.com>
Date:   Sat Apr 9 14:47:57 2016 +0300

    Make items of Overlay window translateable

commit 94c0a5d9d2b6e1e48eede7fca6c1955ab08e994b
Author: Einar Rünkaru <einarrunkaru at gmail.com>
Date:   Sat Apr 9 12:47:46 2016 +0300

    Make svg plugin inactive until rewrite
    
    Avoids crash of Cinelerra.
    Reported-by: Mark Carter <alt.mcarter at gmail.com>

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

Summary of changes:
 cinelerra/gwindowgui.C |  4 ++--
 guicast/bcfilebox.C    | 15 +++++++--------
 guicast/bcfilebox.inc  |  5 -----
 plugins/svg/svg.C      |  5 +++++
 4 files changed, 14 insertions(+), 15 deletions(-)

The diff of changes is:
diff --git a/cinelerra/gwindowgui.C b/cinelerra/gwindowgui.C
index a61d04d..309bf9b 100644
--- a/cinelerra/gwindowgui.C
+++ b/cinelerra/gwindowgui.C
@@ -116,7 +116,7 @@ void GWindowGUI::calculate_extents(BC_WindowBase *gui, int *w, int *h)
 			&temp5, 
 			&temp6,
 			&temp7, 
-			toggle_order[i].isauto ? auto_text[toggle_order[i].ref] : other_text[toggle_order[i].ref]);
+			toggle_order[i].isauto ? _(auto_text[toggle_order[i].ref]) : _(other_text[toggle_order[i].ref]));
 		*w = MAX(current_w, *w);
 		*h += current_h + 5;
 	}
@@ -213,7 +213,7 @@ GWindowToggle::GWindowToggle(MWindow *mwindow,
  : BC_CheckBox(x, 
  	y, 
 	*get_main_value(mwindow, toggleinf), 
-        toggleinf.isauto ? auto_text[toggleinf.ref] : other_text[toggleinf.ref])
+        toggleinf.isauto ? _(auto_text[toggleinf.ref]) : _(other_text[toggleinf.ref]))
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
diff --git a/guicast/bcfilebox.C b/guicast/bcfilebox.C
index 79086f3..9aee34d 100644
--- a/guicast/bcfilebox.C
+++ b/guicast/bcfilebox.C
@@ -882,17 +882,16 @@ const char* BC_FileBox::columntype_to_text(int type)
 	switch(type)
 	{
 		case FILEBOX_NAME:
-			return FILEBOX_NAME_TEXT;
-			break;
+			return _("File");
+
 		case FILEBOX_SIZE:
-			return FILEBOX_SIZE_TEXT;
-			break;
+			return _("Size");
+
 		case FILEBOX_DATE:
-			return FILEBOX_DATE_TEXT;
-			break;
+			return _("Date");
+
 		case FILEBOX_EXTENSION:
-			return FILEBOX_EXTENSION_TEXT;
-			break; 
+			return _("Ext.");
 	}
 	return "";
 }
diff --git a/guicast/bcfilebox.inc b/guicast/bcfilebox.inc
index 9bd1730..2df4687 100644
--- a/guicast/bcfilebox.inc
+++ b/guicast/bcfilebox.inc
@@ -39,11 +39,6 @@ class BC_FileBox;
 #define FILEBOX_DATE 2
 #define FILEBOX_EXTENSION 3
 
-#define FILEBOX_NAME_TEXT _("File")
-#define FILEBOX_SIZE_TEXT _("Size")
-#define FILEBOX_DATE_TEXT _("Date")
-#define FILEBOX_EXTENSION_TEXT _("Ext.")
-
 #define FILEBOX_HISTORY_SIZE 16
 
 #endif
diff --git a/plugins/svg/svg.C b/plugins/svg/svg.C
index 5253329..e695f53 100644
--- a/plugins/svg/svg.C
+++ b/plugins/svg/svg.C
@@ -264,6 +264,11 @@ int SvgMain::process_realtime(VFrame *input_ptr, VFrame *output_ptr)
 	unsigned char * raw_buffer;
 	struct raw_struct *raw_data;
 
+// FIXME This plugin does not work
+	if(input_ptr != output_ptr)
+		output_ptr->copy_from(input_ptr);
+	return 0;
+
 	need_reconfigure |= load_configuration();
 
 	if (config.svg_file[0] == 0) {


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