From 81915b8dd7046fd88697e3a9cc1a11b891be62db Mon Sep 17 00:00:00 2001 From: Good Guy Date: Sat, 17 Oct 2020 17:36:39 -0600 Subject: [PATCH] fix errs created by changes in inkscape --- cinelerra-5.1/plugins/svg/Makefile | 6 +- cinelerra-5.1/plugins/svg/empty_svg.h | 204 -------------------------- cinelerra-5.1/plugins/svg/new.svg | 92 ++++++++++++ cinelerra-5.1/plugins/svg/svg.C | 13 +- cinelerra-5.1/plugins/svg/svgwin.C | 11 +- 5 files changed, 111 insertions(+), 215 deletions(-) delete mode 100644 cinelerra-5.1/plugins/svg/empty_svg.h create mode 100644 cinelerra-5.1/plugins/svg/new.svg diff --git a/cinelerra-5.1/plugins/svg/Makefile b/cinelerra-5.1/plugins/svg/Makefile index 3f7356f0..d1d94ed1 100644 --- a/cinelerra-5.1/plugins/svg/Makefile +++ b/cinelerra-5.1/plugins/svg/Makefile @@ -1,7 +1,8 @@ include ../../plugin_defs OBJS = $(OBJDIR)/svg.o \ - $(OBJDIR)/svgwin.o + $(OBJDIR)/svgwin.o \ + $(OBJDIR)/new_svg.o PLUGIN = svg @@ -9,3 +10,6 @@ include ../../plugin_config $(OBJDIR)/svg.o: svg.C $(OBJDIR)/svgwin.o: svgwin.C + +$(OBJDIR)/new_svg.o: new.svg + cd $(OBJDIR); ../../../guicast/$(OBJDIR)/bootstrap $(notdir $@) ../$^ diff --git a/cinelerra-5.1/plugins/svg/empty_svg.h b/cinelerra-5.1/plugins/svg/empty_svg.h deleted file mode 100644 index 0db62c39..00000000 --- a/cinelerra-5.1/plugins/svg/empty_svg.h +++ /dev/null @@ -1,204 +0,0 @@ -#ifndef __EMTPY_SVG_H__ -#define __EMTPY_SVG_H__ - -static unsigned char empty_svg[] = -{ -0x00,0x00,0x0c,0x27, -0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x3d,0x22,0x31, -0x2e,0x30,0x22,0x20,0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,0x55,0x54, -0x46,0x2d,0x38,0x22,0x20,0x73,0x74,0x61,0x6e,0x64,0x61,0x6c,0x6f,0x6e,0x65,0x3d, -0x22,0x6e,0x6f,0x22,0x3f,0x3e,0x0a,0x3c,0x21,0x2d,0x2d,0x20,0x43,0x72,0x65,0x61, -0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x53,0x6f,0x64,0x69,0x70,0x6f,0x64, -0x69,0x20,0x28,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x77,0x77,0x2e,0x73, -0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x2e,0x63,0x6f,0x6d,0x2f,0x22,0x29,0x20,0x2d, -0x2d,0x3e,0x0a,0x0a,0x3c,0x73,0x76,0x67,0x0a,0x20,0x20,0x20,0x78,0x6d,0x6c,0x6e, -0x73,0x3a,0x64,0x63,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x70,0x75,0x72, -0x6c,0x2e,0x6f,0x72,0x67,0x2f,0x64,0x63,0x2f,0x65,0x6c,0x65,0x6d,0x65,0x6e,0x74, -0x73,0x2f,0x31,0x2e,0x31,0x2f,0x22,0x0a,0x20,0x20,0x20,0x78,0x6d,0x6c,0x6e,0x73, -0x3a,0x63,0x63,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x63,0x72,0x65,0x61, -0x74,0x69,0x76,0x65,0x63,0x6f,0x6d,0x6d,0x6f,0x6e,0x73,0x2e,0x6f,0x72,0x67,0x2f, -0x6e,0x73,0x23,0x22,0x0a,0x20,0x20,0x20,0x78,0x6d,0x6c,0x6e,0x73,0x3a,0x72,0x64, -0x66,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x77,0x77,0x2e,0x77,0x33, -0x2e,0x6f,0x72,0x67,0x2f,0x31,0x39,0x39,0x39,0x2f,0x30,0x32,0x2f,0x32,0x32,0x2d, -0x72,0x64,0x66,0x2d,0x73,0x79,0x6e,0x74,0x61,0x78,0x2d,0x6e,0x73,0x23,0x22,0x0a, -0x20,0x20,0x20,0x78,0x6d,0x6c,0x6e,0x73,0x3a,0x73,0x76,0x67,0x3d,0x22,0x68,0x74, -0x74,0x70,0x3a,0x2f,0x2f,0x77,0x77,0x77,0x2e,0x77,0x33,0x2e,0x6f,0x72,0x67,0x2f, -0x32,0x30,0x30,0x30,0x2f,0x73,0x76,0x67,0x22,0x0a,0x20,0x20,0x20,0x78,0x6d,0x6c, -0x6e,0x73,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x77,0x77,0x2e,0x77, -0x33,0x2e,0x6f,0x72,0x67,0x2f,0x32,0x30,0x30,0x30,0x2f,0x73,0x76,0x67,0x22,0x0a, -0x20,0x20,0x20,0x78,0x6d,0x6c,0x6e,0x73,0x3a,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64, -0x69,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x73,0x6f,0x64,0x69,0x70,0x6f, -0x64,0x69,0x2e,0x73,0x6f,0x75,0x72,0x63,0x65,0x66,0x6f,0x72,0x67,0x65,0x2e,0x6e, -0x65,0x74,0x2f,0x44,0x54,0x44,0x2f,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x2d, -0x30,0x2e,0x64,0x74,0x64,0x22,0x0a,0x20,0x20,0x20,0x78,0x6d,0x6c,0x6e,0x73,0x3a, -0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f, -0x2f,0x77,0x77,0x77,0x2e,0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,0x2e,0x6f,0x72, -0x67,0x2f,0x6e,0x61,0x6d,0x65,0x73,0x70,0x61,0x63,0x65,0x73,0x2f,0x69,0x6e,0x6b, -0x73,0x63,0x61,0x70,0x65,0x22,0x0a,0x20,0x20,0x20,0x69,0x64,0x3d,0x22,0x73,0x76, -0x67,0x31,0x30,0x31,0x22,0x0a,0x20,0x20,0x20,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64, -0x69,0x3a,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x3d,0x22,0x30,0x2e,0x33,0x31,0x22, -0x0a,0x20,0x20,0x20,0x77,0x69,0x64,0x74,0x68,0x3d,0x22,0x33,0x32,0x30,0x6d,0x6d, -0x22,0x0a,0x20,0x20,0x20,0x68,0x65,0x69,0x67,0x68,0x74,0x3d,0x22,0x32,0x30,0x30, -0x6d,0x6d,0x22,0x0a,0x20,0x20,0x20,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x3a, -0x64,0x6f,0x63,0x6e,0x61,0x6d,0x65,0x3d,0x22,0x78,0x78,0x2e,0x73,0x76,0x67,0x22, -0x0a,0x20,0x20,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x31, -0x22,0x0a,0x20,0x20,0x20,0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,0x3a,0x76,0x65, -0x72,0x73,0x69,0x6f,0x6e,0x3d,0x22,0x30,0x2e,0x39,0x32,0x2e,0x31,0x20,0x72,0x22, -0x3e,0x0a,0x20,0x20,0x3c,0x6d,0x65,0x74,0x61,0x64,0x61,0x74,0x61,0x0a,0x20,0x20, -0x20,0x20,0x20,0x69,0x64,0x3d,0x22,0x6d,0x65,0x74,0x61,0x64,0x61,0x74,0x61,0x31, -0x38,0x22,0x3e,0x0a,0x20,0x20,0x20,0x20,0x3c,0x72,0x64,0x66,0x3a,0x52,0x44,0x46, -0x3e,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x3c,0x63,0x63,0x3a,0x57,0x6f,0x72,0x6b, -0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x72,0x64,0x66,0x3a,0x61,0x62, -0x6f,0x75,0x74,0x3d,0x22,0x22,0x3e,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, -0x3c,0x64,0x63,0x3a,0x66,0x6f,0x72,0x6d,0x61,0x74,0x3e,0x69,0x6d,0x61,0x67,0x65, -0x2f,0x73,0x76,0x67,0x2b,0x78,0x6d,0x6c,0x3c,0x2f,0x64,0x63,0x3a,0x66,0x6f,0x72, -0x6d,0x61,0x74,0x3e,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x3c,0x64,0x63, -0x3a,0x74,0x79,0x70,0x65,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, -0x20,0x72,0x64,0x66,0x3a,0x72,0x65,0x73,0x6f,0x75,0x72,0x63,0x65,0x3d,0x22,0x68, -0x74,0x74,0x70,0x3a,0x2f,0x2f,0x70,0x75,0x72,0x6c,0x2e,0x6f,0x72,0x67,0x2f,0x64, -0x63,0x2f,0x64,0x63,0x6d,0x69,0x74,0x79,0x70,0x65,0x2f,0x53,0x74,0x69,0x6c,0x6c, -0x49,0x6d,0x61,0x67,0x65,0x22,0x20,0x2f,0x3e,0x0a,0x20,0x20,0x20,0x20,0x20,0x20, -0x20,0x20,0x3c,0x64,0x63,0x3a,0x74,0x69,0x74,0x6c,0x65,0x3e,0x3c,0x2f,0x64,0x63, -0x3a,0x74,0x69,0x74,0x6c,0x65,0x3e,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x3c,0x2f, -0x63,0x63,0x3a,0x57,0x6f,0x72,0x6b,0x3e,0x0a,0x20,0x20,0x20,0x20,0x3c,0x2f,0x72, -0x64,0x66,0x3a,0x52,0x44,0x46,0x3e,0x0a,0x20,0x20,0x3c,0x2f,0x6d,0x65,0x74,0x61, -0x64,0x61,0x74,0x61,0x3e,0x0a,0x20,0x20,0x3c,0x64,0x65,0x66,0x73,0x0a,0x20,0x20, -0x20,0x20,0x20,0x69,0x64,0x3d,0x22,0x64,0x65,0x66,0x73,0x31,0x30,0x33,0x22,0x3e, -0x0a,0x20,0x20,0x20,0x20,0x3c,0x64,0x65,0x66,0x73,0x0a,0x20,0x20,0x20,0x20,0x20, -0x20,0x20,0x69,0x64,0x3d,0x22,0x64,0x65,0x66,0x73,0x31,0x30,0x37,0x22,0x20,0x2f, -0x3e,0x0a,0x20,0x20,0x20,0x20,0x3c,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x3a, -0x6e,0x61,0x6d,0x65,0x64,0x76,0x69,0x65,0x77,0x0a,0x20,0x20,0x20,0x20,0x20,0x20, -0x20,0x69,0x64,0x3d,0x22,0x6e,0x61,0x6d,0x65,0x64,0x76,0x69,0x65,0x77,0x31,0x34, -0x39,0x22,0x20,0x2f,0x3e,0x0a,0x20,0x20,0x3c,0x2f,0x64,0x65,0x66,0x73,0x3e,0x0a, -0x20,0x20,0x3c,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x3a,0x6e,0x61,0x6d,0x65, -0x64,0x76,0x69,0x65,0x77,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x64,0x3d,0x22,0x62, -0x61,0x73,0x65,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x73,0x68,0x6f,0x77,0x67,0x72, -0x69,0x64,0x3d,0x22,0x66,0x61,0x6c,0x73,0x65,0x22,0x0a,0x20,0x20,0x20,0x20,0x20, -0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,0x3a,0x7a,0x6f,0x6f,0x6d,0x3d,0x22,0x30, -0x2e,0x32,0x36,0x37,0x32,0x32,0x39,0x31,0x36,0x22,0x0a,0x20,0x20,0x20,0x20,0x20, -0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,0x3a,0x63,0x78,0x3d,0x22,0x35,0x36,0x36, -0x2e,0x39,0x32,0x39,0x31,0x33,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x6e,0x6b, -0x73,0x63,0x61,0x70,0x65,0x3a,0x63,0x79,0x3d,0x22,0x33,0x33,0x39,0x2e,0x33,0x36, -0x32,0x32,0x39,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x6e,0x6b,0x73,0x63,0x61, -0x70,0x65,0x3a,0x77,0x69,0x6e,0x64,0x6f,0x77,0x2d,0x77,0x69,0x64,0x74,0x68,0x3d, -0x22,0x35,0x31,0x30,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x6e,0x6b,0x73,0x63, -0x61,0x70,0x65,0x3a,0x77,0x69,0x6e,0x64,0x6f,0x77,0x2d,0x68,0x65,0x69,0x67,0x68, -0x74,0x3d,0x22,0x36,0x30,0x39,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x6e,0x6b, -0x73,0x63,0x61,0x70,0x65,0x3a,0x77,0x69,0x6e,0x64,0x6f,0x77,0x2d,0x78,0x3d,0x22, -0x38,0x34,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x6e,0x6b,0x73,0x63,0x61,0x70, -0x65,0x3a,0x77,0x69,0x6e,0x64,0x6f,0x77,0x2d,0x79,0x3d,0x22,0x33,0x30,0x22,0x0a, -0x20,0x20,0x20,0x20,0x20,0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,0x3a,0x77,0x69, -0x6e,0x64,0x6f,0x77,0x2d,0x6d,0x61,0x78,0x69,0x6d,0x69,0x7a,0x65,0x64,0x3d,0x22, -0x30,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65, -0x3a,0x63,0x75,0x72,0x72,0x65,0x6e,0x74,0x2d,0x6c,0x61,0x79,0x65,0x72,0x3d,0x22, -0x73,0x76,0x67,0x31,0x30,0x31,0x22,0x20,0x2f,0x3e,0x0a,0x20,0x20,0x3c,0x70,0x6f, -0x6c,0x79,0x67,0x6f,0x6e,0x0a,0x20,0x20,0x20,0x20,0x20,0x73,0x6f,0x64,0x69,0x70, -0x6f,0x64,0x69,0x3a,0x74,0x79,0x70,0x65,0x3d,0x22,0x73,0x74,0x61,0x72,0x22,0x0a, -0x20,0x20,0x20,0x20,0x20,0x73,0x74,0x79,0x6c,0x65,0x3d,0x22,0x66,0x6f,0x6e,0x74, -0x2d,0x73,0x69,0x7a,0x65,0x3a,0x31,0x32,0x70,0x78,0x3b,0x66,0x69,0x6c,0x6c,0x3a, -0x23,0x38,0x30,0x38,0x30,0x38,0x30,0x3b,0x66,0x69,0x6c,0x6c,0x2d,0x72,0x75,0x6c, -0x65,0x3a,0x65,0x76,0x65,0x6e,0x6f,0x64,0x64,0x3b,0x73,0x74,0x72,0x6f,0x6b,0x65, -0x2d,0x77,0x69,0x64,0x74,0x68,0x3a,0x31,0x2e,0x30,0x36,0x36,0x36,0x36,0x36,0x36, -0x39,0x70,0x74,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x64,0x3d,0x22,0x70,0x6f, -0x6c,0x79,0x67,0x6f,0x6e,0x31,0x36,0x32,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x73, -0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x3a,0x73,0x69,0x64,0x65,0x73,0x3d,0x22,0x35, -0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x3a, -0x63,0x78,0x3d,0x22,0x31,0x36,0x38,0x2e,0x30,0x35,0x34,0x33,0x34,0x22,0x0a,0x20, -0x20,0x20,0x20,0x20,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x3a,0x63,0x79,0x3d, -0x22,0x31,0x34,0x34,0x2e,0x32,0x33,0x38,0x33,0x22,0x0a,0x20,0x20,0x20,0x20,0x20, -0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x3a,0x72,0x31,0x3d,0x22,0x31,0x30,0x35, -0x2e,0x38,0x36,0x38,0x31,0x31,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x73,0x6f,0x64, -0x69,0x70,0x6f,0x64,0x69,0x3a,0x72,0x32,0x3d,0x22,0x35,0x32,0x2e,0x39,0x33,0x34, -0x30,0x35,0x35,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x73,0x6f,0x64,0x69,0x70,0x6f, -0x64,0x69,0x3a,0x61,0x72,0x67,0x31,0x3d,0x22,0x30,0x2e,0x34,0x30,0x34,0x38,0x39, -0x32,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,0x69, -0x3a,0x61,0x72,0x67,0x32,0x3d,0x22,0x31,0x2e,0x30,0x33,0x33,0x32,0x31,0x31,0x22, -0x0a,0x20,0x20,0x20,0x20,0x20,0x70,0x6f,0x69,0x6e,0x74,0x73,0x3d,0x22,0x38,0x36, -0x30,0x2e,0x31,0x33,0x35,0x2c,0x35,0x36,0x38,0x2e,0x35,0x36,0x34,0x20,0x37,0x39, -0x34,0x2e,0x33,0x32,0x2c,0x35,0x37,0x32,0x2e,0x30,0x39,0x32,0x20,0x37,0x35,0x39, -0x2e,0x39,0x31,0x36,0x2c,0x36,0x32,0x38,0x2e,0x33,0x31,0x20,0x37,0x33,0x36,0x2e, -0x32,0x32,0x32,0x2c,0x35,0x36,0x36,0x2e,0x38,0x30,0x36,0x20,0x36,0x37,0x32,0x2e, -0x31,0x32,0x34,0x2c,0x35,0x35,0x31,0x2e,0x34,0x35,0x38,0x20,0x37,0x32,0x33,0x2e, -0x32,0x39,0x35,0x2c,0x35,0x30,0x39,0x2e,0x39,0x31,0x38,0x20,0x37,0x31,0x38,0x2e, -0x30,0x38,0x36,0x2c,0x34,0x34,0x34,0x2e,0x32,0x31,0x35,0x20,0x37,0x37,0x33,0x2e, -0x34,0x30,0x35,0x2c,0x34,0x38,0x30,0x2e,0x30,0x34,0x35,0x20,0x38,0x33,0x34,0x2e, -0x32,0x38,0x33,0x2c,0x34,0x35,0x34,0x2e,0x37,0x38,0x37,0x20,0x38,0x31,0x37,0x2e, -0x33,0x30,0x31,0x2c,0x35,0x31,0x38,0x2e,0x34,0x37,0x31,0x20,0x38,0x36,0x30,0x2e, -0x31,0x33,0x35,0x2c,0x35,0x36,0x38,0x2e,0x35,0x36,0x34,0x20,0x22,0x0a,0x20,0x20, -0x20,0x20,0x20,0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,0x3a,0x66,0x6c,0x61,0x74, -0x73,0x69,0x64,0x65,0x64,0x3d,0x22,0x66,0x61,0x6c,0x73,0x65,0x22,0x0a,0x20,0x20, -0x20,0x20,0x20,0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,0x3a,0x72,0x6f,0x75,0x6e, -0x64,0x65,0x64,0x3d,0x22,0x30,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x6e,0x6b, -0x73,0x63,0x61,0x70,0x65,0x3a,0x72,0x61,0x6e,0x64,0x6f,0x6d,0x69,0x7a,0x65,0x64, -0x3d,0x22,0x30,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x64,0x3d,0x22,0x6d,0x20,0x32, -0x36,0x35,0x2e,0x33,0x36,0x32,0x34,0x38,0x2c,0x31,0x38,0x35,0x2e,0x39,0x34,0x31, -0x38,0x31,0x20,0x2d,0x37,0x30,0x2e,0x32,0x30,0x32,0x35,0x35,0x2c,0x33,0x2e,0x37, -0x36,0x34,0x30,0x37,0x20,0x2d,0x33,0x36,0x2e,0x36,0x39,0x38,0x31,0x32,0x2c,0x35, -0x39,0x2e,0x39,0x36,0x35,0x30,0x35,0x20,0x4c,0x20,0x31,0x33,0x33,0x2e,0x31,0x38, -0x38,0x31,0x38,0x2c,0x31,0x38,0x34,0x2e,0x30,0x36,0x37,0x35,0x20,0x36,0x34,0x2e, -0x38,0x31,0x37,0x36,0x38,0x39,0x2c,0x31,0x36,0x37,0x2e,0x36,0x39,0x35,0x37,0x33, -0x20,0x31,0x31,0x39,0x2e,0x34,0x30,0x30,0x32,0x38,0x2c,0x31,0x32,0x33,0x2e,0x33, -0x38,0x36,0x35,0x32,0x20,0x31,0x31,0x33,0x2e,0x38,0x34,0x33,0x31,0x31,0x2c,0x35, -0x33,0x2e,0x33,0x30,0x33,0x31,0x35,0x37,0x20,0x31,0x37,0x32,0x2e,0x38,0x35,0x30, -0x36,0x33,0x2c,0x39,0x31,0x2e,0x35,0x32,0x31,0x39,0x38,0x32,0x20,0x32,0x33,0x37, -0x2e,0x37,0x38,0x36,0x36,0x2c,0x36,0x34,0x2e,0x35,0x37,0x39,0x38,0x35,0x31,0x20, -0x32,0x31,0x39,0x2e,0x36,0x37,0x32,0x36,0x37,0x2c,0x31,0x33,0x32,0x2e,0x35,0x30, -0x39,0x36,0x20,0x5a,0x22,0x20,0x2f,0x3e,0x0a,0x20,0x20,0x3c,0x74,0x65,0x78,0x74, -0x0a,0x20,0x20,0x20,0x20,0x20,0x78,0x6d,0x6c,0x3a,0x73,0x70,0x61,0x63,0x65,0x3d, -0x22,0x70,0x72,0x65,0x73,0x65,0x72,0x76,0x65,0x22,0x0a,0x20,0x20,0x20,0x20,0x20, -0x73,0x74,0x79,0x6c,0x65,0x3d,0x22,0x66,0x6f,0x6e,0x74,0x2d,0x73,0x74,0x79,0x6c, -0x65,0x3a,0x6e,0x6f,0x72,0x6d,0x61,0x6c,0x3b,0x66,0x6f,0x6e,0x74,0x2d,0x76,0x61, -0x72,0x69,0x61,0x6e,0x74,0x3a,0x6e,0x6f,0x72,0x6d,0x61,0x6c,0x3b,0x66,0x6f,0x6e, -0x74,0x2d,0x77,0x65,0x69,0x67,0x68,0x74,0x3a,0x6e,0x6f,0x72,0x6d,0x61,0x6c,0x3b, -0x66,0x6f,0x6e,0x74,0x2d,0x73,0x74,0x72,0x65,0x74,0x63,0x68,0x3a,0x6e,0x6f,0x72, -0x6d,0x61,0x6c,0x3b,0x66,0x6f,0x6e,0x74,0x2d,0x73,0x69,0x7a,0x65,0x3a,0x31,0x32, -0x2e,0x38,0x30,0x30,0x30,0x30,0x30,0x31,0x39,0x70,0x78,0x3b,0x6c,0x69,0x6e,0x65, -0x2d,0x68,0x65,0x69,0x67,0x68,0x74,0x3a,0x30,0x25,0x3b,0x66,0x6f,0x6e,0x74,0x2d, -0x66,0x61,0x6d,0x69,0x6c,0x79,0x3a,0x73,0x61,0x6e,0x73,0x2d,0x73,0x65,0x72,0x69, -0x66,0x3b,0x2d,0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,0x2d,0x66,0x6f,0x6e,0x74, -0x2d,0x73,0x70,0x65,0x63,0x69,0x66,0x69,0x63,0x61,0x74,0x69,0x6f,0x6e,0x3a,0x53, -0x61,0x6e,0x73,0x3b,0x74,0x65,0x78,0x74,0x2d,0x61,0x6c,0x69,0x67,0x6e,0x3a,0x73, -0x74,0x61,0x72,0x74,0x3b,0x6c,0x65,0x74,0x74,0x65,0x72,0x2d,0x73,0x70,0x61,0x63, -0x69,0x6e,0x67,0x3a,0x30,0x70,0x78,0x3b,0x77,0x6f,0x72,0x64,0x2d,0x73,0x70,0x61, -0x63,0x69,0x6e,0x67,0x3a,0x30,0x70,0x78,0x3b,0x77,0x72,0x69,0x74,0x69,0x6e,0x67, -0x2d,0x6d,0x6f,0x64,0x65,0x3a,0x6c,0x72,0x2d,0x74,0x62,0x3b,0x74,0x65,0x78,0x74, -0x2d,0x61,0x6e,0x63,0x68,0x6f,0x72,0x3a,0x73,0x74,0x61,0x72,0x74,0x3b,0x66,0x69, -0x6c,0x6c,0x3a,0x23,0x66,0x66,0x34,0x35,0x30,0x30,0x3b,0x66,0x69,0x6c,0x6c,0x2d, -0x6f,0x70,0x61,0x63,0x69,0x74,0x79,0x3a,0x31,0x3b,0x73,0x74,0x72,0x6f,0x6b,0x65, -0x3a,0x6e,0x6f,0x6e,0x65,0x3b,0x73,0x74,0x72,0x6f,0x6b,0x65,0x2d,0x77,0x69,0x64, -0x74,0x68,0x3a,0x31,0x2e,0x30,0x36,0x36,0x36,0x36,0x36,0x37,0x32,0x22,0x0a,0x20, -0x20,0x20,0x20,0x20,0x78,0x3d,0x22,0x33,0x31,0x39,0x2e,0x33,0x32,0x36,0x34,0x35, -0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x79,0x3d,0x22,0x33,0x34,0x38,0x2e,0x37,0x36, -0x34,0x33,0x31,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x64,0x3d,0x22,0x74,0x65, -0x78,0x74,0x32,0x39,0x39,0x34,0x22,0x3e,0x3c,0x74,0x73,0x70,0x61,0x6e,0x0a,0x20, -0x20,0x20,0x20,0x20,0x20,0x20,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x3a,0x72, -0x6f,0x6c,0x65,0x3d,0x22,0x6c,0x69,0x6e,0x65,0x22,0x0a,0x20,0x20,0x20,0x20,0x20, -0x20,0x20,0x69,0x64,0x3d,0x22,0x74,0x73,0x70,0x61,0x6e,0x32,0x39,0x39,0x38,0x22, -0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x78,0x3d,0x22,0x33,0x31,0x39,0x2e,0x33, -0x32,0x36,0x34,0x35,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x79,0x3d,0x22, -0x33,0x34,0x38,0x2e,0x37,0x36,0x34,0x33,0x31,0x22,0x0a,0x20,0x20,0x20,0x20,0x20, -0x20,0x20,0x73,0x74,0x79,0x6c,0x65,0x3d,0x22,0x66,0x6f,0x6e,0x74,0x2d,0x73,0x69, -0x7a,0x65,0x3a,0x31,0x35,0x33,0x2e,0x36,0x30,0x30,0x30,0x30,0x36,0x31,0x70,0x78, -0x3b,0x6c,0x69,0x6e,0x65,0x2d,0x68,0x65,0x69,0x67,0x68,0x74,0x3a,0x31,0x2e,0x32, -0x35,0x3b,0x66,0x6f,0x6e,0x74,0x2d,0x66,0x61,0x6d,0x69,0x6c,0x79,0x3a,0x73,0x61, -0x6e,0x73,0x2d,0x73,0x65,0x72,0x69,0x66,0x3b,0x73,0x74,0x72,0x6f,0x6b,0x65,0x2d, -0x77,0x69,0x64,0x74,0x68,0x3a,0x31,0x2e,0x30,0x36,0x36,0x36,0x36,0x36,0x37,0x32, -0x22,0x3e,0x6e,0x65,0x77,0x3c,0x2f,0x74,0x73,0x70,0x61,0x6e,0x3e,0x3c,0x74,0x73, -0x70,0x61,0x6e,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x73,0x6f,0x64,0x69,0x70, -0x6f,0x64,0x69,0x3a,0x72,0x6f,0x6c,0x65,0x3d,0x22,0x6c,0x69,0x6e,0x65,0x22,0x0a, -0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x78,0x3d,0x22,0x33,0x31,0x39,0x2e,0x33,0x32, -0x36,0x34,0x35,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x79,0x3d,0x22,0x35, -0x34,0x30,0x2e,0x37,0x36,0x34,0x33,0x34,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x20, -0x20,0x69,0x64,0x3d,0x22,0x74,0x73,0x70,0x61,0x6e,0x33,0x30,0x30,0x30,0x22,0x0a, -0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x73,0x74,0x79,0x6c,0x65,0x3d,0x22,0x66,0x6f, -0x6e,0x74,0x2d,0x73,0x69,0x7a,0x65,0x3a,0x31,0x35,0x33,0x2e,0x36,0x30,0x30,0x30, -0x30,0x36,0x31,0x70,0x78,0x3b,0x6c,0x69,0x6e,0x65,0x2d,0x68,0x65,0x69,0x67,0x68, -0x74,0x3a,0x31,0x2e,0x32,0x35,0x3b,0x66,0x6f,0x6e,0x74,0x2d,0x66,0x61,0x6d,0x69, -0x6c,0x79,0x3a,0x73,0x61,0x6e,0x73,0x2d,0x73,0x65,0x72,0x69,0x66,0x3b,0x73,0x74, -0x72,0x6f,0x6b,0x65,0x2d,0x77,0x69,0x64,0x74,0x68,0x3a,0x31,0x2e,0x30,0x36,0x36, -0x36,0x36,0x36,0x37,0x32,0x22,0x3e,0x20,0x73,0x67,0x76,0x20,0x66,0x69,0x6c,0x65, -0x3c,0x2f,0x74,0x73,0x70,0x61,0x6e,0x3e,0x3c,0x2f,0x74,0x65,0x78,0x74,0x3e,0x0a, -0x3c,0x2f,0x73,0x76,0x67,0x3e,0x0a -}; - -#endif diff --git a/cinelerra-5.1/plugins/svg/new.svg b/cinelerra-5.1/plugins/svg/new.svg new file mode 100644 index 00000000..b2059501 --- /dev/null +++ b/cinelerra-5.1/plugins/svg/new.svg @@ -0,0 +1,92 @@ + + + + + + + + + + image/svg+xml + + + + + + + + new + sgv file + + diff --git a/cinelerra-5.1/plugins/svg/svg.C b/cinelerra-5.1/plugins/svg/svg.C index baa5efed..ad9a9d01 100644 --- a/cinelerra-5.1/plugins/svg/svg.C +++ b/cinelerra-5.1/plugins/svg/svg.C @@ -199,18 +199,19 @@ int SvgMain::process_realtime(VFrame *input, VFrame *output) int fd = ms_time < config.ms_time ? -1 : open(filename_png, O_RDWR); if( fd < 0 ) { // file does not exist, export it char command[BCTEXTLEN], dpi[BCSTRLEN]; - snprintf(command, sizeof(command), - "inkscape --without-gui --export-background=0x000000 " - "--export-background-opacity=0 -d %f %s --export-png=%s", + snprintf(command, sizeof(command), "inkscape " +// "--without-gui " + "--export-background=0x000000 --export-background-opacity=0.001 " + " -d %f %s --export-filename=%s", config.dpi, config.svg_file, filename_png); printf(_("Running command %s\n"), command); snprintf(dpi, sizeof(dpi), "%f", config.dpi); - snprintf(command, sizeof(command), "--export-png=%s",filename_png); + snprintf(command, sizeof(command), "--export-filename=%s",filename_png); char *const argv[] = { (char*)"inkscape", - (char*)"--without-gui", +// (char*)"--without-gui", (char*)"--export-background=0x000000", - (char*)"--export-background-opacity=0", + (char*)"--export-background-opacity=0.001", (char*)"-d", dpi, config.svg_file, command, 0, }; exec_command(argv); diff --git a/cinelerra-5.1/plugins/svg/svgwin.C b/cinelerra-5.1/plugins/svg/svgwin.C index 09cbca7b..c0dc11d2 100644 --- a/cinelerra-5.1/plugins/svg/svgwin.C +++ b/cinelerra-5.1/plugins/svg/svgwin.C @@ -34,8 +34,6 @@ #include -#include "empty_svg.h" - struct fifo_struct { int pid; // 1 = update from client, 2 = client closes, 3 = quit @@ -235,8 +233,13 @@ void NewSvgButton::run() else { FILE *out = fopen(filename,"w"); if( out ) { - unsigned long size = sizeof(empty_svg) - 4; - fwrite(empty_svg+4, size, 1, out); + extern unsigned char _binary_new_svg_start[]; + extern unsigned char _binary_new_svg_end[]; + unsigned int *ip = (unsigned int *)_binary_new_svg_start; + unsigned int hdr_sz = *ip++; + unsigned char *dp = (unsigned char *)ip + hdr_sz; + unsigned char *ep = _binary_new_svg_end; + fwrite(dp, ep - dp, 1, out); fclose(out); result = 0; } -- 2.26.2