version:2.1.5

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

app/OpenCV/sdk/native/jni/include/opencv2/flann/logger.h

@@ -39,72 +39,80 @@
 #include "defines.h"
 
 
-namespace cvflann {
+namespace cvflann
+{
 
-    class Logger {
-        Logger() : stream(stdout), logLevel(FLANN_LOG_WARN) {}
+class Logger
+{
+    Logger() : stream(stdout), logLevel(FLANN_LOG_WARN) {}
 
-        ~Logger() {
-            if ((stream != NULL) && (stream != stdout)) {
-                fclose(stream);
-            }
+    ~Logger()
+    {
+        if ((stream!=NULL)&&(stream!=stdout)) {
+            fclose(stream);
         }
+    }
 
-        static Logger &instance() {
-            static Logger logger;
-            return logger;
+    static Logger& instance()
+    {
+        static Logger logger;
+        return logger;
+    }
+
+    void _setDestination(const char* name)
+    {
+        if (name==NULL) {
+            stream = stdout;
         }
-
-        void _setDestination(const char *name) {
-            if (name == NULL) {
-                stream = stdout;
-            } else {
+        else {
 #ifdef _MSC_VER
-                if (fopen_s(&stream, name, "w") != 0)
-                    stream = NULL;
+            if (fopen_s(&stream, name, "w") != 0)
+                stream = NULL;
 #else
-                stream = fopen(name, "w");
+            stream = fopen(name,"w");
 #endif
-                if (stream == NULL) {
-                    stream = stdout;
-                }
+            if (stream == NULL) {
+                stream = stdout;
             }
         }
+    }
 
-        int _log(int level, const char *fmt, va_list arglist) {
-            if (level > logLevel) return -1;
-            int ret = vfprintf(stream, fmt, arglist);
-            return ret;
-        }
+    int _log(int level, const char* fmt, va_list arglist)
+    {
+        if (level > logLevel ) return -1;
+        int ret = vfprintf(stream, fmt, arglist);
+        return ret;
+    }
 
-    public:
-        /**
-         * Sets the logging level. All messages with lower priority will be ignored.
-         * @param level Logging level
-         */
-        static void setLevel(int level) { instance().logLevel = level; }
+public:
+    /**
+     * Sets the logging level. All messages with lower priority will be ignored.
+     * @param level Logging level
+     */
+    static void setLevel(int level) { instance().logLevel = level; }
 
-        /**
-         * Sets the logging destination
-         * @param name Filename or NULL for console
-         */
-        static void setDestination(const char *name) { instance()._setDestination(name); }
+    /**
+     * Sets the logging destination
+     * @param name Filename or NULL for console
+     */
+    static void setDestination(const char* name) { instance()._setDestination(name); }
 
-        /**
-         * Print log message
-         * @param level Log level
-         * @param fmt Message format
-         * @return
-         */
-        static int log(int level, const char *fmt, ...) {
-            va_list arglist;
-            va_start(arglist, fmt);
-            int ret = instance()._log(level, fmt, arglist);
-            va_end(arglist);
-            return ret;
-        }
+    /**
+     * Print log message
+     * @param level Log level
+     * @param fmt Message format
+     * @return
+     */
+    static int log(int level, const char* fmt, ...)
+    {
+        va_list arglist;
+        va_start(arglist, fmt);
+        int ret = instance()._log(level,fmt,arglist);
+        va_end(arglist);
+        return ret;
+    }
 
-#define LOG_METHOD(NAME, LEVEL) \
+#define LOG_METHOD(NAME,LEVEL) \
     static int NAME(const char* fmt, ...) \
     { \
         va_list ap; \
@@ -114,18 +122,15 @@ namespace cvflann {
         return ret; \
     }
 
-        LOG_METHOD(fatal, FLANN_LOG_FATAL)
+    LOG_METHOD(fatal, FLANN_LOG_FATAL)
+    LOG_METHOD(error, FLANN_LOG_ERROR)
+    LOG_METHOD(warn, FLANN_LOG_WARN)
+    LOG_METHOD(info, FLANN_LOG_INFO)
 
-        LOG_METHOD(error, FLANN_LOG_ERROR)
-
-        LOG_METHOD(warn, FLANN_LOG_WARN)
-
-        LOG_METHOD(info, FLANN_LOG_INFO)
-
-    private:
-        FILE *stream;
-        int logLevel;
-    };
+private:
+    FILE* stream;
+    int logLevel;
+};
 
 }