Changeset 20858

Timestamp:

10/06/08 23:09:47 (3 months ago)

Author:

schima

Message:

二値化のNiblackの手法とSauvolaの手法を独自に実装。（かなり微妙、遅い）

Location:

lang/cpluspluscli/OpenCvSharp/trunk/OpenCvSharp

Files:

• Extras.cpp (added)
• Extras.h (added)
• OpenCvSharp.vcproj (modified) (2 diffs)
• WriteableBitmapConverter.cpp (modified) (3 diffs)

lang/cpluspluscli/OpenCvSharp/trunk/OpenCvSharp/OpenCvSharp.vcproj

@@ -208 +208 @@
                         </File>
                         <File
+                                RelativePath=".\Extras.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\OpenCV.cpp"
                                 >
@@ -426 +430 @@
                         >
                         <File
+                                RelativePath=".\Extras.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\ICvObject.h"
                                 >

lang/cpluspluscli/OpenCvSharp/trunk/OpenCvSharp/WriteableBitmapConverter.cpp

@@ -49 +49 @@
         }
                 N::IplImage^ ipl = OpenCV::cvCreateImage(N::CvSize(w, h), (BitDepth)depth, channels);
+                byte* p = (byte*)(void*)ipl->ImageData;
+                
 
-        // bpp1�͎��ƂŃR�s�[
+        // 1bpp�͎��ƂŃR�s�[
         if (bpp == 1) {
             // BitmapImage�̃f�[�^���R�s�[
-            // �v�f1�‚ɉ�8�s�N�Z�����̃f�[�^�������
-            int stride = (w / 8) + 1;
-            array<Byte>^ pixels = gcnew array<Byte>(h * stride);
-            src->CopyPixels(pixels, stride, 0);
-            byte* p = (byte*)(void*)ipl->ImageData;
+            // �v�f1�‚ɉ�8�s�N�Z�����̃f�[�^�������   
+                        int stride = (w / 8) + 1;
+                        array<Byte>^ pixels = gcnew array<Byte>(h * stride);
+                        src->CopyPixels(pixels, stride, 0);
             int offset = 0;
             int x = 0;
@@ -86 +87 @@
                 x = 0;
             }
-
+                // 8bpp
+                } else if(bpp == 8){
+                        int stride = w;
+                        array<Byte>^ pixels = gcnew array<Byte>(h * stride);
+                        src->CopyPixels(pixels, stride, 0);
+                        for (int y=0; y<h; y++) {
+                                for(int x=0; x<w; x++){
+                                        p[ipl->WidthStep * y + x] = pixels[y * stride + x];
+                                }
+            }
         } else {
             int stride = w * ((bpp + 7) / 8);
@@ -164 +174 @@
             }
             dst->WritePixels(Int32Rect(0, 0, w, h), pixels, stride, 0);
-        } else {
+
+                /*} else if(bpp == 8){
+                        int stride = w;
+                        array<Byte>^ pixels = gcnew array<Byte>(h * stride);
+            byte* p = (byte*)(void*)src->ImageData;
+                        for (int y=0; y<h; y++) {
+                                for(int x=0; x<w; x++){
+                                        pixels[y * stride + x] = p[src->WidthStep * y + x];
+                                }
+            }
+                        dst->WritePixels(Int32Rect(0, 0, w, h), pixels, stride, 0);
+
+        */} else {
             dst->WritePixels(Int32Rect(0, 0, w, h), src->ImageData, src->ImageSize, src->WidthStep);
         }