From f6b8e0eae4374f339487a33e3e4fe5462d5816e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 25 Nov 2017 10:16:00 +0100 Subject: New upstream version 2.0.0 --- spectro/insttypes.h | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) mode change 100644 => 100755 spectro/insttypes.h (limited to 'spectro/insttypes.h') diff --git a/spectro/insttypes.h b/spectro/insttypes.h old mode 100644 new mode 100755 index 8306bc8..104b25d --- a/spectro/insttypes.h +++ b/spectro/insttypes.h @@ -65,21 +65,23 @@ typedef enum { instFakeDisp = 9998, /* Fake display & instrument device id */ +#ifdef ENABLE_VTPGLUT /* 3D cLUT box */ - // 20000 + devRadiance = 20000, /* Lumagen Radiance v3dlut & vtpg */ + devPrisma, /* Q, Inc Prisma v3dlut */ /* Video test patern generator box */ // 30000 +#endif + - /* Printers */ - devEpsonR1800 = 40000 /* Epson R1800 printer */ } devType; /* Aliases for backwards compatibility */ #define instUnknown devUnknown typedef devType instType; -typedef devType cLUTType; +typedef devType vcLUTType; typedef devType vtpgType; typedef devType printerType; @@ -90,7 +92,7 @@ enum _icom_type; /* Given a device type, return the corrsponding */ /* category */ -//extern _icom_type inst_category(instType itype); +//extern _icom_type dev_category(instType itype); /* Given its instrument type, return the matching */ /* short instrument name (static string), */ @@ -127,6 +129,24 @@ int nep); /* Number of end points (0 for prelim match) */ extern int inst_illuminant(xspect *sp, instType itype); +/* ------------------------------------------------------ */ +/* Gretag/X-Rite specific reflective measurement standard */ + +typedef enum { + xcalstd_none = -2, /* Not set */ + xcalstd_native = -1, /* No conversion */ + xcalstd_xrdi = 0, /* Historical X-Rite */ + xcalstd_gmdi = 1, /* Historical Gretag-Macbeth */ + xcalstd_xrga = 2, /* Current X-Rite */ +} xcalstd; + +/* Return a string for the xcalstd enum */ +char *xcalstd2str(xcalstd std); + +/* Parse a string to xcalstd, */ +/* return xcalstd_none if not recognized */ +xcalstd str2xcalstd(char *str); + #ifdef __cplusplus } #endif -- cgit v1.2.3