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
Compile with float/double again.
[ipdf/code.git]
/
src
/
main.cpp
diff --git
a/src/main.cpp
b/src/main.cpp
index
31ccf2e
..
a4c570b
100644
(file)
--- a/
src/main.cpp
+++ b/
src/main.cpp
@@
-10,6
+10,7
@@
#include <signal.h>
bool ignore_sigfpe = false;
#include <signal.h>
bool ignore_sigfpe = false;
+const char *script_filename;
void sigfpe_handler(int sig)
{
void sigfpe_handler(int sig)
{
@@
-45,7
+46,7
@@
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;
int max_frames = -1;
bool hide_control_panel = false;
bool lazy_rendering = true;
@@
-79,10
+80,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;
@@
-154,6
+152,12
@@
int main(int argc, char ** argv)
hide_control_panel = true;
window_visible = !window_visible;
break;
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;
}
}
}
}
@@
-177,10
+181,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