Signed-off-by: LitLeo <[email protected]>

ragong · Mar 22, 2017 · 44344dc · 44344dc
1 parent 2e091b9
commit 44344dc
Show file tree

Hide file tree

Showing 63 changed files with 73 additions and 162 deletions.
diff --git a/doc/html.zip b/doc/html.zip
diff --git a/okano_3_0/AffineTrans.cu b/okano_3_0/AffineTrans.cu
@@ -13,8 +13,6 @@ using namespace std;
 #include <nppcore.h>
 #include <nppi.h>
 
-#include "ErrorCode.h"
-#include "FanczosIpl.h"
 
 // 宏：M_PI
 // π值。对于某些操作系统，M_PI可能没有定义，这里补充定义 M_PI。

diff --git a/okano_3_0/AffineTrans.h b/okano_3_0/AffineTrans.h
@@ -14,6 +14,7 @@
 
 #include "ErrorCode.h"
 #include "Image.h"
+#include "FanczosIpl.h"
 
 
 // 宏：AFFINE_SOFT_IPL

diff --git a/okano_3_0/BilateralFilter.cu b/okano_3_0/BilateralFilter.cu
@@ -7,7 +7,6 @@
 #include <cmath>
 using namespace std;
 
-#include "ErrorCode.h"
 
 // 宏：DEF_BLOCK_X 和 DEF_BLOCK_Y
 // 定义了默认的线程块的尺寸。

diff --git a/okano_3_0/BilinearInterpolation.cu b/okano_3_0/BilinearInterpolation.cu
@@ -6,7 +6,6 @@
 #include <cmath>
 using namespace std;
 
-#include "ErrorCode.h"
 
 // 宏：DEF_BLOCK_X 和 DEF_BLOCK_Y
 // 定义了默认的线程块的尺寸。

diff --git a/okano_3_0/Binarization.cu b/okano_3_0/Binarization.cu
@@ -2,15 +2,13 @@
 // 实现图像的多阈值二值化图像生成操作
 
 #include "Binarization.h"
-#include "Binarize.h"
 
 #include <stdio.h>
 #include <iostream>
 #include <fstream>
 #include <cmath>
 using namespace std;
 
-#include "ErrorCode.h"
 
 // 宏：BINARIZE_PACK_LEVEL
 // 定义了一个线程中计算的像素点个数，若该值为4，则在一个线程中计算2 ^ 4 = 16

diff --git a/okano_3_0/Binarization.h b/okano_3_0/Binarization.h
@@ -32,6 +32,7 @@
 #define __BINARIZATION_H__
 
 #include "Image.h"
+#include "Binarize.h"
 
 // 类：Binarization
 // 继承自：无

diff --git a/okano_3_0/Binarize.cu b/okano_3_0/Binarize.cu
@@ -8,7 +8,6 @@
 #include <cmath>
 using namespace std;
 
-#include "ErrorCode.h"
 
 // 宏：DEF_BLOCK_X 和 DEF_BLOCK_Y
 // 定义了默认的线程块的尺寸。

diff --git a/okano_3_0/ConnectRegion.cu b/okano_3_0/ConnectRegion.cu
@@ -8,7 +8,6 @@
 #include <cmath>
 using namespace std;
 
-#include "ErrorCode.h"
 
 // 宏：DEF_BLOCK_X 和 DEF_BLOCK_Y
 // 定义了默认的线程块的尺寸。

diff --git a/okano_3_0/ConnectRegionNew.cu b/okano_3_0/ConnectRegionNew.cu
@@ -8,7 +8,6 @@
 #include <cmath>
 using namespace std;
 
-#include "ErrorCode.h"
 
 // 宏：DEF_BLOCK_H
 // 定义了默认的一个线程块处理图像的行数。

diff --git a/okano_3_0/ConsolidateAndIdentifyContours.cu b/okano_3_0/ConsolidateAndIdentifyContours.cu
@@ -8,9 +8,6 @@
 #include <cmath>
 using namespace std;
 
-#include "ErrorCode.h"
-#include "Template.h"
-#include "TemplateFactory.h"
 
 
 // 宏：DEF_BLOCK_X 和 DEF_BLOCK_Y

diff --git a/okano_3_0/ConsolidateAndIdentifyContours.h b/okano_3_0/ConsolidateAndIdentifyContours.h
@@ -24,6 +24,9 @@
 #include "Thinning.h"
 #include "Binarize.h"
 
+#include "Template.h"
+#include "TemplateFactory.h"
+
 
 // 类：ConsolidateAndIdentifyContours
 // 继承自：无

diff --git a/okano_3_0/ContourMatch.cu b/okano_3_0/ContourMatch.cu
@@ -4,7 +4,6 @@
 #include <cmath>
 using namespace std;
 
-#include "ErrorCode.h"
 
 // 宏：DEF_BLOCK_X 和 DEF_BLOCK_Y
 // 定义了默认的线程块的尺寸。

diff --git a/okano_3_0/CovarianceMatrix.cu b/okano_3_0/CovarianceMatrix.cu
@@ -1,6 +1,5 @@
 #include <iostream> 
 #include "CovarianceMatrix.h" 
-#include "ErrorCode.h" 
 using namespace std;
 #define DIMENSION 3 
 

diff --git a/okano_3_0/Curve.cu b/okano_3_0/Curve.cu
@@ -7,7 +7,6 @@
 #include <fstream>
 using namespace std;
 
-#include "ErrorCode.h"
 
 // 宏：SMCURVE_VALID 和 SMCURVE_NOT_VALID
 // 定义了 smCurveCordiXY 是否有效的范围值。

diff --git a/okano_3_0/CurveFluctuation.cu b/okano_3_0/CurveFluctuation.cu
@@ -2,7 +2,6 @@
 // 创建人：邱孝兵
 
 #include "CurveFluctuation.h"
-#include "ErrorCode.h"
 #include <iostream>
 using namespace std;
 

diff --git a/okano_3_0/CurveTopology.cu b/okano_3_0/CurveTopology.cu
@@ -2,7 +2,7 @@
 // 曲线间的相位关系
 
 #include "CurveTopology.h"
-#include "Image.h"
+
 #include <stdio.h>
 #include <iostream>
 using namespace std;

diff --git a/okano_3_0/CurveTopology.h b/okano_3_0/CurveTopology.h
@@ -16,6 +16,7 @@
 
 #include "Curve.h"
 #include "ErrorCode.h"
+#include "Image.h"
 
 // 宏：CURVE_INCLUDE
 // 表示包含关系

diff --git a/okano_3_0/CurveTracing.cu b/okano_3_0/CurveTracing.cu
@@ -9,8 +9,6 @@
 
 using namespace std;
 
-#include "Template.h"
-#include "TemplateFactory.h"
 
 // 宏：CURVE_VALUE(曲线最大数目）
 // 设置图像能获得的曲线最大数目

diff --git a/okano_3_0/CurveTracing.h b/okano_3_0/CurveTracing.h
@@ -28,6 +28,8 @@
 #include "Image.h"
 #include "DynamicArrays.h"
 #include "ErrorCode.h"
+#include "Template.h"
+#include "TemplateFactory.h"
 
 
 // 类：CurveTracing（曲线跟踪）

diff --git a/okano_3_0/FeatureVecArray.cu b/okano_3_0/FeatureVecArray.cu
@@ -2,7 +2,6 @@
 // 创建人：邱孝兵
 
 #include "FeatureVecArray.h"
-#include  "ErrorCode.h"
 
 
 // 宏 DELETE_FEATUREVECARRAY_HOST （删除 Host 端特征向量）

diff --git a/okano_3_0/FeatureVecArray.h b/okano_3_0/FeatureVecArray.h
@@ -16,6 +16,8 @@
 #ifndef __FEATUREVECARRAY_H__
 #define __FEATUREVECARRAY_H__
 
+
+
 // 结构体：FeatureVecArray（特征向量组）
 // 该结构体定义了特征向量组的数据结构，组成这个向量组的每个向量都是五维的，
 // 这五维分别是 X 坐标、 Y 坐标， CV，SD，NC，此外还有向量组的大小 count

diff --git a/okano_3_0/FillCoor.cu b/okano_3_0/FillCoor.cu
@@ -1,6 +1,5 @@
 #include "FillCoor.h"
-#include "ImageDrawer.h"
-#include "ImgConvert.h" 
+
 #include <iostream>
 #include <stack>
 using namespace std;

diff --git a/okano_3_0/FillCoor.h b/okano_3_0/FillCoor.h
@@ -15,6 +15,9 @@
 #include "Image.h"
 #include "CoordiSet.h"
 #include "ErrorCode.h"
+#include "ImageDrawer.h"
+#include "ImgConvert.h" 
+
 #include<string>
 using namespace std;
 

diff --git a/okano_3_0/FreckleFilter.cu b/okano_3_0/FreckleFilter.cu
@@ -8,9 +8,6 @@
 #include <cmath>
 using namespace std;
 
-#include "ErrorCode.h"
-#include "Template.h"
-#include "TemplateFactory.h"
 
 // 宏：DEF_BLOCK_X 和 DEF_BLOCK_Y
 // 定义了默认的线程块的尺寸。

diff --git a/okano_3_0/FreckleFilter.h b/okano_3_0/FreckleFilter.h
@@ -54,6 +54,8 @@
 
 #include "Image.h"
 #include "ErrorCode.h"
+#include "Template.h"
+#include "TemplateFactory.h"
 
 // 宏：VAR_TH
 // 表示该滤波处理将用方差阈值法

diff --git a/okano_3_0/GaussianSmoothxy.cu b/okano_3_0/GaussianSmoothxy.cu
@@ -2,8 +2,7 @@
 // 实现对curve的高斯平滑
 
 #include "GaussianSmoothxy.h"
-#include "ErrorCode.h"
-#include "Curve.h"
+
 
 // 宏：DEF_BLOCK_X 和 DEF_BLOCK_Y
 // 定义了默认的线程块尺寸。

diff --git a/okano_3_0/HoughRec.cu b/okano_3_0/HoughRec.cu
@@ -1,8 +1,6 @@
 // HoughRec.cu
 // 实现 Hough 变换检测矩形
-#include "ImgConvert.h" 
 #include "HoughRec.h"
-#include "ImageDrawer.h"
 #include <iostream>
 #include <fstream>
 #include <cmath>

diff --git a/okano_3_0/HoughRec.h b/okano_3_0/HoughRec.h
@@ -25,6 +25,7 @@
 #include "HoughLine.h"
 #include "cuda_runtime.h"
 #include "ImageDrawer.h"
+#include "ImgConvert.h" 
 
 #include<string>
 using namespace std;

diff --git a/okano_3_0/ImageMatch.cu b/okano_3_0/ImageMatch.cu
@@ -1,16 +1,7 @@
 // ImageMacth.cu
 // 实现对图像进行匹配的操作
-
-#include "ConnectRegion.h"
-#include "ErrorCode.h"
 #include "ImageMatch.h"
-#include "LabelIslandSortArea.h"
-#include "Normalization.h"
-#include "Rectangle.h"
-#include "RoiCopy.h"
-#include "SmallestDirRect.h"
-#include "Template.h"
-#include "TemplateFactory.h"
+
 
 // 宏：DEF_BLOCK_X 和 DEF_BLOCK_Y
 // 定义了默认的线程块尺寸

diff --git a/okano_3_0/ImageMatch.h b/okano_3_0/ImageMatch.h
@@ -36,8 +36,16 @@
 #define __IMAGEMATCH_H__
 
 #include "Image.h"
-#include "Rectangle.h"
 #include "RotateTable.h"
+#include "ConnectRegion.h"
+#include "ErrorCode.h"
+#include "LabelIslandSortArea.h"
+#include "Normalization.h"
+#include "Rectangle.h"
+#include "RoiCopy.h"
+#include "SmallestDirRect.h"
+#include "Template.h"
+#include "TemplateFactory.h"
 
 // 结构体：MatchRes（匹配后得到的结果）
 // 该结构体定义了匹配后得到的结果，包括最佳匹配位置，最佳匹配对应的旋转角以及最

diff --git a/okano_3_0/InscribedCircle.cu b/okano_3_0/InscribedCircle.cu
@@ -10,9 +10,7 @@
 
 using namespace std;
 
-#include "Template.h"
-#include "TemplateFactory.h"
-#include "SortArray.h"
+
 
 // 宏：DEF_BLOCK_X 和 DEF_BLOCK_Y
 // 定义了默认的线程块尺寸。

diff --git a/okano_3_0/InscribedCircle.h b/okano_3_0/InscribedCircle.h
@@ -17,7 +17,9 @@
 #include "Image.h"
 #include "DynamicArrays.h"
 #include "ErrorCode.h"
-
+#include "Template.h"
+#include "TemplateFactory.h"
+#include "SortArray.h"
 
 // 类：InscribedCircle（内接圆）
 // 继承自：无

diff --git a/okano_3_0/LabelIslandSortArea.cu b/okano_3_0/LabelIslandSortArea.cu
@@ -2,7 +2,7 @@
 // 实现区域排序算法
 
 #include "LabelIslandSortArea.h"
-#include "Histogram.h"
+
 
 #include <iostream>
 using namespace std;

diff --git a/okano_3_0/LabelIslandSortArea.h b/okano_3_0/LabelIslandSortArea.h
@@ -23,7 +23,7 @@
 
 #include "Image.h"
 #include "ErrorCode.h"
-
+#include "Histogram.h"
 
 // 类：LabelIslandSortArea（区域排序类）
 // 继承自：无

diff --git a/okano_3_0/LinearFilter.cu b/okano_3_0/LinearFilter.cu
@@ -3,8 +3,7 @@
 
 #include <iostream>
 #include "LinearFilter.h"
-#include "ErrorCode.h"
-#include "ImageDiff.h"
+
 
 // 宏：DEF_BLOCK_X 和 DEF_BLOCK_Y
 // 定义了默认的线程块尺寸

diff --git a/okano_3_0/LinearFilter.h b/okano_3_0/LinearFilter.h
@@ -23,7 +23,8 @@
 
 #include "Image.h"
 #include "Template.h"
-
+#include "ErrorCode.h"
+#include "ImageDiff.h"
 
 // 宏：LNFT_COUNT_DIV
 // 用于设置 LinearFilter 类中的 impType 成员变量，告知类的实例选用邻域像素总和

diff --git a/okano_3_0/LocalCluster.cu b/okano_3_0/LocalCluster.cu
@@ -2,8 +2,7 @@
 // 局部聚类
 
 #include "LocalCluster.h"
-#include "Image.h"
-#include "ErrorCode.h"
+
 
 #include <iostream>
 #include <cmath>

diff --git a/okano_3_0/LocalCluster.h b/okano_3_0/LocalCluster.h
@@ -43,6 +43,7 @@
 #include "Image.h"
 #include "ErrorCode.h"
 
+
 // 类:LocalCluster
 // 继承自：无
 // 给定一张图像略去图像的边缘部分，在每一个点的八个方向上各求出 

diff --git a/okano_3_0/Makefile b/okano_3_0/Makefile
@@ -1,31 +1,4 @@
-ALGNAMES := Image Matrix Template CoordiSet TemplateFactory AffineTrans    \
-            RotateTable SelectShape SortArray Histogram HistogramSpec      \
-            Threshold BoundingRect Flip Binarize Morphology ConnectRegion  \
-            LabelIslandSortArea LinearEnhancement FillUp ImageDiff         \
-            ImageHide Moments GeometryProperties Normalization             \
-            FreckleFilter LocalCluster DownSampleImage HoughLine           \
-            BilateralFilter MultiThreshold BilinearInterpolation           \
-            FeatureVecCalc FeatureVecArray ImageMatch ScanArray            \
-            SalientRegionDetect RoiCopy RobustEdgeDetection                \
-            PerspectiveTrans FanczosIpl OtsuBinarize LinearFilter          \
-            WorkAndObjectMatch Thinning ImageScaling EdgeCheck             \
-            SmoothVector SegmentedScan HoughCircle ConvexHull              \
-            Segmentation SimpleRegionDetect Rectangle SmallestDirRect      \
-            HoughRec GetContourSet ImageDrawer ImgConvert ImageOverlay     \
-            TorusSegmentation IsolatedPoints InnerDigger ImageToText       \
-            Tattoo ImageStretch Mosaic Complex Mandelbrot Binarization     \
-            Compact FlutterBinarize Curve Zoom Julia Reduce                \
-            ConnectRegionNew Multidecrease DiffPattern CurveFluctuPropers  \
-            CurveFluctuation SuperSmooth ThresholdSegmentation             \
-            DynamicArrays Graph LearningFilter FillCoor RegionGrow         \
-            CurveTracing GaussianElimination PriFeatureCheckC              \
-            HistogramDifference CurveTopology ICcircleRadii                \
-            GaussianSmoothImage GaussianSmoothxy DouglasPeucker SalientImg \
-            LocalHistogramEqualization OtsuForThree ClusterLocalGray       \
-            ContourMatch CovarianceMatrix InscribedCircle EdgeDetection    \
-            GeoPrimaryProperties OperationFunctor CombineImage             \
-            ConsolidateAndIdentifyContours ImageFilter CurveConverter      \
-            FillCurve SimpleBrightnessGradient MultiConnectRegion 
+ALGNAMES := Image AffineTrans
 
 INCFILES := ErrorCode.h $(addsuffix .h, $(ALGNAMES))
 OBJFILES := main.o $(addsuffix .o, $(ALGNAMES))