[artoolkit-commits] artoolkit/include/AR/sys videoWin32DirectShow.h,1.2,1.3
Optical marker tracking and overlay for augmented reality.
Brought to you by:
philip_lamb
From: Philip L. <phi...@us...> - 2005-12-08 18:52:00
|
Update of /cvsroot/artoolkit/artoolkit/include/AR/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28394 Modified Files: videoWin32DirectShow.h Log Message: Minor header correctness fixes. Index: videoWin32DirectShow.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/sys/videoWin32DirectShow.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** videoWin32DirectShow.h 20 Oct 2005 19:55:58 -0000 1.2 --- videoWin32DirectShow.h 8 Dec 2005 18:51:47 -0000 1.3 *************** *** 1,58 **** ! /* ======================================================================== ! * PROJECT: DirectShow Video Processing Library ! * FILE: ARToolkit 2.6x WIN32/DirectShow video input ! * ======================================================================== ! * Author: Thomas Pintaric, Vienna University of Technology ! * Contact: pin...@im... http://ims.tuwien.ac.at/~thomas ! * ======================================================================= ! * ! * Copyright (C) 2003 Vienna University of Technology ! * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Lesser General Public ! * License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Lesser General Public License for more details. ! * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! * ! * For further information please contact Thomas Pintaric under ! * <pin...@im...> or write to Thomas Pintaric, ! * Vienna University of Technology, Favoritenstr. 9-11/188, A1040 Vienna, ! * Austria. ! * ========================================================================*/ ! /* ! * Copyright (c) 2004-2005 Philip Lamb (PRL) ph...@ed.... All rights reserved. ! * ! * Rev Date Who Changes ! * 2.6.8 2004-07-20 PRL Rewrite for ARToolKit 2.68.2 ! * ! */ ! ! #ifndef AR_VIDEO_WIN32_DIRECTSHOW_H ! #define AR_VIDEO_WIN32_DIRECTSHOW_H ! ! #ifdef __cplusplus ! extern "C" { ! #endif ! ! #include <AR/config.h> ! #include <AR/ar.h> ! ! #include <stdio.h> ! #include <string.h> ! ! typedef struct _AR2VideoBufferT AR2VideoBufferT; ! typedef struct _AR2VideoParamT AR2VideoParamT; ! ! ! #ifdef __cplusplus ! } ! #endif ! #endif // AR_VIDEO_WIN32_DIRECTSHOW_H --- 1,59 ---- ! /* ======================================================================== ! * PROJECT: DirectShow Video Processing Library ! * FILE: ARToolkit 2.6x WIN32/DirectShow video input ! * ======================================================================== ! * Author: Thomas Pintaric, Vienna University of Technology ! * Contact: pin...@im... http://ims.tuwien.ac.at/~thomas ! * ======================================================================= ! * ! * Copyright (C) 2003 Vienna University of Technology ! * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Lesser General Public ! * License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Lesser General Public License for more details. ! * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! * ! * For further information please contact Thomas Pintaric under ! * <pin...@im...> or write to Thomas Pintaric, ! * Vienna University of Technology, Favoritenstr. 9-11/188, A1040 Vienna, ! * Austria. ! * ========================================================================*/ ! /* ! * Copyright (c) 2004-2005 Philip Lamb (PRL) ph...@ed.... All rights reserved. ! * ! * Rev Date Who Changes ! * 2.6.8 2004-07-20 PRL Rewrite for ARToolKit 2.68.2 ! * ! */ ! ! #ifndef AR_VIDEO_WIN32_DIRECTSHOW_H ! #define AR_VIDEO_WIN32_DIRECTSHOW_H ! ! #include <AR/config.h> ! #include <AR/ar.h> ! ! #include <stdio.h> ! #include <string.h> ! ! #define AR_VIDEO_WIN32_DIRECTSHOW_2_71 ! ! #ifdef __cplusplus ! extern "C" { ! #endif ! ! typedef struct _AR2VideoBufferT AR2VideoBufferT; ! typedef struct _AR2VideoParamT AR2VideoParamT; ! ! #ifdef __cplusplus ! } ! #endif ! #endif // AR_VIDEO_WIN32_DIRECTSHOW_H |