Merge branch 'opencv_agast_tree' of https://github.com/askourik/opencv into opencv_agast_tree

modules/features2d/src/agast_score.hpp

@@ -52,11 +52,17 @@ The references are:
 namespace cv
 {
 
+#if !(defined __i386__ || defined(_M_IX86) || defined __x86_64__ || defined(_M_X64))
+int agast_tree_search(const unsigned long table_struct32[], int pixel_[], const unsigned char* const ptr, int threshold);
+#endif //!(defined __i386__ || defined(_M_IX86) || defined __x86_64__ || defined(_M_X64))
+
+
 void makeAgastOffsets(int pixel[16], int row_stride, int type);
 
 template<int type>
 int agast_cornerScore(const uchar* ptr, const int pixel[], int threshold);
 
+
 }
 #endif
 #endif

modules/features2d/src/mser.cpp

 /* Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
  * conditions are met:
- * 	Redistributions of source code must retain the above
- * 	copyright notice, this list of conditions and the following
- * 	disclaimer.
- * 	Redistributions in binary form must reproduce the above
- * 	copyright notice, this list of conditions and the following
- * 	disclaimer in the documentation and/or other materials
- * 	provided with the distribution.
- * 	The name of Contributor may not be used to endorse or
- * 	promote products derived from this software without
- * 	specific prior written permission.
+ *     Redistributions of source code must retain the above
+ *     copyright notice, this list of conditions and the following
+ *     disclaimer.
+ *     Redistributions in binary form must reproduce the above
+ *     copyright notice, this list of conditions and the following
+ *     disclaimer in the documentation and/or other materials
+ *     provided with the distribution.
+ *     The name of Contributor may not be used to endorse or
+ *     promote products derived from this software without
+ *     specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,