X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.cpp;h=cdb2d0aee74d1741970c1d1fb21040dddfbe8b57;hp=e20a7bfaf02e78db30dc47d171410f911f4d5a6a;hb=f28146cf72fc68c8d3690814b1f89d47b8c4e7b9;hpb=35bc799125eec0d0c839af56fd136c8e85793a56 diff --git a/src/main.cpp b/src/main.cpp index e20a7bf..cdb2d0a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,6 +21,9 @@ void sigfpe_handler(int sig) int main(int argc, char ** argv) { + + + //Debug("Main!"); signal(SIGFPE, sigfpe_handler); #if REALTYPE == REAL_IRRAM iRRAM_initialize(argc,argv); @@ -31,10 +34,17 @@ int main(int argc, char ** argv) #endif // We want to crash if we ever get a NaN. + // 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 + mpfr_set_default_prec(6); + #endif DebugRealInfo(); + + Document doc("","fonts/ComicSans.ttf"); srand(time(NULL)); @@ -46,13 +56,13 @@ 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; @@ -80,10 +90,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; @@ -184,10 +191,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