#include "clip.h"
#include "filexml.h"
#include "language.h"
+#include "mainerror.h"
#include "svg.h"
#include "svgwin.h"
#include "overlayframe.inc"
#include <string.h>
#include <errno.h>
#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/wait.h>
REGISTER_PLUGIN(SvgMain)
EQUIV(out_w, that.out_w) &&
EQUIV(out_h, that.out_h) &&
!strcmp(svg_file, that.svg_file) &&
+ ms_time != 0 && that.ms_time != 0 &&
ms_time == that.ms_time;
}
delete overlayer;
}
-const char* SvgMain::plugin_title() { return _("SVG via Inkscape"); }
+const char* SvgMain::plugin_title() { return N_("SVG via Inkscape"); }
int SvgMain::is_realtime() { return 1; }
int SvgMain::is_synthesis() { return 1; }
}
}
+static int exec_command(char* const*argv)
+{
+ pid_t pid = vfork();
+ if( pid < 0 ) return -1;
+ if( pid > 0 ) {
+ int stat = 0;
+ waitpid(pid, &stat, 0);
+ if( stat ) {
+ char msg[BCTEXTLEN];
+ sprintf(msg, "%s: error exit status %d", argv[0], stat);
+ MainError::show_error(msg);
+ }
+ return 0;
+ }
+ execvp(argv[0], &argv[0]);
+ return -1;
+}
+
int SvgMain::process_realtime(VFrame *input, VFrame *output)
{
char last_svg_file[BCTEXTLEN];
strcpy(last_svg_file, config.svg_file);
int64_t last_ms_time = config.ms_time;
- load_configuration();
- if( last_dpi != config.dpi )
+ need_reconfigure = load_configuration();
+ if( !ofrm || last_dpi != config.dpi )
need_export = 1;
if( strcmp(last_svg_file, config.svg_file) ||
last_ms_time != config.ms_time )
st_png.st_mtim.tv_sec*1000 + st_png.st_mtim.tv_nsec/1000000;
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];
- sprintf(command,
+ 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",
config.dpi, config.svg_file, filename_png);
printf(_("Running command %s\n"), command);
- system(command);
+ snprintf(dpi, sizeof(dpi), "%f", config.dpi);
+ snprintf(command, sizeof(command), "--export-png=%s",filename_png);
+ char *const argv[] = {
+ (char*)"inkscape",
+ (char*)"--without-gui",
+ (char*)"--export-background=0x000000",
+ (char*)"--export-background-opacity=0",
+ (char*)"-d", dpi, config.svg_file, command,
+ 0, };
+ exec_command(argv);
// in order for lockf to work it has to be open for writing
fd = open(filename_png, O_RDWR);
if( fd < 0 )
printf(_("Export of %s to %s failed\n"), config.svg_file, filename_png);
}
if( fd >= 0 ) {
- struct stat st_png;
- fstat(fd, &st_png);
- unsigned char *png_buffer = (unsigned char *)
- mmap (NULL, st_png.st_size, PROT_READ, MAP_SHARED, fd, 0);
- if( png_buffer != MAP_FAILED ) {
- if( png_buffer[0] == 0x89 && png_buffer[1] == 0x50 &&
- png_buffer[2] == 0x4e && png_buffer[3] == 0x47 ) {
- ofrm = new VFramePng(png_buffer, st_png.st_size, 1., 1.);
- if( ofrm->get_color_model() != output->get_color_model() ) {
- VFrame *vfrm = new VFrame(ofrm->get_w(), ofrm->get_h(),
- output->get_color_model());
- vfrm->transfer_from(ofrm);
- delete ofrm; ofrm = vfrm;
- }
- }
- else
- printf (_("The file %s that was generated from %s is not in PNG format."
- " Try to delete all *.png files.\n"), filename_png, config.svg_file);
- munmap(png_buffer, st_png.st_size);
- }
- else
- printf(_("Access mmap to %s as %s failed.\n"), config.svg_file, filename_png);
+ ofrm = VFramePng::vframe_png(fd);
close(fd);
+ if( ofrm && ofrm->get_color_model() != output->get_color_model() ) {
+ VFrame *vfrm = new VFrame(ofrm->get_w(), ofrm->get_h(),
+ output->get_color_model(), 0);
+ vfrm->transfer_from(ofrm);
+ delete ofrm; ofrm = vfrm;
+ }
+ if( !ofrm )
+ printf (_("The file %s that was generated from %s is not in PNG format."
+ " Try to delete all *.png files.\n"), filename_png, config.svg_file);
}
}
if( ofrm ) {