git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
My eyes, they burn! Also runs faster, slightly less buggy.
[ipdf/code.git]
/
src
/
main.cpp
diff --git
a/src/main.cpp
b/src/main.cpp
index
e20a7bf
..
cdb2d0a
100644
(file)
--- a/
src/main.cpp
+++ b/
src/main.cpp
@@
-21,6
+21,9
@@
void sigfpe_handler(int sig)
int main(int argc, char ** argv)
{
int main(int argc, char ** argv)
{
+
+
+ //Debug("Main!");
signal(SIGFPE, sigfpe_handler);
#if REALTYPE == REAL_IRRAM
iRRAM_initialize(argc,argv);
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.
#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);
feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
-
+ #endif
+ #if REALTYPE == REAL_MPFRCPP
+ mpfr_set_default_prec(6);
+ #endif
DebugRealInfo();
DebugRealInfo();
+
+
Document doc("","fonts/ComicSans.ttf");
srand(time(NULL));
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;
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;
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);
{
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;
}
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));
}
{
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
#ifndef CONTROLPANEL_DISABLED
UCC
git Repository :: git.ucc.asn.au