[artoolkit-commits] artoolkit/lib/SRC/AR arUtil.c,1.1.1.1,1.2
Optical marker tracking and overlay for augmented reality.
Brought to you by:
philip_lamb
From: Philip L. <phi...@us...> - 2006-09-27 23:31:48
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/AR In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30173 Modified Files: arUtil.c Log Message: Add version checking support. Index: arUtil.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/AR/arUtil.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** arUtil.c 4 Nov 2004 08:51:27 -0000 1.1.1.1 --- arUtil.c 27 Sep 2006 23:31:45 -0000 1.2 *************** *** 37,40 **** --- 37,63 ---- double arsMatR2L[3][4]; + ARUint32 arGetVersion(char **versionStringRef) + { + const char version[] = AR_HEADER_VERSION_STRING; + char *s; + + if (versionStringRef) { + arMalloc(s, char, sizeof(version)); + strncpy(s, version, sizeof(version)); + *versionStringRef = s; + } + // Represent full version number (major, minor, tiny, build) in + // binary coded decimal. N.B: Integer division. + return (0x10000000u * ((unsigned int)AR_HEADER_VERSION_MAJOR / 10u) + + 0x01000000u * ((unsigned int)AR_HEADER_VERSION_MAJOR % 10u) + + 0x00100000u * ((unsigned int)AR_HEADER_VERSION_MINOR / 10u) + + 0x00010000u * ((unsigned int)AR_HEADER_VERSION_MINOR % 10u) + + 0x00001000u * ((unsigned int)AR_HEADER_VERSION_TINY / 10u) + + 0x00000100u * ((unsigned int)AR_HEADER_VERSION_TINY % 10u) + + 0x00000010u * ((unsigned int)AR_HEADER_VERSION_BUILD / 10u) + + 0x00000001u * ((unsigned int)AR_HEADER_VERSION_BUILD % 10u) + ); + } + static int arGetLine2(int x_coord[], int y_coord[], int coord_num, int vertex[], double line[4][3], double v[4][2], double *dist_factor); *************** *** 288,289 **** --- 311,313 ---- return; } + |