added grabcut demo; fixed grabCut()

[opencv.git] / opencv / src / cv / cvgcgraph.hpp

diff --git a/opencv/src/cv/cvgcgraph.hpp b/opencv/src/cv/cvgcgraph.hpp
index 6cc9ef5654ae5f0c91b813ea809a492ea7ad2d8c..55daca92bbcbe52c7bb1bd2d99d7fb0841641db3 100644 (file)
--- a/opencv/src/cv/cvgcgraph.hpp
+++ b/opencv/src/cv/cvgcgraph.hpp
@@ -1,5 +1,49 @@
-#pragma once;\r
+/*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 _CV_GCGRAPH_H_
+#define _CV_GCGRAPH_H_\r
+\r
 using namespace std;\r
+\r
 template <class TWeight> class GCGraph\r
 {\r
 public:\r
@@ -148,7 +192,6 @@ TWeight GCGraph<TWeight>::maxFlow()
                 {
                     if( edgePtr[ei^vt].weight == 0 )
                         continue;
-                    int aN = (int)edges.size();
                     u = vtxPtr+edgePtr[ei].dst;
                     if( !u->parent )
                     {
@@ -330,4 +373,6 @@ bool GCGraph<TWeight>::inSourceSegment( int i )
 {
     CV_Assert( i>=0 && i<(int)vtcs.size() );
     return vtcs[i].t == 0;
-};
\ No newline at end of file
+};
+
+#endif
\ No newline at end of file