|
1 | 1 | /* |
2 | 2 | * Calibration.cpp |
3 | | - * ARToolKit6 Camera Calibration Utility |
| 3 | + * artoolkitX Camera Calibration Utility |
4 | 4 | * |
5 | | - * This file is part of ARToolKit. |
| 5 | + * This file is part of artoolkitX. |
6 | 6 | * |
7 | | - * Copyright 2015-2017 Daqri, LLC. |
8 | | - * Copyright 2002-2015 ARToolworks, Inc. |
| 7 | + * artoolkitX is free software: you can redistribute it and/or modify |
| 8 | + * it under the terms of the GNU Lesser General Public License as published by |
| 9 | + * the Free Software Foundation, either version 3 of the License, or |
| 10 | + * (at your option) any later version. |
9 | 11 | * |
10 | | - * Author(s): Hirokazu Kato, Philip Lamb |
| 12 | + * artoolkitX is distributed in the hope that it will be useful, |
| 13 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 14 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 15 | + * GNU Lesser General Public License for more details. |
11 | 16 | * |
12 | | - * Licensed under the Apache License, Version 2.0 (the "License"); |
13 | | - * you may not use this file except in compliance with the License. |
14 | | - * You may obtain a copy of the License at |
| 17 | + * You should have received a copy of the GNU Lesser General Public License |
| 18 | + * along with artoolkitX. If not, see <http://www.gnu.org/licenses/>. |
15 | 19 | * |
16 | | - * http://www.apache.org/licenses/LICENSE-2.0 |
| 20 | + * As a special exception, the copyright holders of this library give you |
| 21 | + * permission to link this library with independent modules to produce an |
| 22 | + * executable, regardless of the license terms of these independent modules, and to |
| 23 | + * copy and distribute the resulting executable under terms of your choice, |
| 24 | + * provided that you also meet, for each linked independent module, the terms and |
| 25 | + * conditions of the license of that module. An independent module is a module |
| 26 | + * which is neither derived from nor based on this library. If you modify this |
| 27 | + * library, you may extend this exception to your version of the library, but you |
| 28 | + * are not obligated to do so. If you do not wish to do so, delete this exception |
| 29 | + * statement from your version. |
17 | 30 | * |
18 | | - * Unless required by applicable law or agreed to in writing, software |
19 | | - * distributed under the License is distributed on an "AS IS" BASIS, |
20 | | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
21 | | - * See the License for the specific language governing permissions and |
22 | | - * limitations under the License. |
| 31 | + * Copyright 2018 Realmax, Inc. |
| 32 | + * Copyright 2015-2017 Daqri, LLC. |
| 33 | + * Copyright 2002-2015 ARToolworks, Inc. |
| 34 | + * |
| 35 | + * Author(s): Hirokazu Kato, Philip Lamb |
23 | 36 | * |
24 | 37 | */ |
25 | 38 |
|
@@ -238,12 +251,12 @@ bool Calibration::capture() |
238 | 251 | pthread_mutex_unlock(&m_cornerFinderResultLock); |
239 | 252 |
|
240 | 253 | if (saved) { |
241 | | - ARLOG("---------- %2d/%2d -----------\n", (int)m_corners.size(), m_calibImageCountMax); |
| 254 | + ARPRINT("---------- %2d/%2d -----------\n", (int)m_corners.size(), m_calibImageCountMax); |
242 | 255 | const std::vector<cv::Point2f>& corners = m_corners.back(); |
243 | 256 | for (std::vector<cv::Point2f>::const_iterator it = corners.begin(); it < corners.end(); it++) { |
244 | | - ARLOG(" %f, %f\n", it->x, it->y); |
| 257 | + ARPRINT(" %f, %f\n", it->x, it->y); |
245 | 258 | } |
246 | | - ARLOG("---------- %2d/%2d -----------\n", (int)m_corners.size(), m_calibImageCountMax); |
| 259 | + ARPRINT("---------- %2d/%2d -----------\n", (int)m_corners.size(), m_calibImageCountMax); |
247 | 260 | } |
248 | 261 |
|
249 | 262 | return (saved); |
|
0 commit comments