Update to 2.0.0 tree from current Fremantle build

[opencv] / cvaux / src / _cvaux.h

diff --git a/cvaux/src/_cvaux.h b/cvaux/src/_cvaux.h
deleted file mode 100644 (file)
index 65267d9..0000000
--- a/cvaux/src/_cvaux.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                        Intel License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2000, Intel Corporation, all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of Intel Corporation may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-#ifndef __CVAUX_H__
-#define __CVAUX_H__
-
-#if _MSC_VER >= 1200
-#pragma warning( disable: 4710 4711 4514 4996 ) /* function AAA selected for automatic inline expansion */
-#endif
-
-#include "cvaux.h"
-#include "cxmisc.h"
-#include "_cvmatrix.h"
-
-typedef unsigned short ushort;
-
-CV_INLINE bool operator == (CvSize size1, CvSize size2 );
-CV_INLINE bool operator == (CvSize size1, CvSize size2 )
-{
-    return size1.width == size2.width && size1.height == size2.height;
-}
-
-CV_INLINE bool operator != (CvSize size1, CvSize size2 );
-CV_INLINE bool operator != (CvSize size1, CvSize size2 )
-{
-    return size1.width != size2.width || size1.height != size2.height;
-}
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#endif /* __CVAUX_H__ */