Menu
▾
▴
[Robotflow-cvs] RobotFlow/Vision/src BMPLoad.cc,1.2,1.3 BMPSave.cc,1.3,1.4 Binarize.cc,1.4,1.5 Bt848.cc,1.6,1.7 CPoint.cc,1.7,1.8 CRect.cc,1.8,1.9 CSymbol.cc,1.3,1.4 CTextLine.cc,1.3,1.4 Cell.cc,1.6,1.7 ColorLookup.cc,1.7,1.8 ColorTracker.cc,1.8,1.9 Components.cc,1.10,1.11 ComponentsData.cc,1.8,1.9 ComponentsDraw.cc,1.5,1.6 ComponentsViewer.cc,1.5,1.6 ExtractSentence.cc,1.3,1.4 ExtractSentence_v2.cc,1.2,1.3 FakeImage.cc,1.4,1.5 GaussianBlur.cc,1.3,1.4 HoughTransform.cc,1.4,1.5 Image.cc,1.16,1.17 ImageAnd.cc,1.2,1.3 ImageCorrellation.cc,1.4,1.5 ImageOr.cc,1.2,1.3 InverseHough.cc,1.4,1.5 JPEGLoadMemory.cc,1.4,1.5 JPEGSave.cc,1.9,1.10 LoadImage.cc,1.2,1.3 Magn2EdgeMap.cc,1.2,1.3 Magnitude.cc,1.3,1.4 MovementDetector.cc,1.1,1.2 MultiColorTracker.cc,1.8,1.9 NewSymbolIdentify.cc,1.3,1.4 PPMImage.cc,1.5,1.6 Posterize.cc,1.4,1.5 PrintLines.cc,1.2,1.3 RGB152GREY.cc,1.5,1.6 RGB242RGB15.cc,1.4,1.5 RGBMerge.cc,1.6,1.7 RGBSplit.cc,1.5,1.6 RectAnalyser.cc,1.3,1.4 RectBoundaries.cc,1.3,1.4 Scale.cc,1.4,1.5 ScalePrint.cc,1.3,1.4 SplitImage.cc,1.2,1.3 StatIntensityAnalyser.cc,1.3,1.4 SubImage.cc,1.3,1.4 Surround.cc,1.3,1.4 SymbolCounter.cc,1.3,1.4 SymbolExtractor.cc,1.4,1.5 SymbolLoad.cc,1.3,1.4 SymbolSegmenter.cc,1.2,1.3 SymbolTracker.cc,1.4,1.5 lines.cc,1.2,1.3 types.cc,1.2,1.3
Update of /cvsroot/robotflow/RobotFlow/Vision/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10496/Vision/src Modified Files: BMPLoad.cc BMPSave.cc Binarize.cc Bt848.cc CPoint.cc CRect.cc CSymbol.cc CTextLine.cc Cell.cc ColorLookup.cc ColorTracker.cc Components.cc ComponentsData.cc ComponentsDraw.cc ComponentsViewer.cc ExtractSentence.cc ExtractSentence_v2.cc FakeImage.cc GaussianBlur.cc HoughTransform.cc Image.cc ImageAnd.cc ImageCorrellation.cc ImageOr.cc InverseHough.cc JPEGLoadMemory.cc JPEGSave.cc LoadImage.cc Magn2EdgeMap.cc Magnitude.cc MovementDetector.cc MultiColorTracker.cc NewSymbolIdentify.cc PPMImage.cc Posterize.cc PrintLines.cc RGB152GREY.cc RGB242RGB15.cc RGBMerge.cc RGBSplit.cc RectAnalyser.cc RectBoundaries.cc Scale.cc ScalePrint.cc SplitImage.cc StatIntensityAnalyser.cc SubImage.cc Surround.cc SymbolCounter.cc SymbolExtractor.cc SymbolLoad.cc SymbolSegmenter.cc SymbolTracker.cc lines.cc types.cc Log Message: Now using the RobotFlow namespace and the FD namespace Index: SplitImage.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/SplitImage.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SplitImage.cc 2 Jan 2005 14:44:00 -0000 1.2 --- SplitImage.cc 29 Mar 2005 15:20:48 -0000 1.3 *************** *** 25,28 **** --- 25,31 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class SplitImage; *************** *** 114,118 **** }; ! #endif --- 117,121 ---- }; ! }//namespace RobotFlow #endif Index: JPEGLoadMemory.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/JPEGLoadMemory.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JPEGLoadMemory.cc 2 Jan 2005 14:44:00 -0000 1.4 --- JPEGLoadMemory.cc 29 Mar 2005 15:20:48 -0000 1.5 *************** *** 25,28 **** --- 25,31 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { //forward declaration *************** *** 108,112 **** }; ! #endif --- 111,115 ---- }; ! }//namespace RobotFlow #endif Index: SymbolExtractor.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/SymbolExtractor.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SymbolExtractor.cc 2 Jan 2005 14:44:00 -0000 1.4 --- SymbolExtractor.cc 29 Mar 2005 15:20:48 -0000 1.5 *************** *** 25,28 **** --- 25,31 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class SymbolExtractor; *************** *** 162,164 **** --- 165,169 ---- }; + + }//namespace RobotFlow #endif Index: ImageAnd.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/ImageAnd.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ImageAnd.cc 2 Jan 2005 14:44:00 -0000 1.2 --- ImageAnd.cc 29 Mar 2005 15:20:47 -0000 1.3 *************** *** 31,34 **** --- 31,37 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class ImageAnd; *************** *** 96,98 **** --- 99,104 ---- } }; + + }//namespace RobotFlow + #endif Index: StatIntensityAnalyser.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/StatIntensityAnalyser.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StatIntensityAnalyser.cc 2 Jan 2005 14:44:00 -0000 1.3 --- StatIntensityAnalyser.cc 29 Mar 2005 15:20:48 -0000 1.4 *************** *** 27,31 **** --- 27,33 ---- using namespace std; + using namespace FD; + namespace RobotFlow { class StatIntensityAnalyser; *************** *** 163,166 **** --- 165,171 ---- }//calculate_behavior }; + + }//namespace RobotFlow + #endif Index: Surround.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/Surround.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Surround.cc 2 Jan 2005 14:44:00 -0000 1.3 --- Surround.cc 29 Mar 2005 15:20:48 -0000 1.4 *************** *** 23,26 **** --- 23,29 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class Surround; *************** *** 110,113 **** --- 113,119 ---- }//calculate_behavior }; + + }//namespace RobotFlow + #endif Index: MovementDetector.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/MovementDetector.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MovementDetector.cc 19 Jun 2003 19:53:14 -0000 1.1 --- MovementDetector.cc 29 Mar 2005 15:20:48 -0000 1.2 *************** *** 24,27 **** --- 24,30 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class MovementDetector; *************** *** 186,189 **** ! #endif --- 189,192 ---- ! }//namespace RobotFlow #endif Index: FakeImage.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/FakeImage.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FakeImage.cc 2 Jan 2005 14:44:00 -0000 1.4 --- FakeImage.cc 29 Mar 2005 15:20:47 -0000 1.5 *************** *** 22,25 **** --- 22,28 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class FakeImage; *************** *** 107,109 **** --- 110,114 ---- }; + + }//namespace RobotFlow #endif Index: ColorLookup.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/ColorLookup.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ColorLookup.cc 2 Jan 2005 14:44:00 -0000 1.7 --- ColorLookup.cc 29 Mar 2005 15:20:47 -0000 1.8 *************** *** 19,22 **** --- 19,25 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { DECLARE_TYPE(ColorLookup); *************** *** 94,95 **** --- 97,100 ---- } + + }//namespace RobotFlow Index: MultiColorTracker.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/MultiColorTracker.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MultiColorTracker.cc 2 Jan 2005 14:44:00 -0000 1.8 --- MultiColorTracker.cc 29 Mar 2005 15:20:48 -0000 1.9 *************** *** 25,28 **** --- 25,31 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class MultiColorTracker; *************** *** 199,203 **** }; ! #endif --- 202,206 ---- }; ! }//namespace RobotFlow #endif Index: RectBoundaries.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/RectBoundaries.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RectBoundaries.cc 2 Jan 2005 14:44:00 -0000 1.3 --- RectBoundaries.cc 29 Mar 2005 15:20:48 -0000 1.4 *************** *** 27,30 **** --- 27,33 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class RectBoundaries; *************** *** 93,97 **** }; ! #endif --- 96,100 ---- }; ! }//namespace RobotFlow #endif Index: Binarize.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/Binarize.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Binarize.cc 2 Jan 2005 14:44:00 -0000 1.4 --- Binarize.cc 29 Mar 2005 15:20:47 -0000 1.5 *************** *** 24,27 **** --- 24,30 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class Binarize; *************** *** 176,179 **** --- 179,185 ---- }//calculate_behavior }; + + }//namespace RobotFlow + #endif Index: BMPLoad.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/BMPLoad.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BMPLoad.cc 2 Jan 2005 14:44:00 -0000 1.2 --- BMPLoad.cc 29 Mar 2005 15:20:47 -0000 1.3 *************** *** 29,32 **** --- 29,35 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class BMPLoad; *************** *** 174,176 **** --- 177,182 ---- } }; + + }//namespace RobotFlow + #endif Index: RectAnalyser.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/RectAnalyser.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RectAnalyser.cc 2 Jan 2005 14:44:00 -0000 1.3 --- RectAnalyser.cc 29 Mar 2005 15:20:48 -0000 1.4 *************** *** 27,30 **** --- 27,33 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class RectAnalyser; *************** *** 116,120 **** }; ! #endif --- 119,123 ---- }; ! }//namespace RobotFlow #endif Index: RGB152GREY.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/RGB152GREY.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RGB152GREY.cc 2 Jan 2005 14:44:00 -0000 1.5 --- RGB152GREY.cc 29 Mar 2005 15:20:48 -0000 1.6 *************** *** 26,29 **** --- 26,32 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class RGB152GREY; *************** *** 110,114 **** }; ! #endif --- 113,117 ---- }; ! }//namespace RobotFlow #endif Index: Magnitude.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/Magnitude.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Magnitude.cc 2 Jan 2005 14:44:00 -0000 1.3 --- Magnitude.cc 29 Mar 2005 15:20:48 -0000 1.4 *************** *** 33,36 **** --- 33,39 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class Magnitude; *************** *** 107,111 **** }; ! #endif --- 110,114 ---- }; ! }//namespace RobotFlow #endif Index: SymbolSegmenter.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/SymbolSegmenter.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SymbolSegmenter.cc 27 Jul 2004 20:32:34 -0000 1.2 --- SymbolSegmenter.cc 29 Mar 2005 15:20:48 -0000 1.3 *************** *** 30,33 **** --- 30,36 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class SymbolSegmenter; *************** *** 302,304 **** --- 305,309 ---- }; + + }//namespace RobotFlow #endif Index: Scale.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/Scale.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Scale.cc 2 Jan 2005 14:44:00 -0000 1.4 --- Scale.cc 29 Mar 2005 15:20:48 -0000 1.5 *************** *** 27,30 **** --- 27,33 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class Scale; *************** *** 160,164 **** }; ! #endif --- 163,167 ---- }; ! }//namespace RobotFlow #endif Index: RGBMerge.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/RGBMerge.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RGBMerge.cc 2 Jan 2005 14:44:00 -0000 1.6 --- RGBMerge.cc 29 Mar 2005 15:20:48 -0000 1.7 *************** *** 26,29 **** --- 26,32 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class RGBMerge; *************** *** 137,141 **** }; ! #endif --- 140,144 ---- }; ! }//namespace RobotFlow #endif Index: Image.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/Image.cc,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Image.cc 2 Jan 2005 14:44:00 -0000 1.16 --- Image.cc 29 Mar 2005 15:20:47 -0000 1.17 *************** *** 29,32 **** --- 29,35 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { DECLARE_TYPE(Image); *************** *** 621,622 **** --- 624,627 ---- } + + }//namespace RobotFlow Index: Components.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/Components.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Components.cc 2 Jan 2005 14:44:00 -0000 1.10 --- Components.cc 29 Mar 2005 15:20:47 -0000 1.11 *************** *** 23,26 **** --- 23,29 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { /*Node *************** *** 500,501 **** --- 503,506 ---- } } + + }//namespace RobotFlow Index: Posterize.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/Posterize.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Posterize.cc 2 Jan 2005 14:44:00 -0000 1.4 --- Posterize.cc 29 Mar 2005 15:20:48 -0000 1.5 *************** *** 23,26 **** --- 23,29 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class Posterize; *************** *** 151,154 **** --- 154,160 ---- }//calculate_behavior }; + + }//namespace RobotFlow + #endif Index: RGB242RGB15.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/RGB242RGB15.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RGB242RGB15.cc 2 Jan 2005 14:44:00 -0000 1.4 --- RGB242RGB15.cc 29 Mar 2005 15:20:48 -0000 1.5 *************** *** 26,29 **** --- 26,32 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class RGB242RGB15; *************** *** 102,106 **** }; ! #endif --- 105,109 ---- }; ! }//namespace RobotFlow #endif Index: ExtractSentence.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/ExtractSentence.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ExtractSentence.cc 2 Jan 2005 14:44:00 -0000 1.3 --- ExtractSentence.cc 29 Mar 2005 15:20:47 -0000 1.4 *************** *** 26,29 **** --- 26,32 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class ExtractSentence; *************** *** 198,202 **** } ! #endif --- 201,205 ---- } ! }//namespace RobotFlow #endif Index: HoughTransform.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/HoughTransform.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** HoughTransform.cc 13 Aug 2004 16:26:41 -0000 1.4 --- HoughTransform.cc 29 Mar 2005 15:20:47 -0000 1.5 *************** *** 40,46 **** #include "lines.h" - class HoughTransform; - using namespace std; DECLARE_NODE(HoughTransform) --- 40,49 ---- #include "lines.h" using namespace std; + using namespace FD; + + namespace RobotFlow { + + class HoughTransform; DECLARE_NODE(HoughTransform) *************** *** 174,176 **** --- 177,181 ---- }; + + }//namespace RobotFlow #endif Index: GaussianBlur.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/GaussianBlur.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GaussianBlur.cc 2 Jan 2005 14:44:00 -0000 1.3 --- GaussianBlur.cc 29 Mar 2005 15:20:47 -0000 1.4 *************** *** 34,37 **** --- 34,40 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class GrayGaussianBlur; *************** *** 164,167 **** ! #endif --- 167,170 ---- ! }//namespace RobotFlow #endif Index: ColorTracker.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/ColorTracker.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ColorTracker.cc 2 Jan 2005 14:44:00 -0000 1.8 --- ColorTracker.cc 29 Mar 2005 15:20:47 -0000 1.9 *************** *** 23,26 **** --- 23,29 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class ColorTracker; *************** *** 187,191 **** }; ! #endif --- 190,194 ---- }; ! }//namespace RobotFlow #endif Index: ImageCorrellation.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/ImageCorrellation.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ImageCorrellation.cc 2 Jan 2005 14:44:00 -0000 1.4 --- ImageCorrellation.cc 29 Mar 2005 15:20:48 -0000 1.5 *************** *** 22,25 **** --- 22,28 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class ImageCorrellation; *************** *** 245,247 **** --- 248,253 ---- }; + + }//namespace RobotFlow + #endif Index: ComponentsViewer.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/ComponentsViewer.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ComponentsViewer.cc 2 Jan 2005 14:44:00 -0000 1.5 --- ComponentsViewer.cc 29 Mar 2005 15:20:47 -0000 1.6 *************** *** 24,27 **** --- 24,30 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class ComponentsViewer; *************** *** 189,196 **** } ! } - - }; #endif --- 192,199 ---- } ! } ! }; + }//namespace RobotFlow #endif Index: CSymbol.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/CSymbol.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CSymbol.cc 2 Jan 2005 14:44:00 -0000 1.3 --- CSymbol.cc 29 Mar 2005 15:20:47 -0000 1.4 *************** *** 20,23 **** --- 20,26 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { DECLARE_TYPE(CSymbol); *************** *** 163,164 **** --- 166,169 ---- out<<" >\n"; } + + }//namespace RobotFlow Index: CPoint.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/CPoint.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CPoint.cc 2 Jan 2005 14:44:00 -0000 1.7 --- CPoint.cc 29 Mar 2005 15:20:47 -0000 1.8 *************** *** 19,22 **** --- 19,26 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { + DECLARE_TYPE(CPoint); *************** *** 86,87 **** --- 90,92 ---- + }//namespace RobotFlow Index: SymbolLoad.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/SymbolLoad.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SymbolLoad.cc 2 Jan 2005 14:44:00 -0000 1.3 --- SymbolLoad.cc 29 Mar 2005 15:20:48 -0000 1.4 *************** *** 26,29 **** --- 26,32 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class SymbolLoad; *************** *** 106,110 **** }; ! #endif --- 109,113 ---- }; ! }//namespace RobotFlow #endif Index: Cell.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/Cell.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Cell.cc 2 Jan 2005 14:44:00 -0000 1.6 --- Cell.cc 29 Mar 2005 15:20:47 -0000 1.7 *************** *** 19,22 **** --- 19,25 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { DECLARE_TYPE(ImageCell); *************** *** 148,149 **** --- 151,153 ---- } + }//namespace RobotFlow Index: InverseHough.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/InverseHough.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** InverseHough.cc 2 Jan 2005 14:44:00 -0000 1.4 --- InverseHough.cc 29 Mar 2005 15:20:48 -0000 1.5 *************** *** 36,39 **** --- 36,42 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class InverseHough; *************** *** 151,153 **** --- 154,158 ---- }; + + }//namespace RobotFlow #endif Index: PPMImage.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/PPMImage.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PPMImage.cc 2 Jan 2005 14:44:00 -0000 1.5 --- PPMImage.cc 29 Mar 2005 15:20:48 -0000 1.6 *************** *** 23,26 **** --- 23,29 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class PPMImage; *************** *** 152,162 **** __FILE__,__LINE__); } - - - } - }; #endif --- 155,163 ---- __FILE__,__LINE__); } } + }; + }//namespace RobotFlow #endif Index: PrintLines.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/PrintLines.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PrintLines.cc 2 Jan 2005 14:44:00 -0000 1.2 --- PrintLines.cc 29 Mar 2005 15:20:48 -0000 1.3 *************** *** 33,36 **** --- 33,39 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class PrintLines; *************** *** 167,169 **** --- 170,175 ---- } }; + + }//namespace RobotFlow + #endif Index: JPEGSave.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/JPEGSave.cc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** JPEGSave.cc 2 Jan 2005 14:44:00 -0000 1.9 --- JPEGSave.cc 29 Mar 2005 15:20:48 -0000 1.10 *************** *** 30,33 **** --- 30,36 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { //forward declaration *************** *** 146,150 **** }; ! #endif --- 149,153 ---- }; ! }//namespace RobotFlow #endif Index: LoadImage.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/LoadImage.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LoadImage.cc 2 Jan 2005 14:44:00 -0000 1.2 --- LoadImage.cc 29 Mar 2005 15:20:48 -0000 1.3 *************** *** 26,29 **** --- 26,32 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class LoadImage; *************** *** 138,140 **** --- 141,146 ---- } }; + + }//namespace RobotFlow + #endif Index: BMPSave.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/BMPSave.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BMPSave.cc 2 Jan 2005 14:44:00 -0000 1.3 --- BMPSave.cc 29 Mar 2005 15:20:47 -0000 1.4 *************** *** 30,33 **** --- 30,36 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class BMPSave; *************** *** 242,244 **** --- 245,249 ---- }; + + }//namespace RobotFlow #endif Index: CRect.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/CRect.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CRect.cc 2 Jan 2005 14:44:00 -0000 1.8 --- CRect.cc 29 Mar 2005 15:20:47 -0000 1.9 *************** *** 19,22 **** --- 19,25 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { DECLARE_TYPE(CRect); *************** *** 521,522 **** --- 524,527 ---- ((m_center_y - y) * (m_center_y - y))); } + + }//namespace RobotFlow Index: SubImage.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/SubImage.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SubImage.cc 2 Jan 2005 14:44:00 -0000 1.3 --- SubImage.cc 29 Mar 2005 15:20:48 -0000 1.4 *************** *** 22,25 **** --- 22,28 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class SubImage; *************** *** 117,119 **** --- 120,125 ---- }; + + }//namespace RobotFlow + #endif Index: SymbolTracker.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/SymbolTracker.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SymbolTracker.cc 2 Jan 2005 14:44:00 -0000 1.4 --- SymbolTracker.cc 29 Mar 2005 15:20:48 -0000 1.5 *************** *** 23,26 **** --- 23,29 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class SymbolTracker; *************** *** 201,205 **** }; ! #endif --- 204,208 ---- }; ! } //namespace RobotFlow #endif Index: NewSymbolIdentify.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/NewSymbolIdentify.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** NewSymbolIdentify.cc 2 Jan 2005 14:44:00 -0000 1.3 --- NewSymbolIdentify.cc 29 Mar 2005 15:20:48 -0000 1.4 *************** *** 23,30 **** using namespace std; class NewSymbolIdentify; ! using namespace std; DECLARE_NODE(NewSymbolIdentify) --- 23,33 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class NewSymbolIdentify; ! DECLARE_NODE(NewSymbolIdentify) *************** *** 112,115 **** const int NewSymbolIdentify::SYMBOL_NONE = -1; ! #endif --- 115,118 ---- const int NewSymbolIdentify::SYMBOL_NONE = -1; ! }//namespace RobotFlow #endif Index: ComponentsDraw.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/ComponentsDraw.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ComponentsDraw.cc 2 Jan 2005 14:44:00 -0000 1.5 --- ComponentsDraw.cc 29 Mar 2005 15:20:47 -0000 1.6 *************** *** 24,27 **** --- 24,30 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class ComponentsDraw; *************** *** 160,162 **** --- 163,168 ---- } }; + + }//namespace RobotFlow + #endif Index: ExtractSentence_v2.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/ExtractSentence_v2.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExtractSentence_v2.cc 2 Jan 2005 14:44:00 -0000 1.2 --- ExtractSentence_v2.cc 29 Mar 2005 15:20:47 -0000 1.3 *************** *** 9,12 **** --- 9,15 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class ExtractSentence_v2; *************** *** 324,327 **** */ ! #endif --- 327,330 ---- */ ! }//namespace RobotFlow #endif Index: RGBSplit.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/RGBSplit.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RGBSplit.cc 2 Jan 2005 14:44:00 -0000 1.5 --- RGBSplit.cc 29 Mar 2005 15:20:48 -0000 1.6 *************** *** 26,29 **** --- 26,32 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class RGBSplit; *************** *** 136,139 **** ! #endif --- 139,142 ---- ! }//namespace RobotFlow #endif Index: CTextLine.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/CTextLine.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CTextLine.cc 2 Jan 2005 14:44:00 -0000 1.3 --- CTextLine.cc 29 Mar 2005 15:20:47 -0000 1.4 *************** *** 21,24 **** --- 21,27 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { DECLARE_TYPE(CTextLine); *************** *** 262,263 **** --- 265,267 ---- } + }//namespace RobotFlow Index: ComponentsData.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/ComponentsData.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ComponentsData.cc 2 Jan 2005 14:44:00 -0000 1.8 --- ComponentsData.cc 29 Mar 2005 15:20:47 -0000 1.9 *************** *** 19,22 **** --- 19,25 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { DECLARE_TYPE(ComponentsData); *************** *** 182,183 **** --- 185,188 ---- return m_components[pos]; } + + }//namespace RobotFlow Index: SymbolCounter.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/SymbolCounter.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SymbolCounter.cc 2 Jan 2005 14:44:00 -0000 1.3 --- SymbolCounter.cc 29 Mar 2005 15:20:48 -0000 1.4 *************** *** 25,28 **** --- 25,31 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class SymbolCounter; *************** *** 116,118 **** --- 119,123 ---- }; + + }//namespace RobotFlow #endif Index: types.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/types.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** types.cc 2 Jan 2005 14:44:00 -0000 1.2 --- types.cc 29 Mar 2005 15:20:48 -0000 1.3 *************** *** 19,25 **** #define _TYPES_CC_ using namespace std; ! #include "types.h" // rgb24 (RGB 24 bits standard) -> rgb15 (RGB 15 bits Overflow) --- 19,27 ---- #define _TYPES_CC_ + #include "types.h" + using namespace std; ! namespace RobotFlow { // rgb24 (RGB 24 bits standard) -> rgb15 (RGB 15 bits Overflow) *************** *** 45,47 **** --- 47,51 ---- } + }//namespace RobotFlow + #endif Index: ImageOr.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/ImageOr.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ImageOr.cc 2 Jan 2005 14:44:00 -0000 1.2 --- ImageOr.cc 29 Mar 2005 15:20:48 -0000 1.3 *************** *** 32,35 **** --- 32,38 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class ImageOr; *************** *** 97,100 **** } }; ! #endif --- 100,103 ---- } }; ! }//namespace RobotFLow #endif Index: ScalePrint.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/ScalePrint.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ScalePrint.cc 2 Jan 2005 14:44:00 -0000 1.3 --- ScalePrint.cc 29 Mar 2005 15:20:48 -0000 1.4 *************** *** 26,29 **** --- 26,32 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class ScalePrint; *************** *** 108,112 **** }; ! #endif --- 111,115 ---- }; ! }//namespace RobotFlow #endif Index: Bt848.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/Bt848.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Bt848.cc 2 Jan 2005 14:44:00 -0000 1.6 --- Bt848.cc 29 Mar 2005 15:20:47 -0000 1.7 *************** *** 35,38 **** --- 35,41 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { DECLARE_NODE(Bt848) *************** *** 405,408 **** } ! #endif --- 408,411 ---- } ! }//namespace RobotFlow #endif Index: lines.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/lines.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lines.cc 2 Jan 2005 14:44:00 -0000 1.2 --- lines.cc 29 Mar 2005 15:20:48 -0000 1.3 *************** *** 31,34 **** --- 31,37 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { // Constructeur *************** *** 130,132 **** --- 133,137 ---- return NULL; } + + }//namespace RobotFlow #endif Index: Magn2EdgeMap.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/Magn2EdgeMap.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Magn2EdgeMap.cc 2 Jan 2005 14:44:00 -0000 1.2 --- Magn2EdgeMap.cc 29 Mar 2005 15:20:48 -0000 1.3 *************** *** 33,36 **** --- 33,39 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class Magn2EdgeMap; *************** *** 111,115 **** }; ! #endif --- 114,118 ---- }; ! }//namespace RobotFlow #endif |
