[Backup]NyARToolkit for Java

平行ベクトル計算器の修正
ライセンス文の修正とGPLｖ3の適応
2.4候補

diff --git a/LICENCE.txt b/LICENCE.txt
index a3330c1..576990b 100644 (file)
--- a/LICENCE.txt
+++ b/LICENCE.txt
@@ -1,10 +1,10 @@
 ARToolkit Java class library NyARToolkit.\r
-Copyright (C)2008 R.Iizuka\r
+Copyright (C)2008-2009 Ryo Iizuka\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
+This program is free software: you can redistribute it and/or modify\r
+it under the terms of the GNU General Public License as published by\r
+the Free Software Foundation, either version 3 of the License, or\r
+(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
@@ -12,24 +12,22 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\r
+along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+\r
 \r
  \r
 \r
 Java版 ARToolkit クラスライブラリ NyARToolkit\r
-Copyright (C)2008  R.Iizuka\r
-\r
-このプログラムはフリーソフトウェアです。あなたはこれを、フリーソフトウェ\r
-ア財団によって発行された GNU 一般公衆利用許諾契約書(バージョン2か、希\r
-望によってはそれ以降のバージョンのうちどれか)の定める条件の下で再頒布\r
-または改変することができます。\r
-\r
-このプログラムは有用であることを願って頒布されますが、*全くの無保証* \r
-です。商業可能性の保証や特定の目的への適合性は、言外に示されたものも含\r
-め全く存在しません。詳しくはGNU 一般公衆利用許諾契約書をご覧ください。\r
-     \r
-あなたはこのプログラムと共に、GNU 一般公衆利用許諾契約書の複製物を一部\r
-受け取ったはずです。もし受け取っていなければ、フリーソフトウェア財団ま\r
-で請求してください(宛先は the Free Software Foundation, Inc., 59\r
-Temple Place, Suite 330, Boston, MA 02111-1307 USA)。
\ No newline at end of file
+Copyright (C)2008-2009  Ryo Iizuka\r
+\r
+このプログラムはフリーソフトウェアです。あなたはこれを、フリーソフトウェア\r
+財団によって発行されたGNU 一般公衆利用許諾書(バージョン3か、それ以降のバー\r
+ジョンのうちどれか)が定める条件の下で再頒布または改変 することができます。\r
+\r
+このプログラムは有用であることを願って頒布されますが、*全くの無保証 *です。\r
+商業可能性の保証や特定目的への適合性は、言外に示されたものも 含め、全く存\r
+在しません。詳しくはGNU 一般公衆利用許諾書をご覧ください。\r
+\r
+あなたはこのプログラムと共に、GNU 一般公衆利用許諾書のコピーを一部受け取って\r
+いるはずです。もし受け取っていなければ、<http://www.gnu.org/licenses/> を\r
+ご覧ください。 
\ No newline at end of file

diff --git a/readme.ja.txt b/readme.ja.txt
index d4726e9..a4b6d29 100644 (file)
--- a/readme.ja.txt
+++ b/readme.ja.txt
@@ -31,7 +31,7 @@ http://www.hitl.washington.edu/artoolkit/
 \r
  -ARToolKitと同等な処理シーケンスを、クラスベースで再構築しています。\r
 \r
- -処理構造の最適化により、ARToolKitと比較して可読性に優れています。\r
+ -ARToolKitと比較して、処理構造が最適化されています。\r
 \r
  -ARToolKit互換モードと、NyARToolkit最適化モードを搭載しています。(Version/2.4.0より)\r
 　 \r

diff --git a/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARRaster_RGB.java b/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARRaster_RGB.java
index 8fb0573..0e1c29c 100644 (file)
--- a/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARRaster_RGB.java
+++ b/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARRaster_RGB.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java b/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java
index 01a40ea..ed5f733 100644 (file)
--- a/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java
+++ b/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/NyARException.java b/src/jp/nyatla/nyartoolkit/NyARException.java
index 0a72070..0391b51 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/NyARException.java
+++ b/src/jp/nyatla/nyartoolkit/NyARException.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/NyARCode.java b/src/jp/nyatla/nyartoolkit/core/NyARCode.java
index e784ee9..fc92b1d 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/NyARCode.java
+++ b/src/jp/nyatla/nyartoolkit/core/NyARCode.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/NyARMat.java b/src/jp/nyatla/nyartoolkit/core/NyARMat.java
index f6c6011..f264c8d 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/NyARMat.java
+++ b/src/jp/nyatla/nyartoolkit/core/NyARMat.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/NyARVec.java b/src/jp/nyatla/nyartoolkit/core/NyARVec.java
index db8b04b..1670668 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/NyARVec.java
+++ b/src/jp/nyatla/nyartoolkit/core/NyARVec.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/NyARVersion.java b/src/jp/nyatla/nyartoolkit/core/NyARVersion.java
index e500bff..cae97e2 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/NyARVersion.java
+++ b/src/jp/nyatla/nyartoolkit/core/NyARVersion.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/labeling/LabelOverlapChecker.java b/src/jp/nyatla/nyartoolkit/core/labeling/LabelOverlapChecker.java
index 3af2e9e..ecc7324 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/labeling/LabelOverlapChecker.java
+++ b/src/jp/nyatla/nyartoolkit/core/labeling/LabelOverlapChecker.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelInfo.java b/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelInfo.java
index bc51fce..ab72ce9 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelInfo.java
+++ b/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelInfo.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelInfoStack.java b/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelInfoStack.java
index 8e746c6..a32397a 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelInfoStack.java
+++ b/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelInfoStack.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/labeling/artoolkit/NyARLabelingImage.java b/src/jp/nyatla/nyartoolkit/core/labeling/artoolkit/NyARLabelingImage.java
index 377fca9..726f79b 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/labeling/artoolkit/NyARLabelingImage.java
+++ b/src/jp/nyatla/nyartoolkit/core/labeling/artoolkit/NyARLabelingImage.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/labeling/artoolkit/NyARLabelingLabel.java b/src/jp/nyatla/nyartoolkit/core/labeling/artoolkit/NyARLabelingLabel.java
index 0547633..3caa05c 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/labeling/artoolkit/NyARLabelingLabel.java
+++ b/src/jp/nyatla/nyartoolkit/core/labeling/artoolkit/NyARLabelingLabel.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/labeling/artoolkit/NyARLabelingLabelStack.java b/src/jp/nyatla/nyartoolkit/core/labeling/artoolkit/NyARLabelingLabelStack.java
index e01fe1d..8405b6a 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/labeling/artoolkit/NyARLabelingLabelStack.java
+++ b/src/jp/nyatla/nyartoolkit/core/labeling/artoolkit/NyARLabelingLabelStack.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/labeling/artoolkit/NyARLabeling_ARToolKit.java b/src/jp/nyatla/nyartoolkit/core/labeling/artoolkit/NyARLabeling_ARToolKit.java
index e0059d2..c11aa9e 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/labeling/artoolkit/NyARLabeling_ARToolKit.java
+++ b/src/jp/nyatla/nyartoolkit/core/labeling/artoolkit/NyARLabeling_ARToolKit.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/NyARLabeling_Rle.java b/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/NyARLabeling_Rle.java
index b198805..38689bf 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/NyARLabeling_Rle.java
+++ b/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/NyARLabeling_Rle.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/RleLabelFragmentInfoStack.java b/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/RleLabelFragmentInfoStack.java
index 57f5282..c11fbad 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/RleLabelFragmentInfoStack.java
+++ b/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/RleLabelFragmentInfoStack.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/match/INyARMatchPatt.java b/src/jp/nyatla/nyartoolkit/core/match/INyARMatchPatt.java
index 0b50fcf..1684f54 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/match/INyARMatchPatt.java
+++ b/src/jp/nyatla/nyartoolkit/core/match/INyARMatchPatt.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPattDeviationBlackWhiteData.java b/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPattDeviationBlackWhiteData.java
index 0596ebf..0edc28f 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPattDeviationBlackWhiteData.java
+++ b/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPattDeviationBlackWhiteData.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPattDeviationColorData.java b/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPattDeviationColorData.java
index 4fd8c62..3557ee6 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPattDeviationColorData.java
+++ b/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPattDeviationColorData.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPattResult.java b/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPattResult.java
index 9e3c49f..fe82622 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPattResult.java
+++ b/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPattResult.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_BlackWhite.java b/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_BlackWhite.java
index a53d194..5cdef1b 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_BlackWhite.java
+++ b/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_BlackWhite.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_Color_WITHOUT_PCA.java b/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_Color_WITHOUT_PCA.java
index 9939967..1e32b23 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_Color_WITHOUT_PCA.java
+++ b/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_Color_WITHOUT_PCA.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_Color_WITH_PCA.java b/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_Color_WITH_PCA.java
index 4705e81..c3bcf55 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_Color_WITH_PCA.java
+++ b/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_Color_WITH_PCA.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/param/INyARCameraDistortionFactor.java b/src/jp/nyatla/nyartoolkit/core/param/INyARCameraDistortionFactor.java
index b23e072..47dc2be 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/param/INyARCameraDistortionFactor.java
+++ b/src/jp/nyatla/nyartoolkit/core/param/INyARCameraDistortionFactor.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/param/NyARCameraDistortionFactor.java b/src/jp/nyatla/nyartoolkit/core/param/NyARCameraDistortionFactor.java
index 6508e68..e43a74d 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/param/NyARCameraDistortionFactor.java
+++ b/src/jp/nyatla/nyartoolkit/core/param/NyARCameraDistortionFactor.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/param/NyARObserv2IdealMap.java b/src/jp/nyatla/nyartoolkit/core/param/NyARObserv2IdealMap.java
index 4c1b8bb..ca46d72 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/param/NyARObserv2IdealMap.java
+++ b/src/jp/nyatla/nyartoolkit/core/param/NyARObserv2IdealMap.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/param/NyARParam.java b/src/jp/nyatla/nyartoolkit/core/param/NyARParam.java
index 1b566c2..ecee851 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/param/NyARParam.java
+++ b/src/jp/nyatla/nyartoolkit/core/param/NyARParam.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/param/NyARPerspectiveProjectionMatrix.java b/src/jp/nyatla/nyartoolkit/core/param/NyARPerspectiveProjectionMatrix.java
index ffc8326..f4d301c 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/param/NyARPerspectiveProjectionMatrix.java
+++ b/src/jp/nyatla/nyartoolkit/core/param/NyARPerspectiveProjectionMatrix.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/pca2d/INyARPca2d.java b/src/jp/nyatla/nyartoolkit/core/pca2d/INyARPca2d.java
index 66dd158..b72547b 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/pca2d/INyARPca2d.java
+++ b/src/jp/nyatla/nyartoolkit/core/pca2d/INyARPca2d.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/pca2d/NyARPca2d_MatrixPCA.java b/src/jp/nyatla/nyartoolkit/core/pca2d/NyARPca2d_MatrixPCA.java
index 638952d..8b14a2d 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/pca2d/NyARPca2d_MatrixPCA.java
+++ b/src/jp/nyatla/nyartoolkit/core/pca2d/NyARPca2d_MatrixPCA.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/pca2d/NyARPca2d_MatrixPCA_O2.java b/src/jp/nyatla/nyartoolkit/core/pca2d/NyARPca2d_MatrixPCA_O2.java
index 4108012..db358bd 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/pca2d/NyARPca2d_MatrixPCA_O2.java
+++ b/src/jp/nyatla/nyartoolkit/core/pca2d/NyARPca2d_MatrixPCA_O2.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/pickup/INyARColorPatt.java b/src/jp/nyatla/nyartoolkit/core/pickup/INyARColorPatt.java
index 9e55df4..82fcf92 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/pickup/INyARColorPatt.java
+++ b/src/jp/nyatla/nyartoolkit/core/pickup/INyARColorPatt.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_O1.java b/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_O1.java
index ccb21d7..d3d46d9 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_O1.java
+++ b/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_O1.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_O3.java b/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_O3.java
index fa29290..6d45b60 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_O3.java
+++ b/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_O3.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_Perspective.java b/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_Perspective.java
index 0a00fed..b2d2468 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_Perspective.java
+++ b/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_Perspective.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_Perspective_O2.java b/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_Perspective_O2.java
index 49ee70c..08aef28 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_Perspective_O2.java
+++ b/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_Perspective_O2.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_PseudoAffine.java b/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_PseudoAffine.java
index 62e8aeb..24ea631 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_PseudoAffine.java
+++ b/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_PseudoAffine.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/raster/INyARRaster.java b/src/jp/nyatla/nyartoolkit/core/raster/INyARRaster.java
index af43d62..5604dbe 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/raster/INyARRaster.java
+++ b/src/jp/nyatla/nyartoolkit/core/raster/INyARRaster.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/raster/NyARBinRaster.java b/src/jp/nyatla/nyartoolkit/core/raster/NyARBinRaster.java
index c0d5f4d..b6b816b 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/raster/NyARBinRaster.java
+++ b/src/jp/nyatla/nyartoolkit/core/raster/NyARBinRaster.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/raster/NyARGrayscaleRaster.java b/src/jp/nyatla/nyartoolkit/core/raster/NyARGrayscaleRaster.java
index d6aca2c..78f8553 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/raster/NyARGrayscaleRaster.java
+++ b/src/jp/nyatla/nyartoolkit/core/raster/NyARGrayscaleRaster.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/raster/NyARRaster.java b/src/jp/nyatla/nyartoolkit/core/raster/NyARRaster.java
index b2ffe78..4fa1f52 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/raster/NyARRaster.java
+++ b/src/jp/nyatla/nyartoolkit/core/raster/NyARRaster.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/raster/NyARRaster_BasicClass.java b/src/jp/nyatla/nyartoolkit/core/raster/NyARRaster_BasicClass.java
index bbb6632..6f027cc 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/raster/NyARRaster_BasicClass.java
+++ b/src/jp/nyatla/nyartoolkit/core/raster/NyARRaster_BasicClass.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/raster/rgb/INyARRgbRaster.java b/src/jp/nyatla/nyartoolkit/core/raster/rgb/INyARRgbRaster.java
index b9db48b..35f6954 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/raster/rgb/INyARRgbRaster.java
+++ b/src/jp/nyatla/nyartoolkit/core/raster/rgb/INyARRgbRaster.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_BGRA.java b/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_BGRA.java
index 39e6e19..39a40ba 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_BGRA.java
+++ b/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_BGRA.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_BasicClass.java b/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_BasicClass.java
index ccf27c4..218bb7b 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_BasicClass.java
+++ b/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_BasicClass.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_Blank.java b/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_Blank.java
index ca12e3f..b82894d 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_Blank.java
+++ b/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_Blank.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_RGB.java b/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_RGB.java
index 6b42c22..e7eb964 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_RGB.java
+++ b/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_RGB.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter.java b/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter.java
index dffbd2e..9d6060f 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter.java
+++ b/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter_GsToBin.java b/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter_GsToBin.java
index 18143b4..1995de1 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter_GsToBin.java
+++ b/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter_GsToBin.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter_RgbToGs.java b/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter_RgbToGs.java
index 5835e77..7c611f8 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter_RgbToGs.java
+++ b/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter_RgbToGs.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/INyARRasterFilter_RgbToBin.java b/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/INyARRasterFilter_RgbToBin.java
index 2ea1d01..4a384f6 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/INyARRasterFilter_RgbToBin.java
+++ b/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/INyARRasterFilter_RgbToBin.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/NyARRasterFilter_ARToolkitThreshold.java b/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/NyARRasterFilter_ARToolkitThreshold.java
index 67e657f..1ea09d0 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/NyARRasterFilter_ARToolkitThreshold.java
+++ b/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/NyARRasterFilter_ARToolkitThreshold.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARBufferReader.java b/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARBufferReader.java
index 3f3e642..8a59588 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARBufferReader.java
+++ b/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARBufferReader.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARRgbPixelReader.java b/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARRgbPixelReader.java
index 902f29f..42c1098 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARRgbPixelReader.java
+++ b/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARRgbPixelReader.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARBufferReader.java b/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARBufferReader.java
index e3c17cf..a2b8388 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARBufferReader.java
+++ b/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARBufferReader.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_BYTE1D_X8R8G8B8_32.java b/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_BYTE1D_X8R8G8B8_32.java
index 1e7eea2..ddd297a 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_BYTE1D_X8R8G8B8_32.java
+++ b/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_BYTE1D_X8R8G8B8_32.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_INT1D_GRAY_8.java b/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_INT1D_GRAY_8.java
index 81780e7..7cfb165 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_INT1D_GRAY_8.java
+++ b/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_INT1D_GRAY_8.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_INT1D_X8R8G8B8_32.java b/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_INT1D_X8R8G8B8_32.java
index 5b85418..a96b9ec 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_INT1D_X8R8G8B8_32.java
+++ b/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_INT1D_X8R8G8B8_32.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_RGB24.java b/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_RGB24.java
index db4b838..aabeb6d 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_RGB24.java
+++ b/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_RGB24.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/squaredetect/ContourPickup.java b/src/jp/nyatla/nyartoolkit/core/squaredetect/ContourPickup.java
index 72f3308..0cd6b52 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/squaredetect/ContourPickup.java
+++ b/src/jp/nyatla/nyartoolkit/core/squaredetect/ContourPickup.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/squaredetect/INyARSquareDetector.java b/src/jp/nyatla/nyartoolkit/core/squaredetect/INyARSquareDetector.java
index 9f4b3a6..b689a03 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/squaredetect/INyARSquareDetector.java
+++ b/src/jp/nyatla/nyartoolkit/core/squaredetect/INyARSquareDetector.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquare.java b/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquare.java
index e66980f..1fba556 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquare.java
+++ b/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquare.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareDetector_ARToolKit.java b/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareDetector_ARToolKit.java
index 9b1df13..4035399 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareDetector_ARToolKit.java
+++ b/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareDetector_ARToolKit.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareDetector_Rle.java b/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareDetector_Rle.java
index c86f848..c291c82 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareDetector_Rle.java
+++ b/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareDetector_Rle.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareStack.java b/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareStack.java
index 0b9ce48..924d5cb 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareStack.java
+++ b/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareStack.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARVertexCounter.java b/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARVertexCounter.java
index 64ccb67..b82940f 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARVertexCounter.java
+++ b/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARVertexCounter.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/squaredetect/SquareContourDetector.java b/src/jp/nyatla/nyartoolkit/core/squaredetect/SquareContourDetector.java
index 6dc6b25..3b708fe 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/squaredetect/SquareContourDetector.java
+++ b/src/jp/nyatla/nyartoolkit/core/squaredetect/SquareContourDetector.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/INyARTransMat.java b/src/jp/nyatla/nyartoolkit/core/transmat/INyARTransMat.java
index 336400e..7d263fc 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/INyARTransMat.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/INyARTransMat.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat.java b/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat.java
index e72bce3..ed7aa13 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r
@@ -46,7 +46,7 @@ import jp.nyatla.nyartoolkit.core.types.matrix.*;
  */\r
 public class NyARTransMat implements INyARTransMat\r
 {\r
-       private final static double FIT_DIFF_THRESHOLD = 0.01;\r
+       private final static double FIT_DIFF_THRESHOLD = 1.0;\r
        private final static double FIT_DIFF_THRESHOLD_CONT = 1.0;\r
 \r
        private final NyARDoublePoint2d _center=new NyARDoublePoint2d(0,0);\r

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMatResult.java b/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMatResult.java
index 5741701..64e20a5 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMatResult.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMatResult.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat_ARToolKit.java b/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat_ARToolKit.java
index 639e0c0..42e1133 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat_ARToolKit.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat_ARToolKit.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransOffset.java b/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransOffset.java
index 7eb6047..2bcf499 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransOffset.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransOffset.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/optimize/NyARPartialDifferentiationOptimize.java b/src/jp/nyatla/nyartoolkit/core/transmat/optimize/NyARPartialDifferentiationOptimize.java
index df1d1a9..9ffdcbe 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/optimize/NyARPartialDifferentiationOptimize.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/optimize/NyARPartialDifferentiationOptimize.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r
@@ -313,9 +313,9 @@ public class NyARPartialDifferentiationOptimize
 \r
                // ZXY系のsin/cos値を抽出\r
                rotation2Sincos_ZXY(io_rot, angles_in,ang);\r
-               ang.x += optimizeParamX(angles_in[1], angles_in[2], i_trans, i_vertex3d, i_vertex2d, 4, ang.x);\r
-               ang.y += optimizeParamY(angles_in[0], angles_in[2], i_trans, i_vertex3d, i_vertex2d, 4, ang.y);\r
-               ang.z += optimizeParamZ(angles_in[0], angles_in[1], i_trans, i_vertex3d, i_vertex2d, 4, ang.z);\r
+               ang.x += optimizeParamX(angles_in[1], angles_in[2], i_trans, i_vertex3d, i_vertex2d, i_number_of_vertex, ang.x);\r
+               ang.y += optimizeParamY(angles_in[0], angles_in[2], i_trans, i_vertex3d, i_vertex2d, i_number_of_vertex, ang.y);\r
+               ang.z += optimizeParamZ(angles_in[0], angles_in[1], i_trans, i_vertex3d, i_vertex2d, i_number_of_vertex, ang.z);\r
                io_rot.setZXYAngle(ang.x, ang.y, ang.z);\r
                return;\r
        }\r

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/INyARRotMatrixOptimize.java b/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/INyARRotMatrixOptimize.java
index cd0922c..a8d126b 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/INyARRotMatrixOptimize.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/INyARRotMatrixOptimize.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/NyARRotMatrixOptimize.java b/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/NyARRotMatrixOptimize.java
index 68092c6..d43f7b0 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/NyARRotMatrixOptimize.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/NyARRotMatrixOptimize.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/NyARRotMatrixOptimize_Base.java b/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/NyARRotMatrixOptimize_Base.java
index d0278d2..da1d263 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/NyARRotMatrixOptimize_Base.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/NyARRotMatrixOptimize_Base.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/NyARRotMatrixOptimize_O2.java b/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/NyARRotMatrixOptimize_O2.java
index 927ccfa..b5f4ae3 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/NyARRotMatrixOptimize_O2.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/NyARRotMatrixOptimize_O2.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotMatrix.java b/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotMatrix.java
index 7d9ac45..8bb4163 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotMatrix.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotMatrix.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotMatrix_ARToolKit.java b/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotMatrix_ARToolKit.java
index 5924fa8..0f10622 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotMatrix_ARToolKit.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotMatrix_ARToolKit.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotMatrix_ARToolKit_O2.java b/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotMatrix_ARToolKit_O2.java
index 73d4a93..e015baf 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotMatrix_ARToolKit_O2.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotMatrix_ARToolKit_O2.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotVector.java b/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotVector.java
index 159130b..2274485 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotVector.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotVector.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/solver/INyARTransportVectorSolver.java b/src/jp/nyatla/nyartoolkit/core/transmat/solver/INyARTransportVectorSolver.java
index 7d44aff..25ad4eb 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/solver/INyARTransportVectorSolver.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/solver/INyARTransportVectorSolver.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/solver/NyARTransportVectorSolver.java b/src/jp/nyatla/nyartoolkit/core/transmat/solver/NyARTransportVectorSolver.java
index 8e4bca8..8f75fbe 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/solver/NyARTransportVectorSolver.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/solver/NyARTransportVectorSolver.java
@@ -5,18 +5,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r
@@ -27,8 +27,7 @@ package jp.nyatla.nyartoolkit.core.transmat.solver;
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.param.NyARPerspectiveProjectionMatrix;\r
-import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
-import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint3d;\r
+import jp.nyatla.nyartoolkit.core.types.*;\r
 \r
 /**\r
  * 並進ベクトル[T]を３次元座標[b]と基点の回転済行列[M]から計算します。\r
@@ -53,7 +52,7 @@ public class NyARTransportVectorSolver implements INyARTransportVectorSolver
                this._cy=new double[i_max_vertex];      \r
                return;\r
        }\r
-       private double _a00,_a01,_a02_20,_a10,_a11,_a12_21,_a22;\r
+       private double _a00,_a01_10,_a02_20,_a11,_a12_21,_a22;\r
        /**\r
         * 画面上の座標群を指定します。\r
         * @param i_ref_vertex_2d\r
@@ -64,7 +63,6 @@ public class NyARTransportVectorSolver implements INyARTransportVectorSolver
        public void set2dVertex(NyARDoublePoint2d[] i_ref_vertex_2d,int i_number_of_vertex) throws NyARException\r
        {\r
                //3x2nと2n*3の行列から、最小二乗法計算するために3x3マトリクスを作る。               \r
-               //[A]*[A]T\r
                //行列[A]の3列目のキャッシュ\r
                final double[] cx=this._cx;\r
                final double[] cy=this._cy;\r
@@ -76,11 +74,12 @@ public class NyARTransportVectorSolver implements INyARTransportVectorSolver
                double p12=this._projection_mat.m12;\r
                double p02=this._projection_mat.m02;\r
                double w1,w2,w3,w4;\r
+               \r
                this._a00=i_number_of_vertex*p00*p00;\r
-               this._a01=i_number_of_vertex*p00*p01;\r
-               this._a10=i_number_of_vertex*p00*p01;\r
+               this._a01_10=i_number_of_vertex*p00*p01;\r
                this._a11=i_number_of_vertex*(p01*p01+p11*p11);\r
                \r
+               //[A]T*[A]の計算\r
                m22=0;\r
                w1=w2=0;\r
                for(int i=0;i<i_number_of_vertex;i++){\r
@@ -109,7 +108,7 @@ public class NyARTransportVectorSolver implements INyARTransportVectorSolver
         * @param o_transfer\r
         * @throws NyARException\r
         */\r
-       final public void solveTransportVector(NyARDoublePoint3d[] i_vertex3d,NyARDoublePoint3d o_transfer) throws NyARException\r
+       public void solveTransportVector(NyARDoublePoint3d[] i_vertex3d,NyARDoublePoint3d o_transfer) throws NyARException\r
        {\r
                final int number_of_vertex=this._nmber_of_vertex;\r
                final double p00=this._projection_mat.m00;\r
@@ -123,33 +122,40 @@ public class NyARTransportVectorSolver implements INyARTransportVectorSolver
                \r
                //回転行列を元座標の頂点群に適応\r
                //[A]T*[b]を計算\r
-               double bt1=0,bt2=0,bt3=0;\r
+               double b1=0,b2=0,b3=0;\r
                for(int i=0;i<number_of_vertex;i++)\r
                {\r
                        double w1=i_vertex3d[i].z*cx[i]-p00*i_vertex3d[i].x-p01*i_vertex3d[i].y-p02*i_vertex3d[i].z;\r
                        double w2=i_vertex3d[i].z*cy[i]-p11*i_vertex3d[i].y-p12*i_vertex3d[i].z;\r
-                       bt1+=w1;\r
-                       bt2+=w2;\r
-                       bt3+=-cx[i]*w1-cy[i]*w2;\r
+                       b1+=w1;\r
+                       b2+=w2;\r
+                       b3+=cx[i]*w1+cy[i]*w2;\r
                }\r
-               //([A]*T[A])*[T]=[A]T*[b]を方程式で解く。\r
+               //[A]T*[b]を計算\r
+               b3=p02*b1+p12*b2-b3;//順番変えたらダメよ\r
+               b2=p01*b1+p11*b2;\r
+               b1=p00*b1;\r
+               //([A]T*[A])*[T]=[A]T*[b]を方程式で解く。\r
                //a01とa10を0と仮定しても良いんじゃないかな？\r
-               double b00=bt1*p00;\r
-               double m00=this._a00;\r
-               double m10=this._a10;\r
-               double m20=this._a02_20;\r
-               double m12_21=this._a12_21;\r
-               double m01=this._a01;\r
-\r
-               double a=(this._a11*m00-m10*m01);       \r
-               double b=(m00*m12_21-m20*m01);  \r
-               double c=(m00*this._a22-m20*m20);       \r
-               double d=(m00*(bt1*p02+bt2*p12+bt3)-m20*b00);   \r
-\r
-               double z,y;\r
-               o_transfer.z=z=((a*d)-(b*(m00*(b00+bt2*p11)-m10*b00)))/((c*a)-(b*(m00*m12_21-m10)));\r
-               o_transfer.y=y=(d-c*z)/(b);\r
-               o_transfer.x=(b00-m01*y-m20*z)/m00;\r
+               double a00=this._a00;\r
+               double a01=this._a01_10;\r
+               double a02=this._a02_20;\r
+               double a11=this._a11;\r
+               double a12=this._a12_21;\r
+               double a22=this._a22;\r
+               \r
+               double t1=a22*b2-a12*b3;\r
+               double t2=a12*b2-a11*b3;\r
+               double t3=a01*b3-a02*b2;\r
+               double t4=a12*a12-a11*a22;\r
+               double t5=a02*a12-a01*a22;\r
+               double t6=a02*a11-a01*a12;\r
+               double det=a00*t4-a01*t5 + a02*t6;\r
+               o_transfer.x= (a01*t1 - a02*t2 +b1*t4)/det;\r
+               o_transfer.y=-(a00*t1 + a02*t3 +b1*t5)/det;\r
+               o_transfer.z= (a00*t2 + a01*t3 +b1*t6)/det;\r
+               \r
+       \r
                return;\r
        }\r
 }
\ No newline at end of file

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/solver/NyARTransportVectorSolver_ARToolKit.java b/src/jp/nyatla/nyartoolkit/core/transmat/solver/NyARTransportVectorSolver_ARToolKit.java
index ab0b09d..d054d98 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/solver/NyARTransportVectorSolver_ARToolKit.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/solver/NyARTransportVectorSolver_ARToolKit.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/types/NyARDoublePoint2d.java b/src/jp/nyatla/nyartoolkit/core/types/NyARDoublePoint2d.java
index 45517a9..fe7a22d 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/types/NyARDoublePoint2d.java
+++ b/src/jp/nyatla/nyartoolkit/core/types/NyARDoublePoint2d.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/types/NyARDoublePoint3d.java b/src/jp/nyatla/nyartoolkit/core/types/NyARDoublePoint3d.java
index a83aae7..33d4579 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/types/NyARDoublePoint3d.java
+++ b/src/jp/nyatla/nyartoolkit/core/types/NyARDoublePoint3d.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/types/NyARIntPoint.java b/src/jp/nyatla/nyartoolkit/core/types/NyARIntPoint.java
index 0a27420..a2614c0 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/types/NyARIntPoint.java
+++ b/src/jp/nyatla/nyartoolkit/core/types/NyARIntPoint.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/types/NyARIntPoint2d.java b/src/jp/nyatla/nyartoolkit/core/types/NyARIntPoint2d.java
index 0a6ef3c..025d2dd 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/types/NyARIntPoint2d.java
+++ b/src/jp/nyatla/nyartoolkit/core/types/NyARIntPoint2d.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/types/NyARIntRect.java b/src/jp/nyatla/nyartoolkit/core/types/NyARIntRect.java
index 2d17389..6d4dac6 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/types/NyARIntRect.java
+++ b/src/jp/nyatla/nyartoolkit/core/types/NyARIntRect.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/types/NyARIntSize.java b/src/jp/nyatla/nyartoolkit/core/types/NyARIntSize.java
index f5f4e21..deca90f 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/types/NyARIntSize.java
+++ b/src/jp/nyatla/nyartoolkit/core/types/NyARIntSize.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/types/NyARLinear.java b/src/jp/nyatla/nyartoolkit/core/types/NyARLinear.java
index 4087b9c..ec92f99 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/types/NyARLinear.java
+++ b/src/jp/nyatla/nyartoolkit/core/types/NyARLinear.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/types/matrix/INyARDoubleMatrix.java b/src/jp/nyatla/nyartoolkit/core/types/matrix/INyARDoubleMatrix.java
index 2f86afa..bd44fba 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/types/matrix/INyARDoubleMatrix.java
+++ b/src/jp/nyatla/nyartoolkit/core/types/matrix/INyARDoubleMatrix.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix22.java b/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix22.java
index 7edee9c..3c2c313 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix22.java
+++ b/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix22.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix33.java b/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix33.java
index a99eae8..714238d 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix33.java
+++ b/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix33.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r
@@ -104,7 +104,7 @@ public class NyARDoubleMatrix33 implements INyARDoubleMatrix
                b12=a32*a13-a33*a12;\r
                b13=a12*a23-a13*a22;\r
                \r
-               b21=a13*a31-a21*a33;\r
+               b21=a23*a31-a21*a33;\r
                b22=a33*a11-a31*a13;\r
                b23=a13*a21-a11*a23;\r
                \r

diff --git a/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix34.java b/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix34.java
index 652a22f..db76cf3 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix34.java
+++ b/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix34.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix44.java b/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix44.java
index e34dbad..d853d7e 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix44.java
+++ b/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix44.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntPointStack.java b/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntPointStack.java
index d540dfb..43e514d 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntPointStack.java
+++ b/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntPointStack.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntRectStack.java b/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntRectStack.java
index 3281cf1..ec9542e 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntRectStack.java
+++ b/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntRectStack.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/utils/NyAREquationSolver.java b/src/jp/nyatla/nyartoolkit/core/utils/NyAREquationSolver.java
index d3e0e56..12207f3 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/utils/NyAREquationSolver.java
+++ b/src/jp/nyatla/nyartoolkit/core/utils/NyAREquationSolver.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/utils/NyARPerspectiveParamGenerator.java b/src/jp/nyatla/nyartoolkit/core/utils/NyARPerspectiveParamGenerator.java
index 08afbcb..e132a16 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/utils/NyARPerspectiveParamGenerator.java
+++ b/src/jp/nyatla/nyartoolkit/core/utils/NyARPerspectiveParamGenerator.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/utils/NyARPerspectiveParamGenerator_O1.java b/src/jp/nyatla/nyartoolkit/core/utils/NyARPerspectiveParamGenerator_O1.java
index e2a91f4..7c58442 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/utils/NyARPerspectiveParamGenerator_O1.java
+++ b/src/jp/nyatla/nyartoolkit/core/utils/NyARPerspectiveParamGenerator_O1.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core/utils/NyARSystemOfLinearEquationsProcessor.java b/src/jp/nyatla/nyartoolkit/core/utils/NyARSystemOfLinearEquationsProcessor.java
index f7b6824..a4d840d 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/utils/NyARSystemOfLinearEquationsProcessor.java
+++ b/src/jp/nyatla/nyartoolkit/core/utils/NyARSystemOfLinearEquationsProcessor.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java
index a1499ac..89d908a 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/INyARRasterThresholdAnalyzer.java b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/INyARRasterThresholdAnalyzer.java
index 0a0b4ce..0328cea 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/INyARRasterThresholdAnalyzer.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/INyARRasterThresholdAnalyzer.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_DiffHistgram.java b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_DiffHistgram.java
index 476954a..c90a8d6 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_DiffHistgram.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_DiffHistgram.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_PTile.java b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_PTile.java
index dd6fef4..5f563bb 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_PTile.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_PTile.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_SlidePTile.java b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_SlidePTile.java
index 962ce04..1dd0fba 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_SlidePTile.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_SlidePTile.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/rasterfilter/NyARRasterFilter_Edge.java b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/NyARRasterFilter_Edge.java
index 5484e26..de66f9b 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/rasterfilter/NyARRasterFilter_Edge.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/NyARRasterFilter_Edge.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/rasterfilter/gs2bin/NyARRasterFilter_AreaAverage.java b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/gs2bin/NyARRasterFilter_AreaAverage.java
index 4ac465a..c8d598e 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/rasterfilter/gs2bin/NyARRasterFilter_AreaAverage.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/gs2bin/NyARRasterFilter_AreaAverage.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/rasterfilter/gs2bin/NyARRasterFilter_Threshold.java b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/gs2bin/NyARRasterFilter_Threshold.java
index a668ce5..587ae86 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/rasterfilter/gs2bin/NyARRasterFilter_Threshold.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/gs2bin/NyARRasterFilter_Threshold.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbAve.java b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbAve.java
index 3dddc45..6ca1735 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbAve.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbAve.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbMul.java b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbMul.java
index 011215a..45948bf 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbMul.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbMul.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbOr.java b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbOr.java
index d3d70c2..95afa5e 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbOr.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbOr.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/types/NyARFixedFloat16Point2d.java b/src/jp/nyatla/nyartoolkit/core2/types/NyARFixedFloat16Point2d.java
index 1faade2..b9ffc40 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/types/NyARFixedFloat16Point2d.java
+++ b/src/jp/nyatla/nyartoolkit/core2/types/NyARFixedFloat16Point2d.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/types/NyARFixedFloat16Point3d.java b/src/jp/nyatla/nyartoolkit/core2/types/NyARFixedFloat16Point3d.java
index 884f3e9..16548ca 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/types/NyARFixedFloat16Point3d.java
+++ b/src/jp/nyatla/nyartoolkit/core2/types/NyARFixedFloat16Point3d.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/types/NyARI64Linear.java b/src/jp/nyatla/nyartoolkit/core2/types/NyARI64Linear.java
index 22876e0..bb3c37c 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/types/NyARI64Linear.java
+++ b/src/jp/nyatla/nyartoolkit/core2/types/NyARI64Linear.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/types/NyARI64Point2d.java b/src/jp/nyatla/nyartoolkit/core2/types/NyARI64Point2d.java
index 1ba03cb..95d4f46 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/types/NyARI64Point2d.java
+++ b/src/jp/nyatla/nyartoolkit/core2/types/NyARI64Point2d.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/types/NyARI64Point3d.java b/src/jp/nyatla/nyartoolkit/core2/types/NyARI64Point3d.java
index c8cdf81..df642c4 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/types/NyARI64Point3d.java
+++ b/src/jp/nyatla/nyartoolkit/core2/types/NyARI64Point3d.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/types/matrix/NyARFixedFloat16Matrix33.java b/src/jp/nyatla/nyartoolkit/core2/types/matrix/NyARFixedFloat16Matrix33.java
index acb7034..a42efb1 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/types/matrix/NyARFixedFloat16Matrix33.java
+++ b/src/jp/nyatla/nyartoolkit/core2/types/matrix/NyARFixedFloat16Matrix33.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/types/matrix/NyARFixedFloat24Matrix33.java b/src/jp/nyatla/nyartoolkit/core2/types/matrix/NyARFixedFloat24Matrix33.java
index 97ad5ab..67f49d2 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/types/matrix/NyARFixedFloat24Matrix33.java
+++ b/src/jp/nyatla/nyartoolkit/core2/types/matrix/NyARFixedFloat24Matrix33.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/types/matrix/NyARI64Matrix22.java b/src/jp/nyatla/nyartoolkit/core2/types/matrix/NyARI64Matrix22.java
index 5d713a0..a79fc74 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/types/matrix/NyARI64Matrix22.java
+++ b/src/jp/nyatla/nyartoolkit/core2/types/matrix/NyARI64Matrix22.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/types/matrix/NyARI64Matrix33.java b/src/jp/nyatla/nyartoolkit/core2/types/matrix/NyARI64Matrix33.java
index ba4a913..5c322bb 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/types/matrix/NyARI64Matrix33.java
+++ b/src/jp/nyatla/nyartoolkit/core2/types/matrix/NyARI64Matrix33.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/detector/NyARCustomSingleDetectMarker.java b/src/jp/nyatla/nyartoolkit/detector/NyARCustomSingleDetectMarker.java
index fc5dffd..27c4389 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/detector/NyARCustomSingleDetectMarker.java
+++ b/src/jp/nyatla/nyartoolkit/detector/NyARCustomSingleDetectMarker.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/detector/NyARDetectMarker.java b/src/jp/nyatla/nyartoolkit/detector/NyARDetectMarker.java
index 07d0079..78f7219 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/detector/NyARDetectMarker.java
+++ b/src/jp/nyatla/nyartoolkit/detector/NyARDetectMarker.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/detector/NyARSingleDetectMarker.java b/src/jp/nyatla/nyartoolkit/detector/NyARSingleDetectMarker.java
index 4617134..d9e82e7 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/detector/NyARSingleDetectMarker.java
+++ b/src/jp/nyatla/nyartoolkit/detector/NyARSingleDetectMarker.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerParam.java b/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerParam.java
index ec86946..8fd48d8 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerParam.java
+++ b/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerParam.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerPattern.java b/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerPattern.java
index 23d47b4..23cc6c0 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerPattern.java
+++ b/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerPattern.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerPickup.java b/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerPickup.java
index 4d0afb9..84e14fc 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerPickup.java
+++ b/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerPickup.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerData.java b/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerData.java
index 271f772..1e6edd2 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerData.java
+++ b/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerData.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerDataEncoder.java b/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerDataEncoder.java
index 7bc36a0..329ea1b 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerDataEncoder.java
+++ b/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerDataEncoder.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerDataEncoder_RawBit.java b/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerDataEncoder_RawBit.java
index 2a6caf8..01d96bc 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerDataEncoder_RawBit.java
+++ b/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerDataEncoder_RawBit.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerData_RawBit.java b/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerData_RawBit.java
index 5b68582..1e662be 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerData_RawBit.java
+++ b/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerData_RawBit.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/processor/SingleARMarkerProcesser.java b/src/jp/nyatla/nyartoolkit/processor/SingleARMarkerProcesser.java
index c627d29..83769d6 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/processor/SingleARMarkerProcesser.java
+++ b/src/jp/nyatla/nyartoolkit/processor/SingleARMarkerProcesser.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/processor/SingleNyIdMarkerProcesser.java b/src/jp/nyatla/nyartoolkit/processor/SingleNyIdMarkerProcesser.java
index da09bce..4fd58af 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/processor/SingleNyIdMarkerProcesser.java
+++ b/src/jp/nyatla/nyartoolkit/processor/SingleNyIdMarkerProcesser.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/sample/NyIdTest.java b/src/jp/nyatla/nyartoolkit/sample/NyIdTest.java
index 3cf4779..f14fa7f 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/sample/NyIdTest.java
+++ b/src/jp/nyatla/nyartoolkit/sample/NyIdTest.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/nyartoolkit/sample/RawFileTest.java b/src/jp/nyatla/nyartoolkit/sample/RawFileTest.java
index 4727705..815dd54 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/sample/RawFileTest.java
+++ b/src/jp/nyatla/nyartoolkit/sample/RawFileTest.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r
@@ -79,7 +79,7 @@ public class RawFileTest
 \r
                // １パターンのみを追跡するクラスを作成\r
                NyARSingleDetectMarker ar = new NyARSingleDetectMarker(\r
-                               ap, code, 80.0,ra.getBufferReader().getBufferType(),NyARSingleDetectMarker.PF_NYARTOOLKIT);\r
+                               ap, code, 80.0,ra.getBufferReader().getBufferType());\r
                NyARTransMatResult result_mat = new NyARTransMatResult();\r
                ar.setContinueMode(false);\r
                ar.detectMarkerLite(ra, 100);\r

diff --git a/src/jp/nyatla/nyartoolkit/sample/SingleARMarkerTest.java b/src/jp/nyatla/nyartoolkit/sample/SingleARMarkerTest.java
index e3d3e97..fdfa0f1 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/sample/SingleARMarkerTest.java
+++ b/src/jp/nyatla/nyartoolkit/sample/SingleARMarkerTest.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/utils/DoubleValue.java b/src/jp/nyatla/utils/DoubleValue.java
index 7f1377f..acdc793 100644 (file)
--- a/src/jp/nyatla/utils/DoubleValue.java
+++ b/src/jp/nyatla/utils/DoubleValue.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/utils/IntValue.java b/src/jp/nyatla/utils/IntValue.java
index 80b826a..056cf7a 100644 (file)
--- a/src/jp/nyatla/utils/IntValue.java
+++ b/src/jp/nyatla/utils/IntValue.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/utils/NyObjectStack.java b/src/jp/nyatla/utils/NyObjectStack.java
index 95d39e6..76f5a1c 100644 (file)
--- a/src/jp/nyatla/utils/NyObjectStack.java
+++ b/src/jp/nyatla/utils/NyObjectStack.java
@@ -4,18 +4,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/utils/j2se/LabelingBufferdImage.java b/src/jp/nyatla/utils/j2se/LabelingBufferdImage.java
index 62b6280..7f2387a 100644 (file)
--- a/src/jp/nyatla/utils/j2se/LabelingBufferdImage.java
+++ b/src/jp/nyatla/utils/j2se/LabelingBufferdImage.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r

diff --git a/src/jp/nyatla/utils/j2se/NyARRasterImageIO.java b/src/jp/nyatla/utils/j2se/NyARRasterImageIO.java
index e193f34..6e8952a 100644 (file)
--- a/src/jp/nyatla/utils/j2se/NyARRasterImageIO.java
+++ b/src/jp/nyatla/utils/j2se/NyARRasterImageIO.java
@@ -10,18 +10,18 @@
  * The NyARToolkit is Java edition ARToolKit class library.\r
  * Copyright (C)2008-2009 Ryo Iizuka\r
  *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public License\r
- * as published by the Free Software Foundation; either version 3\r
- * of the License, or (at your option) any later version.\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (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 Lesser General Public License for more details\r
- * \r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this program. If not, see <http://www.gnu.org/licenses/>.\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, see <http://www.gnu.org/licenses/>.\r
  * \r
  * For further information please contact.\r
  *     http://nyatla.jp/nyatoolkit/\r