-Wオプションを追加.それに合わせて生じたエラー潰し.

diff --git a/src/OMakefile b/src/OMakefile
index 49141d2..150ead5 100644 (file)
--- a/src/OMakefile
+++ b/src/OMakefile
@@ -30,7 +30,7 @@
 # If so, define the subdirectory targets and uncomment this section.
 #
 
-CXXFLAGS = -Wall -g $(shell pkg-config --cflags opencv)
+CXXFLAGS = -Wall -W -g $(shell pkg-config --cflags opencv)
 LDFLAGS = $(shell pkg-config --libs opencv)
 .SUBDIRS: cpp test
 

diff --git a/src/test/detect_parameter.cpp b/src/test/detect_parameter.cpp
index abed7d7..e720afa 100644 (file)
--- a/src/test/detect_parameter.cpp
+++ b/src/test/detect_parameter.cpp
@@ -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.
+// detect_parameter.cpp
+// このプログラムは与えられたファイルから数値をパースし、
+// カメラの内部、外部パラメータを推定します。
 
 #include "../cpp/pdcamera.cpp"
 #include <stdio.h>
@@ -47,7 +37,7 @@ void load_cc_file(const char* filename, double* uv, double* xyz, int* num) {
   fclose(fp);
 }
 
-int main(int argc, char* argv[]) {
+int main() {
   double *uv  = new double[MAX_POINTS];
   double *xyz = new double[MAX_POINTS];
   int num = 0;

diff --git a/src/test/load_tga.cpp b/src/test/load_tga.cpp
index 27bf0f1..1e74ea1 100644 (file)
--- a/src/test/load_tga.cpp
+++ b/src/test/load_tga.cpp
@@ -1,18 +1,8 @@
 // Copyright (C) 2009 Masaki Saito <rezoolab@gmail.com>\r
 //\r
-// This program is free software; you can redistribute it and/or\r
-// modify it under the terms of the GNU General Public License\r
-// as published by the Free Software Foundation; either version 2\r
-// of the License, or (at your option) any later version.\r
-//\r
-// This program is distributed in the hope that it will be useful,\r
-// but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-// GNU General Public License for more details.\r
-//\r
-// You should have received a copy of the GNU General Public License\r
-// along with this program; if not, write to the Free Software\r
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\r
+// load_tga.cpp
+// ¤³¤Î¥×¥í¥°¥é¥à¤ÏÈ󰵽̡¢°µ½Ìtga¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¡¢
+// Àµ¾ï¤ËÆɤ߹þ¤á¤ë¤«¤É¤¦¤«¤ò³Îǧ¤·¤Þ¤¹¡£\r
 \r
 #include "../cpp/pdutility.cpp"\r
 #include <iostream>\r
@@ -21,7 +11,7 @@
 \r
 using namespace std;\r
 \r
-int main(int argc, char* argv[]) {\r
+int main() {\r
   IplImage* src1 = pd::loadTGAImage("logo.tga");
   IplImage* src2 = pd::loadTGAImage("logo_RLE.tga");