Merge pull request #55 from KangLin/master

Fix: std::max error. Does this solve #53 and #54? Could you check it @oKcerG? thank you @KangLin!
2017-11-15 09:37:43 +02:00 · 2017-11-15 09:37:43 +02:00 · 5826e86d1b
parent 7d751006ae 75ace6dd54
commit 5826e86d1b
1 changed files with 1 additions and 0 deletions
--- a/src/zxing/zxing/qrcode/encoder/MaskUtil.cpp
+++ b/src/zxing/zxing/qrcode/encoder/MaskUtil.cpp
@ -1,6 +1,7 @@
 #include "MaskUtil.h"
 #include <zxing/common/IllegalArgumentException.h>
 #include <stdlib.h>
+#include <algorithm> 

 namespace zxing {
 namespace qrcode {