fengzhuang

LICENSE

+MIT License
+
+Copyright (c) 2019 test_zhou
+
+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.

function.py

@@ -93,10 +93,15 @@ class img_similarity():
             Feature = None
             gc.collect()
             self.pic_name_list.append(name)
+<<<<<<< HEAD
             #print(f'图片 {name} 加载完毕！')
             print(index(i, len(imgs)-1), end='%')
             time.sleep(0.01)
         print('\n图片加载完成！如有需要请用data_save方法进行数据保存，以方便下次快速读取。')
+=======
+            print(f'图片 {name} 加载完毕！')
+        print('图片加载完成！如有需要请用data_save方法进行数据保存，以方便下次快速读取。')
+>>>>>>> cd541b374ae7751d3a0c91ca5063cae340ff445f
     
 
     def similarity(self, pic_path):