summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/mupdf.h3
-rw-r--r--include/mupdf/function.h15
-rw-r--r--include/mupdf/syntax.h1
3 files changed, 11 insertions, 8 deletions
diff --git a/include/mupdf.h b/include/mupdf.h
index cc455f89..a7feec65 100644
--- a/include/mupdf.h
+++ b/include/mupdf.h
@@ -9,7 +9,8 @@
#include "mupdf/syntax.h"
#include "mupdf/xref.h"
+#include "mupdf/function.h"
#include "mupdf/rsrc.h"
#include "mupdf/content.h"
#include "mupdf/page.h"
-#include "mupdf/function.h"
+
diff --git a/include/mupdf/function.h b/include/mupdf/function.h
index 483931b5..9e2caa26 100644
--- a/include/mupdf/function.h
+++ b/include/mupdf/function.h
@@ -40,14 +40,15 @@ struct psobj_s
{
unsigned short type;
union {
- int booln; // boolean (stack only)
- int intg; // integer (stack and code)
- float real; // real (stack and code)
- int op; // operator (code only)
- int blk; // if/ifelse block pointer (code only)
+ int booln; /* boolean (stack only) */
+ int intg; /* integer (stack and code) */
+ float real; /* real (stack and code) */
+ int op; /* operator (code only) */
+ int blk; /* if/ifelse block pointer (code only) */
};
};
fz_error *pdf_loadfunction(pdf_function **func, pdf_xref *xref, fz_obj *obj);
-fz_error *pdf_execfunction(pdf_function *func, float *in, int inlen, float *out, int outlen);
-void pdf_freefunc(pdf_function *func); \ No newline at end of file
+fz_error *pdf_evalfunction(pdf_function *func, float *in, int inlen, float *out, int outlen);
+void pdf_freefunc(pdf_function *func);
+
diff --git a/include/mupdf/syntax.h b/include/mupdf/syntax.h
index 4159cc54..5d9b1ffb 100644
--- a/include/mupdf/syntax.h
+++ b/include/mupdf/syntax.h
@@ -7,6 +7,7 @@ enum
PDF_TERROR, PDF_TEOF,
PDF_TOARRAY, PDF_TCARRAY,
PDF_TODICT, PDF_TCDICT,
+ PDF_TOBRACE, PDF_TCBRACE,
PDF_TNAME, PDF_TINT, PDF_TREAL, PDF_TSTRING, PDF_TKEYWORD,
PDF_TR, PDF_TTRUE, PDF_TFALSE, PDF_TNULL,
PDF_TOBJ, PDF_TENDOBJ,