Changeset 20894

Timestamp:

10/07/08 14:10:50 (2 months ago)

Author:

schima

Message:

Niblack, Sauvolaの手法を3,4倍ほど高速化。

Location:

lang/cpluspluscli/OpenCvSharp/trunk/OpenCvSharp

Files:

• CvArr.cpp (modified) (1 diff)
• CvArr.h (modified) (1 diff)
• Extras.cpp (modified) (3 diffs)
• Extras.h (modified) (1 diff)
• OpenCV.cpp (modified) (1 diff)
• OpenCV.h (modified) (1 diff)

lang/cpluspluscli/OpenCvSharp/trunk/OpenCvSharp/CvArr.cpp

@@ -395 +395 @@
         }
         #pragma endregion 
+        #pragma region EqualizeHist
+        /// <summary>
+        /// インプレースモード(src = dst)でグレースケール画像のヒストグラムを均一化する (cvEqualizeHist相当)．
+        /// 輝度を均一化し，画像のコントラストを上げる．
+        /// </summary>
+        void CvArr::EqualizeHist( void )
+        {
+                OpenCV::cvEqualizeHist(this, this);
+        }
+        /// <summary>
+        /// グレースケール画像のヒストグラムを均一化する (cvEqualizeHist相当)．]
+        /// 輝度を均一化し，画像のコントラストを上げる．
+        /// </summary>
+        /// <param name="dst">出力画像．srcと同じサイズ, 同じデータタイプ．</param>
+        void CvArr::EqualizeHist( N::CvArr^ dst )
+        {
+                OpenCV::cvEqualizeHist(this, dst);
+        }
+        #pragma endregion
         #pragma region FillConvexPoly
         /// <summary>

lang/cpluspluscli/OpenCvSharp/trunk/OpenCvSharp/CvArr.h

@@ -229 +229 @@
                 virtual void Ellipse( N::CvPoint center, N::CvSize axes, Double angle, Double start_angle, Double end_angle, CvColor color, Int32 thickness, LineType line_type );
                 virtual void Ellipse( N::CvPoint center, N::CvSize axes, Double angle, Double start_angle, Double end_angle, CvColor color, Int32 thickness, LineType line_type, Int32 shift );
+                virtual void EqualizeHist( void );
+                virtual void EqualizeHist( N::CvArr^ dst );
                 virtual void FillConvexPoly( array<N::CvPoint>^ pts, N::CvColor color );
                 virtual void FillConvexPoly( array<N::CvPoint>^ pts, N::CvColor color, LineType line_type );

lang/cpluspluscli/OpenCvSharp/trunk/OpenCvSharp/Extras.cpp

@@ -40 +40 @@
                 }
 
-                dst->Zero();
+                N::IplImage^ gray = src->Clone();
+                gray->EqualizeHist();
+
                 Byte* p = dst->ImageDataPtr;
-                for (int y = 0; y < src->Height; y++) {
-                        for (int x = 0; x < src->Width; x++) {
-                                double m = Mean(src, x, y, size);
-                                double s = StdDev(src, x, y, size, m);
-                                if(Math::Abs(s) > 0.1){
-                                        s = s;
-                                }
+                double m, s;
+
+                for (int y = 0; y < gray->Height; y++) {
+                        for (int x = 0; x < gray->Width; x++) {
+                                MeanStddev(gray, x, y, size, &m, &s);
                                 int offset = (dst->WidthStep * y) + x;
                                 p[offset] = (Byte)(m + k*s);
@@ -85 +85 @@
                 }
 
-                dst->Zero();
+                N::IplImage^ gray = src->Clone();
+                gray->EqualizeHist();
+
                 Byte* p = dst->ImageDataPtr;
-                for (int y = 0; y < src->Height; y++) {
-                        for (int x = 0; x < src->Width; x++) {
-                                double m = Mean(src, x, y, size);
-                                double s = StdDev(src, x, y, size, m);
+                double m, s;
+                int offset;
 
-                                int offset = (dst->WidthStep * y) + x;
+                for (int y = 0; y < gray->Height; y++) {
+                        for (int x = 0; x < gray->Width; x++) {
+                                MeanStddev(gray, x, y, size, &m, &s);
+                                offset = (dst->WidthStep * y) + x;
                                 p[offset] = (Byte)(m + (1 + k*(s/r - 1)));
                         }
@@ -99 +102 @@
 
         /// <summary>
-        /// ���ډ��̎�f�̕��ϒl��߂� /// </summary>
-        Double Extras::Mean(N::IplImage^ img, Int32 x, Int32 y, Int32 size)
+        /// ���ډ��̎�f�̕��ϒl�ƕW���΍���߂� /// </summary>
+        /// <param name="r">�W��</param>
+        void Extras::MeanStddev(N::IplImage^ img, Int32 x, Int32 y, Int32 size, Double* mean, Double* stddev)
         {
                 int count = 0;
-                int init_x = x - size + (size/2+1);
-                int init_y = y - size + (size/2+1);
                 int sum = 0;
+                int sum2 = 0;
                 Byte* p = img->ImageDataPtr;
+                int xxx, yyy;
+                int size2 = size / 2;
+                int widthStep = img->Width;
+                Byte v;
 
                 for(int xx = 0; xx<size; xx++){
                         for(int yy = 0; yy<size; yy++){
-                                int xxx = x + xx - size/2;
-                                int yyy = y + yy - size/2;
+                                xxx = x + xx - size2;
+                                yyy = y + yy - size2;
                                 if(xxx < 0 || xxx >= img->Width || yyy < 0 || yyy >= img->Height){
                                         continue;
                                 }
-                                sum += p[img->WidthStep * yyy + xxx];
+                                v = p[widthStep * yyy + xxx];
+                                sum += v;
+                                sum2 += v * v;
                                 count++;
                         }
                 }
-
-                return (double)sum / count;
-        }
-
-        /// <summary>
-        /// ���ډ��̎�f�̕W���΍���߂�       /// </summary>
-        Double Extras::StdDev(N::IplImage^ img, Int32 x, Int32 y, Int32 size, Double mean)
-        {
-                int count = 0;
-                int init_x = x - size + (size/2+1);
-                int init_y = y - size + (size/2+1);
-                double sum = 0;
-                Byte* p = img->ImageDataPtr;
-
-                for(int xx = 0; xx<size; xx++){
-                        for(int yy = 0; yy<size; yy++){
-                                int xxx = x + xx - size/2;
-                                int yyy = y + yy - size/2;
-                                if(xxx < 0 || xxx >= img->Width || yyy < 0 || yyy >= img->Height){
-                                        continue;
-                                }
-                                Byte v = p[img->WidthStep * yyy + xxx];
-                                sum += Math::Pow(v - mean, 2);
-                                count++;
-                        }
-                }
-                double variance = sum / count;
-                return Math::Sqrt(variance);
+                *mean = (double)sum / count;
+                double var = (double)sum2 / count - (*mean)*(*mean);
+                if(var < 0.0) var = 0.0;
+                *stddev = sqrt(var);
         }
 

lang/cpluspluscli/OpenCvSharp/trunk/OpenCvSharp/Extras.h

@@ -32 +32 @@
 
         private:
-                static Double Mean(N::IplImage^ img, Int32 x, Int32 y, Int32 size);
-                static Double StdDev(N::IplImage^ img, Int32 x, Int32 y, Int32 size, Double mean);
+                static void MeanStddev(N::IplImage^ img, Int32 x, Int32 y, Int32 size, Double* mean, Double* stddev);
         };
 

lang/cpluspluscli/OpenCvSharp/trunk/OpenCvSharp/OpenCV.cpp

@@ -2307 +2307 @@
                 CHECK_NULL(fs);
                 ::cvEndWriteStruct(fs->Ptr);
+        }
+        #pragma endregion 
+        #pragma region cvEqualizeHist
+        /// <summary>
+        /// グレースケール画像のヒストグラムを均一化する．輝度を均一化し，画像のコントラストを上げる．
+        /// </summary>
+        /// <param name="src">入力画像．８ビットシングルチャンネル． </param>
+        /// <param name="dst">出力画像．srcと同じサイズ, 同じデータタイプ．</param>
+        void OpenCV::cvEqualizeHist( N::CvArr^ src, N::CvArr^ dst )
+        {
+                CHECK_NULL(src);
+                CHECK_NULL(dst);
+                ::cvEqualizeHist(src->Ptr, dst->Ptr);
         }
         #pragma endregion 

lang/cpluspluscli/OpenCvSharp/trunk/OpenCvSharp/OpenCV.h

@@ -187 +187 @@
                 static void cvEllipse( N::CvArr^ img, N::CvPoint center, N::CvSize axes, Double angle, Double start_angle, Double end_angle, CvColor color, Int32 thickness, LineType line_type, Int32 shift );
                 static void cvEndWriteStruct( N::CvFileStorage^ fs );
+                static void cvEqualizeHist( N::CvArr^ src, N::CvArr^ dst );
                 static void     cvErode( N::CvArr^ src, N::CvArr^ dst );
                 static void     cvErode( N::CvArr^ src, N::CvArr^ dst, N::IplConvKernel^ element );