diff options
Diffstat (limited to 'macros/FunctionAnnotation')
| -rw-r--r-- | macros/FunctionAnnotation/FA_GetDefaultPrecision.bin | bin | 11192 -> 11384 bytes | |||
| -rw-r--r-- | macros/FunctionAnnotation/FA_GetDefaultPrecision.sci | 2 | ||||
| -rw-r--r-- | macros/FunctionAnnotation/FA_GetFunAnn.bin | bin | 30684 -> 30680 bytes | |||
| -rw-r--r-- | macros/FunctionAnnotation/FA_GetFunAnn.sci | 1 | ||||
| -rw-r--r-- | macros/FunctionAnnotation/FA_TP_CVIMAGE.bin | bin | 0 -> 2924 bytes | |||
| -rw-r--r-- | macros/FunctionAnnotation/FA_TP_CVIMAGE.sci | 30 | ||||
| -rw-r--r-- | macros/FunctionAnnotation/FA_TP_INT16.bin | bin | 2888 -> 2888 bytes | |||
| -rw-r--r-- | macros/FunctionAnnotation/FA_TP_INT16.sci | 2 | ||||
| -rw-r--r-- | macros/FunctionAnnotation/lib | bin | 2204 -> 2228 bytes | |||
| -rw-r--r-- | macros/FunctionAnnotation/names | 1 |
10 files changed, 34 insertions, 2 deletions
diff --git a/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin b/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin Binary files differindex 61f446f..fa48e83 100644 --- a/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin +++ b/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin diff --git a/macros/FunctionAnnotation/FA_GetDefaultPrecision.sci b/macros/FunctionAnnotation/FA_GetDefaultPrecision.sci index da5486d..3603c57 100644 --- a/macros/FunctionAnnotation/FA_GetDefaultPrecision.sci +++ b/macros/FunctionAnnotation/FA_GetDefaultPrecision.sci @@ -87,6 +87,8 @@ else defaultprecision = 'u16';
elseif (tmpprecision == 'INT16')
defaultprecision = 'i16';
+ elseif (tmpprecision == 'CVIMAGE')
+ defaultprecision = 'IplImage'
end
end
diff --git a/macros/FunctionAnnotation/FA_GetFunAnn.bin b/macros/FunctionAnnotation/FA_GetFunAnn.bin Binary files differindex c94c675..3c2f9d4 100644 --- a/macros/FunctionAnnotation/FA_GetFunAnn.bin +++ b/macros/FunctionAnnotation/FA_GetFunAnn.bin diff --git a/macros/FunctionAnnotation/FA_GetFunAnn.sci b/macros/FunctionAnnotation/FA_GetFunAnn.sci index ffdfa7f..912d099 100644 --- a/macros/FunctionAnnotation/FA_GetFunAnn.sci +++ b/macros/FunctionAnnotation/FA_GetFunAnn.sci @@ -131,7 +131,6 @@ if (FoundNOut*FoundNIn == 0) PrintStringInfo(' ',ReportFileName,'both','y');
error(9999, 'SCI2CERROR: Incorrect function annotation.');
else
-
// In case we are reading to much informations
readNewLine = %t;
diff --git a/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin b/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin Binary files differnew file mode 100644 index 0000000..1d824fb --- /dev/null +++ b/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin diff --git a/macros/FunctionAnnotation/FA_TP_CVIMAGE.sci b/macros/FunctionAnnotation/FA_TP_CVIMAGE.sci new file mode 100644 index 0000000..1c0d174 --- /dev/null +++ b/macros/FunctionAnnotation/FA_TP_CVIMAGE.sci @@ -0,0 +1,30 @@ +function typeout = FA_TP_CVIMAGE() +// function typeout = FA_TP_INT16() +// ----------------------------------------------------------------- +// Returns the OpenCV image type specifier (im) +// for Function Annotations. +// +// Input data: +// --- +// +// Output data: +// typeout: string containing the type specifier. +// +// Status: +// +// Copyright 2007 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),0,0); + + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +typeout = 'im'; + +endfunction diff --git a/macros/FunctionAnnotation/FA_TP_INT16.bin b/macros/FunctionAnnotation/FA_TP_INT16.bin Binary files differindex 2ebb734..e28e0c5 100644 --- a/macros/FunctionAnnotation/FA_TP_INT16.bin +++ b/macros/FunctionAnnotation/FA_TP_INT16.bin diff --git a/macros/FunctionAnnotation/FA_TP_INT16.sci b/macros/FunctionAnnotation/FA_TP_INT16.sci index 8971754..67b8178 100644 --- a/macros/FunctionAnnotation/FA_TP_INT16.sci +++ b/macros/FunctionAnnotation/FA_TP_INT16.sci @@ -1,7 +1,7 @@ function typeout = FA_TP_INT16() // function typeout = FA_TP_INT16() // ----------------------------------------------------------------- -// Returns the "uint8" type specifier +// Returns the "int16" type specifier // for Function Annotations. // // Input data: diff --git a/macros/FunctionAnnotation/lib b/macros/FunctionAnnotation/lib Binary files differindex b8b2d41..b7b5520 100644 --- a/macros/FunctionAnnotation/lib +++ b/macros/FunctionAnnotation/lib diff --git a/macros/FunctionAnnotation/names b/macros/FunctionAnnotation/names index 3db59cc..d9ae572 100644 --- a/macros/FunctionAnnotation/names +++ b/macros/FunctionAnnotation/names @@ -51,6 +51,7 @@ FA_SZ_SEL1 FA_SZ_SEL2 FA_TP_C FA_TP_COMPLEX +FA_TP_CVIMAGE FA_TP_D FA_TP_I FA_TP_INT16 |