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
David's final changes: more profiler features, fixes.
[ipdf/code.git]
/
src
/
main.cpp
diff --git
a/src/main.cpp
b/src/main.cpp
index
22a1f6b
..
23aba12
100644
(file)
--- a/
src/main.cpp
+++ b/
src/main.cpp
@@
-11,6
+11,8
@@
bool ignore_sigfpe = false;
const char *script_filename;
bool ignore_sigfpe = false;
const char *script_filename;
+bool make_movie = false;
+const char * program_name;
void sigfpe_handler(int sig)
{
void sigfpe_handler(int sig)
{
@@
-21,10
+23,10
@@
void sigfpe_handler(int sig)
int main(int argc, char ** argv)
{
int main(int argc, char ** argv)
{
-
+ program_name = argv[0];
//Debug("Main!");
//Debug("Main!");
- signal(SIGFPE, sigfpe_handler);
+ signal(SIGFPE,
SIG_IGN);//
sigfpe_handler);
#if REALTYPE == REAL_IRRAM
iRRAM_initialize(argc,argv);
#endif
#if REALTYPE == REAL_IRRAM
iRRAM_initialize(argc,argv);
#endif
@@
-34,12
+36,18
@@
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
+ //
Not any more
#ifndef __MINGW32__
#ifndef __MINGW32__
-
feenableexcept(FE_DIVBYZERO | FE_INVALID
| FE_OVERFLOW);
+
//feenableexcept(FE_DIVBYZERO | FE_INVALID); //
| FE_OVERFLOW);
#endif
#if REALTYPE == REAL_MPFRCPP
#endif
#if REALTYPE == REAL_MPFRCPP
- mpfr_set_default_prec(6);
+
+ #ifdef MPFR_PRECISION
+ mpfr_set_default_prec(MPFR_PRECISION);
+ #else
+ mpfr_set_default_prec(23);
+ #endif
+
#endif
DebugRealInfo();
#endif
DebugRealInfo();
@@
-61,9
+69,14
@@
int main(int argc, char ** argv)
bool hide_control_panel = false;
bool lazy_rendering = true;
bool window_visible = true;
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;
int i = 0;
@@
-168,17
+181,14
@@
int main(int argc, char ** argv)
Fatal("Expected filename after -s switch");
script_filename = argv[i];
break;
Fatal("Expected filename after -s switch");
script_filename = argv[i];
break;
+ case 'm':
+ make_movie = true;
+ break;
}
}
Rect bounds(b[0],b[1],b[2],b[3]);
Screen scr(window_visible);
}
}
Rect bounds(b[0],b[1],b[2],b[3]);
Screen scr(window_visible);
- View view(doc,scr, bounds);
-
- view.SetLazyRendering(lazy_rendering);
- view.SetGPURendering(gpu_rendering);
- view.SetGPUTransform(gpu_transform);
-
if (input_filename != NULL)
{
#ifdef TRANSFORM_OBJECTS_NOT_VIEW
if (input_filename != NULL)
{
#ifdef TRANSFORM_OBJECTS_NOT_VIEW
@@
-191,6
+201,12
@@
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));
}
+ View view(doc,scr, bounds);
+
+ view.SetLazyRendering(lazy_rendering);
+ view.SetGPURendering(gpu_rendering);
+ view.SetGPUTransform(gpu_transform);
+
UCC
git Repository :: git.ucc.asn.au