X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.cpp;h=e556fe494ad1b180f49bf5e95e005161438ab652;hp=622b92f05a71fb0574053417dad88e4646c553d0;hb=2d12d37f1657d6aef9bb80d735b6c7022aecba6e;hpb=ea748154f1bc7dbc81cb52611a52865e63109439

diff --git a/src/main.cpp b/src/main.cpp
index 622b92f..e556fe4 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)
 {
@@ -32,7 +33,7 @@ int main(int argc, char ** argv)
 	// We want to crash if we ever get a NaN.
 	feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
 
-	Debug("Compiled with REAL = %d => \"%s\" sizeof(Real) == %d bytes", REALTYPE, g_real_name[REALTYPE], sizeof(Real));
+	DebugRealInfo();
 
 	Document doc("","fonts/ComicSans.ttf");
 	srand(time(NULL));
@@ -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,20 +174,21 @@ 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)
 	{
 		doc.AddText(input_text, bounds.h/Real(2), bounds.x, bounds.y+bounds.h/Real(2));
 	}
-	else
-	{
-		doc.Add(RECT_OUTLINE, Rect(0,0,0,0),0); // hack to stop segfault if document is empty (:S)
-	}
+
 
 
 	#ifndef CONTROLPANEL_DISABLED
+	if (!scr.Valid()) hide_control_panel = true;
 	SDL_Thread * cp_thread = NULL;
 	if (!hide_control_panel)
 	{