From 3db384424bd7398ffbb7a355cab8f15f3add009f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 2 Oct 2016 19:24:58 +0200 Subject: New upstream version 1.9.1+repack --- spectro/ss.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'spectro/ss.h') diff --git a/spectro/ss.h b/spectro/ss.h index bff0846..bc816e7 100644 --- a/spectro/ss.h +++ b/spectro/ss.h @@ -44,6 +44,10 @@ #include "inst.h" #include "ss_imp.h" +#ifdef __cplusplus + extern "C" { +#endif + #define SS_MAX_WR_SIZE 1000 /* Assumed maximum normal message query size */ #define SS_MAX_RD_SIZE 1000 /* Assumed maximum normal messagle answer size */ @@ -60,7 +64,7 @@ struct _ss { inst_mode mode; /* Currently instrument mode */ /* Desired measurement configuration */ - ss_aft filt; /* Filter type (None/UV/D65 etc.) */ + ss_aft filt; /* Filter type (None/UV/D65/Pol etc.) */ ss_dst dstd; /* Density standard (ANSI A/ANSI T/DIN etc.) */ ss_ilt illum; /* Illuminant type (A/C/D50 etc.) */ ss_ot obsv; /* Observer type (2deg/10deg) */ @@ -85,6 +89,9 @@ struct _ss { int compen; /* Compensation filter enabled */ double comp[36]; /* Compensation filter */ + xcalstd native_calstd; /* Instrument native calibration standard */ + xcalstd target_calstd; /* Returned calibration standard */ + #ifdef EMSST int tmode; /* Transmission mode */ ss_rt sbr; /* Standby reference */ @@ -111,5 +118,9 @@ struct _ss { /* Constructor */ extern ss *new_ss(icoms *icom, instType itype); +#ifdef __cplusplus + } +#endif + #define SS_H #endif /* SS_H */ -- cgit v1.2.3