より分かりやすくなるようにコメントを充実させた.

diff --git a/src/cpp/pdcamera.cpp b/src/cpp/pdcamera.cpp
index fbe93a6..ce21e0f 100644 (file)
--- a/src/cpp/pdcamera.cpp
+++ b/src/cpp/pdcamera.cpp
@@ -1,18 +1,7 @@
 // Copyright (C) 2009 Masaki Saito <rezoolab@gmail.com>
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+// pd::Camera
+// ¤³¤Î¥¯¥é¥¹¤Ï¥«¥á¥é¤ÎÆâÉô¡¢µÚ¤Ó³°Éô¥Ñ¥é¥á¡¼¥¿¤ò¿äÄꤷ¤Þ¤¹¡£
 
 #include "pdcamera.h"
 

diff --git a/src/cpp/pdcamera.h b/src/cpp/pdcamera.h
index 67fd78d..bc11a24 100644 (file)
--- a/src/cpp/pdcamera.h
+++ b/src/cpp/pdcamera.h
@@ -1,18 +1,8 @@
 // Copyright (C) 2009 Masaki Saito <rezoolab@gmail.com>
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+// pd::Camera
+// ¤³¤Î¥¯¥é¥¹¤Ï¥«¥á¥é¤ÎÆâÉô¡¢µÚ¤Ó³°Éô¥Ñ¥é¥á¡¼¥¿¤ò¿äÄꤷ¤Þ¤¹¡£
+
 #ifndef PD_CAMERA_INCLUDED
 #define PD_CAMERA_INCLUDED
 
@@ -45,6 +35,8 @@ class Camera {
     Camera(int scrx, int scry, double aspectRatio);
     virtual ~Camera();
     
+    //Í¿¤¨¤é¤ì¤¿uvºÂɸ¤Èxyz¶õ´Ö¤Ë¤è¤Ã¤Æ¡¢
+    //¥«¥á¥é¤ÎÆâÉô¥Ñ¥é¥á¡¼¥¿¡¢µÚ¤Ó³°Éô¥Ñ¥é¥á¡¼¥¿¤ò¿äÄꤷ¤Þ¤¹¡£
     void detectParameters(double* uv, double* xyz, int num);
   protected:
     CvMat* _makeUVMatrix(double* uv, int num);

diff --git a/src/cpp/pdestimator.cpp b/src/cpp/pdestimator.cpp
index 197311d..df8b42a 100644 (file)
--- a/src/cpp/pdestimator.cpp
+++ b/src/cpp/pdestimator.cpp
@@ -1,20 +1,9 @@
 // Copyright (C) 2009 Masaki Saito <rezoolab@gmail.com>
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+// pd::Estimator
+// このクラスは与えられたカメラ群のuv座標からワールド座標を推定します。
 
-#include "./pdestimator.h"
+#include "pdestimator.h"
 
 namespace pd {
 

diff --git a/src/cpp/pdestimator.h b/src/cpp/pdestimator.h
index fd85927..373be8e 100644 (file)
--- a/src/cpp/pdestimator.h
+++ b/src/cpp/pdestimator.h
@@ -1,18 +1,8 @@
 // Copyright (C) 2009 Masaki Saito <rezoolab@gmail.com>
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+// pd::Estimator
+// ¤³¤Î¥¯¥é¥¹¤ÏÍ¿¤¨¤é¤ì¤¿¥«¥á¥é·²¤ÎuvºÂɸ¤«¤é¥ï¡¼¥ë¥ÉºÂɸ¤ò¿äÄꤷ¤Þ¤¹¡£
+
 #ifndef PD_ESTIMATOR_INCLUDED
 #define PD_ESTIMATOR_INCLUDED
 

diff --git a/src/cpp/pdtracker.cpp b/src/cpp/pdtracker.cpp
index 1bac87d..d39f072 100644 (file)
--- a/src/cpp/pdtracker.cpp
+++ b/src/cpp/pdtracker.cpp
@@ -1,18 +1,7 @@
 // Copyright (C) 2009 Masaki Saito <rezoolab@gmail.com>
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+// pd::Tracker
+// このクラスはカメラに移ってあるポイントを追跡し、uv座標の点として保持します。
 
 #include "pdtracker.h"
 

diff --git a/src/cpp/pdtracker.h b/src/cpp/pdtracker.h
index 1491984..1e29609 100644 (file)
--- a/src/cpp/pdtracker.h
+++ b/src/cpp/pdtracker.h
@@ -1,18 +1,8 @@
 // Copyright (C) 2009 Masaki Saito <rezoolab@gmail.com>
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+// pd::Tracker
+// ¤³¤Î¥¯¥é¥¹¤Ï¥«¥á¥é¤Ë°Ü¤Ã¤Æ¤¢¤ë¥Ý¥¤¥ó¥È¤òÄÉÀפ·¡¢uvºÂɸ¤ÎÅÀ¤È¤·¤ÆÊÝ»ý¤·¤Þ¤¹¡£
+
 #ifndef PD_TRACKER_INCLUDED
 #define PD_TRACKER_INCLUDED
 

diff --git a/src/cpp/pdutility.cpp b/src/cpp/pdutility.cpp
index 7e81ab5..7fd6d54 100644 (file)
--- a/src/cpp/pdutility.cpp
+++ b/src/cpp/pdutility.cpp
@@ -1,18 +1,7 @@
 // Copyright (C) 2009 Masaki Saito <rezoolab@gmail.com>
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+// pd::Utility
+// \82»\82ê\82¼\82ê\82Ì\83N\83\89\83X\82Ì\96ð\8a\84\82É\82Í\93\96\82Ä\82Í\82Ü\82ç\82È\82¢\82ª\81A\95K\97v\82Æ\82È\82é\8aÖ\90\94\8cQ\82ð\97ñ\8b\93\82µ\82Ü\82·\81B
 
 #include "pdutility.h"
 #include <cv.h>

diff --git a/src/cpp/pdutility.h b/src/cpp/pdutility.h
index a611ae0..f127aaf 100644 (file)
--- a/src/cpp/pdutility.h
+++ b/src/cpp/pdutility.h
@@ -1,18 +1,8 @@
 // Copyright (C) 2009 Masaki Saito <rezoolab@gmail.com>
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+// pd::Utility
+// ¤½¤ì¤¾¤ì¤Î¥¯¥é¥¹¤ÎÌò³ä¤Ë¤ÏÅö¤Æ¤Ï¤Þ¤é¤Ê¤¤¤¬¡¢É¬ÍפȤʤë´Ø¿ô·²¤òÎóµó¤·¤Þ¤¹¡£
+
 #ifndef PD_UTILITY_INCLUDED
 #define PD_UTILITY_INCLUDED
 

diff --git a/src/cpp/pdvideo.cpp b/src/cpp/pdvideo.cpp
index c49cb63..c256aaf 100644 (file)
--- a/src/cpp/pdvideo.cpp
+++ b/src/cpp/pdvideo.cpp
@@ -1,18 +1,7 @@
 // Copyright (C) 2009 Masaki Saito <rezoolab@gmail.com>
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+// pd::Video
+// ¤³¤Î¥¯¥é¥¹¤Ï¥Ó¥Ç¥ª¥Õ¥¡¥¤¥ë¤äÏ¢ÈÖ¥Õ¥¡¥¤¥ë¤òÊñ³çŪ¤Ë´ÉÍý¤·¤Þ¤¹¡£
 
 #include "pdvideo.h"
 

diff --git a/src/cpp/pdvideo.h b/src/cpp/pdvideo.h
index d794eb1..824d2cc 100644 (file)
--- a/src/cpp/pdvideo.h
+++ b/src/cpp/pdvideo.h
@@ -1,18 +1,8 @@
 // Copyright (C) 2009 Masaki Saito <rezoolab@gmail.com>
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+// pd::Video
+// ¤³¤Î¥¯¥é¥¹¤Ï¥Ó¥Ç¥ª¥Õ¥¡¥¤¥ë¤äÏ¢ÈÖ¥Õ¥¡¥¤¥ë¤òÊñ³çŪ¤Ë´ÉÍý¤·¤Þ¤¹¡£
+
 #ifndef PD_VIDEO_INCLUDED
 #define PD_VIDEO_INCLUDED