moved to the MIT License

nenadmarkus · Jun 30, 2016 · 3468810 · 3468810
1 parent 1b6ae8e
commit 3468810
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 83 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,18 +1,21 @@
-/*
- *	Copyright (c) 2013, Nenad Markus
- *	All rights reserved.
- *
- *	This is an implementation of the algorithm described in the following paper:
- *		N. Markus, M. Frljak, I. S. Pandzic, J. Ahlberg and R. Forchheimer,
- *		Object Detection with Pixel Intensity Comparisons Organized in Decision Trees,
- *		http://arxiv.org/abs/1305.4537
- *
- *	Redistribution and use of this program as source code or in binary form, with or without modifications, are permitted provided that the following conditions are met:
- *		1. Redistributions may not be sold, nor may they be used in a commercial product or activity without prior permission from the copyright holder (contact him at nenad.markus@fer.hr).
- *		2. Redistributions may not be used for military purposes.
- *		3. Any published work which utilizes this program shall include the reference to the paper available at http://arxiv.org/abs/1305.4537
- *		4. Redistributions must retain the above copyright notice and the reference to the algorithm on which the implementation is based on, this list of conditions and the following disclaimer.
- *
- *	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- *	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
+The MIT License
+
+Copyright (c) 2013 Nenad Markus
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/gen/picolrn.c b/gen/picolrn.c
@@ -1,20 +1,6 @@
 /*
- *	Copyright (c) 2013, Nenad Markus
- *	All rights reserved.
- *
- *	This is an implementation of the algorithm described in the following paper:
- *		N. Markus, M. Frljak, I. S. Pandzic, J. Ahlberg and R. Forchheimer,
- *		Object Detection with Pixel Intensity Comparisons Organized in Decision Trees,
- *		http://arxiv.org/abs/1305.4537
- *
- *	Redistribution and use of this program as source code or in binary form, with or without modifications, are permitted provided that the following conditions are met:
- *		1. Redistributions may not be sold, nor may they be used in a commercial product or activity without prior permission from the copyright holder (contact him at nenad.markus@fer.hr).
- *		2. Redistributions may not be used for military purposes.
- *		3. Any published work which utilizes this program shall include the reference to the paper available at http://arxiv.org/abs/1305.4537
- *		4. Redistributions must retain the above copyright notice and the reference to the algorithm on which the implementation is based on, this list of conditions and the following disclaimer.
- *
- *	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- *	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *  This code is released under the MIT License.
+ *  Copyright (c) 2013 Nenad Markus
  */
 
 #include <stdio.h>

diff --git a/rnt/picornt.c b/rnt/picornt.c
@@ -1,20 +1,6 @@
 /*
- *	Copyright (c) 2013, Nenad Markus
- *	All rights reserved.
- *
- *	This is an implementation of the algorithm described in the following paper:
- *		N. Markus, M. Frljak, I. S. Pandzic, J. Ahlberg and R. Forchheimer,
- *		Object Detection with Pixel Intensity Comparisons Organized in Decision Trees,
- *		http://arxiv.org/abs/1305.4537
- *
- *	Redistribution and use of this program as source code or in binary form, with or without modifications, are permitted provided that the following conditions are met:
- *		1. Redistributions may not be sold, nor may they be used in a commercial product or activity without prior permission from the copyright holder (contact him at nenad.markus@fer.hr).
- *		2. Redistributions may not be used for military purposes.
- *		3. Any published work which utilizes this program shall include the reference to the paper available at http://arxiv.org/abs/1305.4537
- *		4. Redistributions must retain the above copyright notice and the reference to the algorithm on which the implementation is based on, this list of conditions and the following disclaimer.
- *
- *	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- *	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *  This code is released under the MIT License.
+ *  Copyright (c) 2013 Nenad Markus
  */
 
 #define MAX(a, b) ((a)>(b)?(a):(b))

diff --git a/rnt/picornt.h b/rnt/picornt.h
@@ -1,20 +1,6 @@
 /*
- *	Copyright (c) 2013, Nenad Markus
- *	All rights reserved.
- *
- *	This is an implementation of the algorithm described in the following paper:
- *		N. Markus, M. Frljak, I. S. Pandzic, J. Ahlberg and R. Forchheimer,
- *		Object Detection with Pixel Intensity Comparisons Organized in Decision Trees,
- *		http://arxiv.org/abs/1305.4537
- *
- *	Redistribution and use of this program as source code or in binary form, with or without modifications, are permitted provided that the following conditions are met:
- *		1. Redistributions may not be sold, nor may they be used in a commercial product or activity without prior permission from the copyright holder (contact him at nenad.markus@fer.hr).
- *		2. Redistributions may not be used for military purposes.
- *		3. Any published work which utilizes this program shall include the reference to the paper available at http://arxiv.org/abs/1305.4537
- *		4. Redistributions must retain the above copyright notice and the reference to the algorithm on which the implementation is based on, this list of conditions and the following disclaimer.
- *
- *	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- *	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *  This code is released under the MIT License.
+ *  Copyright (c) 2013 Nenad Markus
  */
 
 #pragma once

diff --git a/rnt/sample/sample.c b/rnt/sample/sample.c
@@ -1,25 +1,12 @@
 /*
- *	Copyright (c) 2013, Nenad Markus
- *	All rights reserved.
- *
- *	This is an implementation of the algorithm described in the following paper:
- *		N. Markus, M. Frljak, I. S. Pandzic, J. Ahlberg and R. Forchheimer,
- *		A method for object detection based on pixel intensity comparisons,
- *		http://arxiv.org/abs/1305.4537
- *
- *	Redistribution and use of this program as source code or in binary form, with or without modifications, are permitted provided that the following conditions are met:
- *		1. Redistributions may not be sold, nor may they be used in a commercial product or activity without prior permission from the copyright holder (contact him at nenad.markus@fer.hr).
- *		2. Redistributions may not be used for military purposes.
- *		3. Any published work which utilizes this program shall include the reference to the paper available at http://arxiv.org/abs/1305.4537
- *		4. Redistributions must retain the above copyright notice and the reference to the algorithm on which the implementation is based on, this list of conditions and the following disclaimer.
- *
- *	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- *	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *  This code is released under the MIT License.
+ *  Copyright (c) 2013 Nenad Markus
  */
 
 #include <stdio.h>
 
-// opencv 3.x required
+// OpenCV 3.x required
+// depending on your computer configuration (OpenCV install path), the following line might need modifications
 #include "/usr/local/include/opencv2/highgui/highgui_c.h"
 
 //