X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.cpp;h=e20a7bfaf02e78db30dc47d171410f911f4d5a6a;hp=99e0b11d8532c974d62156f1111bcfaa1ff36e65;hb=35bc799125eec0d0c839af56fd136c8e85793a56;hpb=03cc1b0a0d0705e0b1d92e13fdb18608c7a00272

diff --git a/src/main.cpp b/src/main.cpp
index 99e0b11..e20a7bf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -10,6 +10,7 @@
 #include <signal.h>
 
 bool ignore_sigfpe = false;
+const char *script_filename;
 
 void sigfpe_handler(int sig)
 {
@@ -154,6 +155,12 @@ int main(int argc, char ** argv)
 				hide_control_panel = true;
 				window_visible = !window_visible;
 				break;
+			case 's':
+				hide_control_panel = true;
+				if (++i >= argc)
+					Fatal("Expected filename after -s switch");
+				script_filename = argv[i];
+				break;
 		}	
 	}
 
@@ -167,8 +174,11 @@ int main(int argc, char ** argv)
 
 	if (input_filename != NULL)
 	{
-		
-		doc.LoadSVG(input_filename, Rect(bounds.x+bounds.w/Real(2),bounds.y+bounds.h/Real(2),bounds.w/Real(800),bounds.h/Real(600)));
+		#ifdef TRANSFORM_OBJECTS_NOT_VIEW
+			doc.LoadSVG(input_filename, Rect(Real(1)/Real(2),Real(1)/Real(2),Real(1)/Real(800),Real(1)/Real(600)));		
+		#else
+			doc.LoadSVG(input_filename, Rect(bounds.x+bounds.w/Real(2),bounds.y+bounds.h/Real(2),bounds.w/Real(800),bounds.h/Real(600)));
+		#endif
 	}
 	else if (input_text != NULL)
 	{
@@ -181,6 +191,7 @@ int main(int argc, char ** argv)
 
 
 	#ifndef CONTROLPANEL_DISABLED
+	if (!scr.Valid()) hide_control_panel = true;
 	SDL_Thread * cp_thread = NULL;
 	if (!hide_control_panel)
 	{