Changeset 32745

Timestamp:

04/23/09 13:02:10 (4 years ago)

Author:

schima

Message:

minor updates

Location:

lang/cpluspluscli/OpenCvSharp2/trunk

Files:

• OpenCvSharp.Blob/CvBlobs.h (modified) (7 diffs)
• OpenCvSharp.Extern/OpenCvSharp.Extern.vcproj (modified) (2 diffs)
• OpenCvSharp/Src/Enum/StereoRectificationFlag.cs (modified) (2 diffs)

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Blob/CvBlobs.h

@@ -144 +144 @@
                         { 
                                 int size = ptr->size();
-                                array<CvBlob^>^ keys = gcnew array<CvBlob^>(size);
+                                array<CvBlob^>^ values = gcnew array<CvBlob^>(size);
                                 int i = 0;
                                 for (__CvBlobs::iterator it = ptr->begin(); it != ptr->end(); it++, i++)
                                 {
-                                        keys[i] = gcnew CvBlob(it->second);
-                                }
-                                return safe_cast<ICollection<CvBlob^>^>(keys);
+                                        values[i] = gcnew CvBlob(it->second);
+                                }
+                                return safe_cast<ICollection<CvBlob^>^>(values);
                         }
         }
@@ -266 +266 @@
         #pragma endregion
         #pragma region IEnumerator<KeyValuePair<CvLabel,CvBlob^>> Members
-                /// <summary>
-        /// 
-        /// </summary>
+#ifdef LANG_JP
+                /// <summary>
+        /// コレクションを反復処理する列挙子を返します。
+        /// </summary>
+#else
+                /// <summary>
+        /// Returns an enumerator that iterates through a collection. 
+        /// </summary>
+#endif
                 virtual IEnumerator<KeyValuePair<CvLabel, CvBlob^>>^ GetEnumerator() = IEnumerable<KeyValuePair<CvLabel, CvBlob^>>::GetEnumerator
         {
@@ -274 +280 @@
         }       
         protected:
-                /// <summary>
-        /// 
-        /// </summary>
+#ifdef LANG_JP
+                /// <summary>
+        /// コレクションを反復処理する列挙子を返します。
+        /// </summary>
+#else
+                /// <summary>
+        /// Returns an enumerator that iterates through a collection. 
+        /// </summary>
+#endif
                 virtual System::Collections::IEnumerator^ GetEnumeratorNonGeneric() = System::Collections::IEnumerable::GetEnumerator
         {
@@ -315 +327 @@
 
                 public:
+#ifdef LANG_JP
+                        /// <summary>
+                        /// コレクション内の現在の要素を取得します。
+                        /// </summary>
+#else
                         /// <summary>
                         /// Gets the element in the collection at the current position of the enumerator.
                         /// </summary>
+#endif
                         virtual property KeyValuePair<CvLabel, CvBlob^> Current
                         {
@@ -327 +345 @@
                                 }
                         }
+#ifdef LANG_JP
+                        /// <summary>
+                        /// コレクション内の現在の要素を取得します。
+                        /// </summary>
+#else
                         /// <summary>
                         /// Gets the current element in the collection.
                         /// </summary>
+#endif
                         virtual property Object^ CurrentObject
                         {
@@ -337 +361 @@
                                 }
                         }
+#ifdef LANG_JP
+                        /// <summary>
+                        /// 列挙子をコレクションの次の要素に進めます。
+                        /// </summary>
+#else
                         /// <summary>
                         /// Advances the enumerator to the next element of the collection.
                         /// </summary>
+#endif
                         virtual Boolean MoveNext() = System::Collections::IEnumerator::MoveNext
                         {
@@ -345 +375 @@
                                 return data->it != data->map->end();
                         }
-                        /// <summary>
-                        /// Sets the enumerator to its initial position, which is before the first element
-                        /// in the collection.
-                        /// </summary>
+#ifdef LANG_JP
+                        /// <summary>
+                        /// 列挙子を初期位置、つまりコレクションの最初の要素の前に設定します。 
+                        /// </summary>
+#else
+                        /// <summary>
+                        /// Sets the enumerator to its initial position, which is before the first element in the collection.
+                        /// </summary>
+#endif
                         virtual void Reset() = System::Collections::IEnumerator::Reset
                         {

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Extern/OpenCvSharp.Extern.vcproj

@@ -645 +645 @@
                                 >
                         </File>
-                        <File
-                                RelativePath=".\WCvHaarFeature.h"
-                                >
-                        </File>
                         <Filter
                                 Name="Class"
@@ -690 +686 @@
                                 <File
                                         RelativePath=".\WCvHaarClassifierCascade.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath=".\WCvHaarFeature.h"
                                         >
                                 </File>

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Src/Enum/StereoRectificationFlag.cs

@@ -20 +20 @@
 #if LANG_JP
                 /// <summary>
-        /// フラグなし (0).
+        /// フラグなし (=0).
         /// 利用できる画像領域が最大になるように（エピポーラ線の傾きに従って）片方の画像を水平・垂直方向に移動する.
                 /// </summary>
 #else
         /// <summary>
-        /// = 0.
+        /// Default value (=0).
         /// the function can shift one of the image in horizontal or vertical direction (depending on the orientation of epipolar lines) in order to maximise the useful image area. 
         /// </summary>
@@ -34 +34 @@
 #if LANG_JP
                 /// <summary>
-        ///  平行化後のビューにおいて各カメラの主点（光学中心）が同じ座標になるようにする． 
-        
+        /// 平行化後のビューにおいて各カメラの主点（光学中心）が同じ座標になるようにする． 
         /// [CV_CALIB_ZERO_DISPARITY]
                 /// </summary>