About to break everything with a merge

[ipdf/code.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 31ccf2e..46ea73b 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -10,6 +10,9 @@
 #include <signal.h>
 
 bool ignore_sigfpe = false;
+const char *script_filename;
+bool make_movie = false;
+const char * program_name;
 
 void sigfpe_handler(int sig)
 {
@@ -20,6 +23,9 @@ void sigfpe_handler(int sig)
 
 int main(int argc, char ** argv)
 {      
+       program_name = argv[0];
+       
+       //Debug("Main!");
        signal(SIGFPE, sigfpe_handler);
        #if REALTYPE == REAL_IRRAM
          iRRAM_initialize(argc,argv);
@@ -30,10 +36,23 @@ int main(int argc, char ** argv)
        #endif
 
        // We want to crash if we ever get a NaN.
-       feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
-
+       // AH, so *this* is where that got enabled, I was looking for compiler flags
+       #ifndef __MINGW32__
+       feenableexcept(FE_DIVBYZERO | FE_INVALID); // | FE_OVERFLOW);
+       #endif
+       #if REALTYPE == REAL_MPFRCPP
+       
+               #ifdef MPFR_PRECISION
+               mpfr_set_default_prec(MPFR_PRECISION);
+               #else
+               mpfr_set_default_prec(23);
+               #endif
+               
+       #endif
        DebugRealInfo();
 
+
+
        Document doc("","fonts/ComicSans.ttf");
        srand(time(NULL));
 
@@ -45,14 +64,19 @@ int main(int argc, char ** argv)
        const char * output_bmp = NULL;
        const char * input_filename = NULL;
        const char * input_text = NULL;
-       float b[4] = {0,0,1,1};
+       Real b[4] = {0,0,1,1};
        int max_frames = -1;
        bool hide_control_panel = false;
        bool lazy_rendering = true;
        bool window_visible = true;
-       bool gpu_transform = true;
-       bool gpu_rendering = true;
-       
+       bool gpu_transform = USE_GPU_TRANSFORM;
+       bool gpu_rendering = USE_GPU_RENDERING;
+       #ifdef TRANSFORM_OBJECTS_NOT_VIEW
+               gpu_transform = true;
+       #endif
+       #ifdef TRANSFORM_BEZIERS_TO_PATH
+               gpu_transform = true;
+       #endif
 
        
        int i = 0;
@@ -79,10 +103,7 @@ int main(int argc, char ** argv)
                                {
                                        if (i+j >= argc)
                                                Fatal("No %d bounds component following -b switch", j);
-                                       char * e;
-                                       b[j-1] = strtof(argv[i+j], &e);
-                                       if (*e != '\0')
-                                               Fatal("Bounds component %d not a valid float", j); 
+                                       b[j-1] = RealFromStr(argv[i+j]);
                                }
                                i += 4;
                                break;
@@ -154,6 +175,15 @@ 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;
+                       case 'm':
+                               make_movie = true;
+                               break;
                }       
        }
 
@@ -177,10 +207,7 @@ int main(int argc, char ** argv)
        {
                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