version:2.1.5

bugfixes:
update:拨号使用ocr进行识别

app/OpenCV/sdk/native/jni/include/opencv2/photo/cuda.hpp

@@ -45,8 +45,7 @@
 
 #include "opencv2/core/cuda.hpp"
 
-namespace cv {
-    namespace cuda {
+namespace cv { namespace cuda {
 
 //! @addtogroup photo_denoise
 //! @{
@@ -65,12 +64,12 @@ BORDER_REPLICATE , BORDER_CONSTANT , BORDER_REFLECT and BORDER_WRAP are supporte
 @sa
    fastNlMeansDenoising
  */
-        CV_EXPORTS void nonLocalMeans(InputArray src, OutputArray dst,
-                                      float h,
-                                      int search_window = 21,
-                                      int block_size = 7,
-                                      int borderMode = BORDER_DEFAULT,
-                                      Stream &stream = Stream::Null());
+CV_EXPORTS void nonLocalMeans(InputArray src, OutputArray dst,
+                              float h,
+                              int search_window = 21,
+                              int block_size = 7,
+                              int borderMode = BORDER_DEFAULT,
+                              Stream& stream = Stream::Null());
 
 /** @brief Perform image denoising using Non-local Means Denoising algorithm
 <http://www.ipol.im/pub/algo/bcm_non_local_means_denoising> with several computational
@@ -93,11 +92,11 @@ FastNonLocalMeansDenoising::labMethod.
 @sa
    fastNlMeansDenoising
  */
-        CV_EXPORTS void fastNlMeansDenoising(InputArray src, OutputArray dst,
-                                             float h,
-                                             int search_window = 21,
-                                             int block_size = 7,
-                                             Stream &stream = Stream::Null());
+CV_EXPORTS void fastNlMeansDenoising(InputArray src, OutputArray dst,
+                                     float h,
+                                     int search_window = 21,
+                                     int block_size = 7,
+                                     Stream& stream = Stream::Null());
 
 /** @brief Modification of fastNlMeansDenoising function for colored images
 
@@ -120,15 +119,14 @@ with given h parameters using FastNonLocalMeansDenoising::simpleMethod function.
 @sa
    fastNlMeansDenoisingColored
  */
-        CV_EXPORTS void fastNlMeansDenoisingColored(InputArray src, OutputArray dst,
-                                                    float h_luminance, float photo_render,
-                                                    int search_window = 21,
-                                                    int block_size = 7,
-                                                    Stream &stream = Stream::Null());
+CV_EXPORTS void fastNlMeansDenoisingColored(InputArray src, OutputArray dst,
+                                            float h_luminance, float photo_render,
+                                            int search_window = 21,
+                                            int block_size = 7,
+                                            Stream& stream = Stream::Null());
 
 //! @} photo
 
-    }
-} // namespace cv { namespace cuda {
+}} // namespace cv { namespace cuda {
 
 #endif /* OPENCV_PHOTO_CUDA_HPP */

app/OpenCV/sdk/native/jni/include/opencv2/photo/legacy/constants_c.h

@@ -5,9 +5,10 @@
 #ifndef OPENCV_PHOTO_LEGACY_CONSTANTS_H
 #define OPENCV_PHOTO_LEGACY_CONSTANTS_H
 
-enum InpaintingModes {
-    CV_INPAINT_NS = 0,
-    CV_INPAINT_TELEA = 1
+enum InpaintingModes
+{
+    CV_INPAINT_NS      =0,
+    CV_INPAINT_TELEA   =1
 };
 
 #endif // OPENCV_PHOTO_LEGACY_CONSTANTS_H