Merge branch 'master' of https://gitserver.xunjoy.com/zhangyang/zhipuzi_pay_plugin

# Conflicts:
#	bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/eng.traineddata
#	bin/Win32/Debug/zhipuzi_pay_plugin/zhipuzi_pay_plugin.exe

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/ambigs.train

@@ -0,0 +1,7 @@
+tessedit_ambigs_training	1
+load_freq_dawg	0
+load_punc_dawg	0
+load_system_dawg	0
+load_number_dawg	0
+ambigs_debug_level	3
+load_fixed_length_dawgs	0

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/api_config

@@ -0,0 +1 @@
+tessedit_zero_rejection T

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/bigram

@@ -0,0 +1,5 @@
+load_bigram_dawg	True
+tessedit_enable_bigram_correction	True
+tessedit_bigram_debug	3
+save_raw_choices	True
+save_alt_choices	True

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/box.train

@@ -0,0 +1,14 @@
+disable_character_fragments T
+file_type                   .bl
+textord_fast_pitch_test	T
+tessedit_single_match	0
+tessedit_zero_rejection T
+tessedit_minimal_rejection F
+tessedit_write_rep_codes F
+il1_adaption_test 1
+edges_children_fix F
+edges_childarea 0.65
+edges_boxarea 0.9
+tessedit_resegment_from_boxes T
+tessedit_train_from_boxes T
+textord_no_rejects T

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/box.train.stderr

@@ -0,0 +1,15 @@
+file_type .bl
+#tessedit_use_nn F
+textord_fast_pitch_test T
+tessedit_single_match 0
+tessedit_zero_rejection T
+tessedit_minimal_rejection F
+tessedit_write_rep_codes F
+il1_adaption_test 1
+edges_children_fix F
+edges_childarea 0.65
+edges_boxarea 0.9
+tessedit_resegment_from_boxes T
+tessedit_train_from_boxes T
+#textord_repeat_extraction F
+textord_no_rejects T

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/digits

@@ -0,0 +1 @@
+tessedit_char_whitelist 0123456789-.

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/hocr

@@ -0,0 +1,3 @@
+tessedit_create_hocr 1
+tessedit_pageseg_mode 1
+hocr_font_info 0

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/inter

@@ -0,0 +1,2 @@
+interactive_display_mode				T
+tessedit_display_outwords		T

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/kannada

@@ -0,0 +1,4 @@
+textord_skewsmooth_offset 8
+textord_skewsmooth_offset2 8
+textord_merge_desc 0.5
+textord_no_rejects 1

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/linebox

@@ -0,0 +1,2 @@
+tessedit_resegment_from_line_boxes 1
+tessedit_make_boxes_from_boxes 1

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/logfile

@@ -0,0 +1 @@
+debug_file tesseract.log

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/lstm.train

@@ -0,0 +1,13 @@
+disable_character_fragments T
+file_type                   .bl
+textord_fast_pitch_test	T
+tessedit_single_match	0
+tessedit_zero_rejection T
+tessedit_minimal_rejection F
+tessedit_write_rep_codes F
+il1_adaption_test 1
+edges_children_fix F
+edges_childarea 0.65
+edges_boxarea 0.9
+tessedit_train_line_recognizer T
+textord_no_rejects T

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/makebox

@@ -0,0 +1 @@
+tessedit_create_boxfile 1

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/pdf

@@ -0,0 +1,2 @@
+tessedit_create_pdf 1
+tessedit_pageseg_mode 1

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/quiet

@@ -0,0 +1 @@
+debug_file /dev/null

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/rebox

@@ -0,0 +1,2 @@
+tessedit_resegment_from_boxes 1
+tessedit_make_boxes_from_boxes 1

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/strokewidth

@@ -0,0 +1,12 @@
+textord_show_blobs 0
+textord_debug_tabfind 3
+textord_tabfind_show_partitions 1
+textord_tabfind_show_initial_partitions 1
+textord_tabfind_show_columns 1
+textord_tabfind_show_blocks 1
+textord_tabfind_show_initialtabs 1
+textord_tabfind_show_finaltabs 1
+textord_tabfind_show_strokewidths 1
+textord_tabfind_show_vlines 0
+textord_tabfind_show_images 1
+tessedit_dump_pageseg_images 0

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/tsv

@@ -0,0 +1,2 @@
+tessedit_create_tsv 1
+tessedit_pageseg_mode 1

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/txt

@@ -0,0 +1,3 @@
+# This config file should be used with other cofig files which creates renderers.
+# usage example: tesseract eurotext.tif eurotext txt hocr pdf
+tessedit_create_txt 1

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/configs/unlv

@@ -0,0 +1,2 @@
+tessedit_write_unlv 1
+tessedit_pageseg_mode 6

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/eng.user-patterns

@@ -0,0 +1,2 @@
+1-\d\d\d-GOOG-411
+www.\n\\\*.com

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/eng.user-words

@@ -0,0 +1,5 @@
+the
+quick
+brown
+fox
+jumped

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/tessconfigs/batch

@@ -0,0 +1,2 @@
+# No content needed as all defaults are correct.
+

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/tessconfigs/batch.nochop

@@ -0,0 +1,2 @@
+chop_enable 0
+wordrec_enable_assoc 0

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/tessconfigs/matdemo

@@ -0,0 +1,7 @@
+#################################################
+# Adaptive Matcher Using PreAdapted Templates
+#################################################
+
+classify_enable_adaptive_debugger   1
+matcher_debug_flags         6
+matcher_debug_level       1

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/tessconfigs/msdemo

@@ -0,0 +1,13 @@
+#################################################
+# Adaptive Matcher Using PreAdapted Templates
+#################################################
+
+classify_enable_adaptive_debugger	1
+matcher_debug_flags         6
+matcher_debug_level       1
+
+wordrec_display_splits          0
+wordrec_display_all_words       1
+wordrec_display_all_blobs       1
+wordrec_display_segmentations   2
+classify_debug_level		1

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/tessconfigs/nobatch

@@ -0,0 +1 @@
+

bin/Win32/Debug/zhipuzi_pay_plugin/tessdata/tessconfigs/segdemo

@@ -0,0 +1,10 @@
+#################################################
+# Adaptive Matcher Using PreAdapted Templates
+#################################################
+
+wordrec_display_splits          0
+wordrec_display_all_words       1
+wordrec_display_all_blobs       1
+wordrec_display_segmentations   2
+classify_debug_level		1
+stopper_debug_level 1

zhipuzi_pay_plugin/wnd/CValueWnd.cpp

@@ -53,7 +53,7 @@ void CValueWnd::Init()
 	pOcrWnd->ShowWindow(false);
 
 	//OCR的数据初始化
-	if (m_tess.Init("./tessdata", "eng"))
+	if (m_tess.Init("./tessdata", "osd"))
 	{
 		LOG_INFO("OCRTesseract: Could not initialize tesseract.");
 		MessageBox(m_hWnd, L"ocr语言库加载失败", L"111", MB_OK);