Changeset 32042 for lang/cpluspluscli

Timestamp:

04/07/09 09:51:23 (4 years ago)

Author:

schima

Message:

added comments in English (CvColor?, BitDepth?, LoadMode?)

Location:

lang/cpluspluscli/OpenCvSharp2/trunk

Files:

• OpenCvSharp.Test/Samples/ContourScanner.cs (modified) (1 diff)
• OpenCvSharp/Enum/BitDepth.cs (modified) (1 diff)
• OpenCvSharp/Enum/LoadMode.cs (modified) (1 diff)
• OpenCvSharp/Struct/CvColor.cs (modified) (3 diffs)

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Test/Samples/ContourScanner.cs

@@ -28 +28 @@
                     // find contours by CvContourScanner
                     CvContourScanner scanner = Cv.StartFindContours(canny, storage, CvContour<CvPoint>.SizeOf, ContourRetrieval.Tree, ContourChain.ApproxSimple);
-                    //CvContourScanner scanner = new CvContourScanner(canny, new CvMemStorage(), CvContour<CvPoint>.SizeOf, ContourRetrieval.Tree, ContourChain.ApproxSimple);
+                    //CvContourScanner scanner = new CvContourScanner(canny, storage, CvContour<CvPoint>.SizeOf, ContourRetrieval.Tree, ContourChain.ApproxSimple);
                     while (true)
                     {

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Enum/BitDepth.cs

@@ -7 +7 @@
 namespace KwsmLab.OpenCvSharp
 {
+#if LANG_JP
     /// <summary>
         /// 画像要素のビットデプス.
         /// </summary>
+#else
+    /// <summary>
+    /// Bit depth of image elements
+    /// </summary>
+#endif
         public enum BitDepth : int
         {
+#if LANG_JP
                 /// <summary>
                 /// 符号無し 1 ビット整数 [IPL_DEPTH_1U]
                 /// </summary>
+#else
+        /// <summary>
+        /// unsigned 1-bit integers [IPL_DEPTH_1U]
+        /// </summary>
+#endif
                 [Obsolete("", true)] U1 = CvConst.IPL_DEPTH_1U_, 
+
+
+#if LANG_JP
                 /// <summary>
                 /// 符号無し 8 ビット整数 [IPL_DEPTH_8U]
                 /// </summary>
+#else
+        /// <summary>
+        /// unsigned 8-bit integers [IPL_DEPTH_8U]
+        /// </summary>
+#endif
                 U8 = CvConst.IPL_DEPTH_8U_,
+
+
+#if LANG_JP
                 /// <summary>
                 /// 符号あり 8 ビット整数 [IPL_DEPTH_8S]
                 /// </summary>
+#else
+        /// <summary>
+        /// signed 8-bit integers [IPL_DEPTH_8S]
+        /// </summary>
+#endif
                 S8 = CvConst.IPL_DEPTH_8S_,
+
+
+#if LANG_JP
                 /// <summary>
                 /// 符号無し 16 ビット整数 [IPL_DEPTH_16U]
                 /// </summary>
+#else
+        /// <summary>
+        /// unsigned 16-bit integers [IPL_DEPTH_16U]
+        /// </summary>
+#endif
                 U16 = CvConst.IPL_DEPTH_16U_,
+
+
+#if LANG_JP
                 /// <summary>
                 /// 符号あり 16 ビット整数 [IPL_DEPTH_16S]
                 /// </summary>
+#else
+        /// <summary>
+        /// signed 16-bit integers [IPL_DEPTH_16S]
+        /// </summary>
+#endif
                 S16 = CvConst.IPL_DEPTH_16S_,
+
+
+#if LANG_JP
                 /// <summary>
                 /// 符号あり 32 ビット整数 [IPL_DEPTH_32S]
                 /// </summary>
+#else
+        /// <summary>
+        /// signed 32-bit integers [IPL_DEPTH_32S]
+        /// </summary>
+#endif
                 S32 = CvConst.IPL_DEPTH_32S_,
+
+
+#if LANG_JP
                 /// <summary>
                 /// 単精度浮動小数点数 [IPL_DEPTH_32F]
                 /// </summary>
+#else
+        /// <summary>
+        /// single precision floating-point numbers [IPL_DEPTH_32F]
+        /// </summary>
+#endif
                 F32 = CvConst.IPL_DEPTH_32F_,
+
+
+#if LANG_JP
                 /// <summary>
                 /// 倍精度浮動小数点数 [IPL_DEPTH_64F]
                 /// </summary>
-                F64 = CvConst.IPL_DEPTH_64F_,
+#else
+        /// <summary>
+        /// double precision floating-point numbers [IPL_DEPTH_64F]
+        /// </summary>
+#endif
+        F64 = CvConst.IPL_DEPTH_64F_,
     }
 }

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Enum/LoadMode.cs

@@ -7 +7 @@
 namespace KwsmLab.OpenCvSharp
 {
+#if LANG_JP
     /// <summary>
-        /// 読み込む画像がカラー/グレースケールのどちらか，とデプスを指定する． 
-        /// カラー/グレースケールの指定は，読み込まれた画像を 3 チャンネル（Color）に変換するか， 
-        /// 1チャンネル（GrayScale）に変換するか，あるいは入力画像（AnyColor）のままにしておくかを決める．
+    /// cvLoadImageで用いる読み込みフラグ ．
         /// </summary>
+#else
+    /// <summary>
+    /// Specifies colorness and depth of the loaded image
+    /// </summary>
+#endif
         [Flags]
         public enum LoadMode : int
         {
+        #if LANG_JP
                 /// <summary>
                 /// 8 ビット，カラーまたはグレースケール [CV_LOAD_IMAGE_UNCHANGED]
                 /// </summary>
-                [Obsolete("将来廃止される予定なので，AnyColor を使用すること")] 
+        [Obsolete("将来廃止される予定なので，AnyColor を使用すること")] 
+#else
+        /// <summary>
+        /// 8 bit, color or gray [CV_LOAD_IMAGE_UNCHANGED]
+        /// </summary>
+        [Obsolete("deprecated, use AnyColor")] 
+#endif          
         Unchanged = CvConst.CV_LOAD_IMAGE_UNCHANGED_,
+
+
+#if LANG_JP
                 /// <summary>
                 /// 8 ビット，グレースケール [CV_LOAD_IMAGE_GRAYSCALE]
                 /// </summary>
+#else
+        /// <summary>
+        /// 8 bit, gray [CV_LOAD_IMAGE_GRAYSCALE]
+        /// </summary>
+#endif
                 GrayScale = CvConst.CV_LOAD_IMAGE_GRAYSCALE_,
+
+
+#if LANG_JP
                 /// <summary>
                 /// AnyDepth と併用されない限り 8 ビット，カラー [CV_LOAD_IMAGE_COLOR]
                 /// </summary>
+#else
+        /// <summary>
+        /// 8 bit unless combined with AnyDepth, color [CV_LOAD_IMAGE_COLOR]
+        /// </summary>
+#endif
                 Color = CvConst.CV_LOAD_IMAGE_COLOR_,
+
+
+#if LANG_JP
                 /// <summary>
                 ///任意のデプス，グレー [CV_LOAD_IMAGE_ANYDEPTH]
                 /// </summary>
+#else
+        /// <summary>
+        /// any depth, if specified on its own gray [CV_LOAD_IMAGE_ANYDEPTH]
+        /// </summary>
+#endif
                 AnyDepth = CvConst.CV_LOAD_IMAGE_ANYDEPTH_,
+
+
+        #if LANG_JP
                 /// <summary>
                 /// 8 ビット，カラーまたはグレースケール [CV_LOAD_IMAGE_ANYCOLOR]. 
                 /// AnyDepth と併用可能.
                 /// </summary>
-                AnyColor = CvConst.CV_LOAD_IMAGE_ANYCOLOR_
+#else
+        /// <summary>
+        /// by itself equivalent to Unchanged but can be modified with AnyDepth [CV_LOAD_IMAGE_ANYCOLOR]
+        /// </summary>
+#endif
+        AnyColor = CvConst.CV_LOAD_IMAGE_ANYCOLOR_
         };
 }

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Struct/CvColor.cs

@@ -7 +7 @@
 namespace KwsmLab.OpenCvSharp
 {
+#if LANG_JP
     /// <summary>
         /// 色をあらわす構造体.
         /// OpenCVのCvScalarや、System.Drawing.Colorとの暗黙の変換が定義されている.
         /// </summary>
+#else
+    /// <summary>
+    /// An alias of CvScalar.
+    /// A structure which represents RGB color.
+    /// </summary>
+#endif
     [Serializable]
     [StructLayout(LayoutKind.Sequential)]
     public struct CvColor : IEquatable<CvColor>
     {
+#if LANG_JP
         /// <summary>
         /// R成分
         /// </summary>
+#else
+        /// <summary>
+        /// Red
+        /// </summary>
+#endif
         public byte R;
+
+#if LANG_JP
         /// <summary>
         /// G成分
         /// </summary>
+#else
+        /// <summary>
+        /// Green
+        /// </summary>
+#endif
         public byte G;
+        
+#if LANG_JP
         /// <summary>
         /// B成分
         /// </summary>
+#else
+        /// <summary>
+        /// Blue
+        /// </summary>
+#endif
         public byte B;
 
+
+
+#if LANG_JP
         /// <summary>
         /// 初期化 
@@ -34 +64 @@
         /// <param name="g">G成分</param>
         /// <param name="b">B成分</param>
+#else
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="r">Red</param>
+        /// <param name="g">Green</param>
+        /// <param name="b">Blue</param>
+#endif
         public CvColor(byte r, byte g, byte b)
         {
@@ -40 +78 @@
             this.B = b;
         }
+
+#if LANG_JP
         /// <summary>
         /// ランダムな色を生成して返す
         /// </summary>
         /// <returns></returns>
+#else
+        /// <summary>
+        /// Creates random color
+        /// </summary>
+        /// <returns></returns>
+#endif
         public static CvColor Random()
         {