diff options
Diffstat (limited to 'textproc/zxing-cpp/files')
5 files changed, 13 insertions, 46 deletions
diff --git a/textproc/zxing-cpp/files/patch-CMakeLists.txt b/textproc/zxing-cpp/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..251a61278629 --- /dev/null +++ b/textproc/zxing-cpp/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2018-07-09 07:47:42 UTC ++++ CMakeLists.txt +@@ -83,7 +83,7 @@ file(GLOB_RECURSE ZXING_FILES + ) + + add_executable(zxing ${ZXING_FILES}) +-target_link_libraries(zxing libzxing) ++target_link_libraries(zxing libzxing ${OpenCV_LIBRARIES}) + + install(TARGETS zxing libzxing EXPORT zxing-targets + LIBRARY DESTINATION lib diff --git a/textproc/zxing-cpp/files/patch-core_src_zxing_DecodeHints.cpp b/textproc/zxing-cpp/files/patch-core_src_zxing_DecodeHints.cpp deleted file mode 100644 index 59ca7b777c9f..000000000000 --- a/textproc/zxing-cpp/files/patch-core_src_zxing_DecodeHints.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- core/src/zxing/DecodeHints.cpp.orig 2016-11-10 14:45:28 UTC -+++ core/src/zxing/DecodeHints.cpp -@@ -29,7 +29,7 @@ using zxing::DecodeHints; - // VC++ - using zxing::BarcodeFormat; - --// const DecodeHintType DecodeHints::CHARACTER_SET; -+const DecodeHintType DecodeHints::CHARACTER_SET; - - const DecodeHints DecodeHints::PRODUCT_HINT( - UPC_A_HINT | diff --git a/textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp b/textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp index 7ea729463064..8de3d6aeb92d 100644 --- a/textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp +++ b/textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp @@ -1,4 +1,4 @@ ---- core/src/zxing/oned/OneDReader.cpp.orig 2016-11-10 14:45:28 UTC +--- core/src/zxing/oned/OneDReader.cpp.orig 2018-03-20 15:08:49 UTC +++ core/src/zxing/oned/OneDReader.cpp @@ -21,6 +21,7 @@ #include <zxing/oned/OneDResultPoint.h> @@ -7,4 +7,4 @@ +#include <float.h> #include <limits.h> #include <algorithm> - + #include <cfloat> diff --git a/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.cpp b/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.cpp deleted file mode 100644 index 3b5cad6c226f..000000000000 --- a/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- core/src/zxing/pdf417/detector/LinesSampler.cpp.orig 2016-11-10 14:45:28 UTC -+++ core/src/zxing/pdf417/detector/LinesSampler.cpp -@@ -75,6 +75,11 @@ VoteResult getValueWithMaxVotes(map<int, - - } - -+const int LinesSampler::MODULES_IN_SYMBOL = 17; -+const int LinesSampler::BARS_IN_SYMBOL = 8; -+const int LinesSampler::POSSIBLE_SYMBOLS = 2787; -+const int LinesSampler::BARCODE_START_OFFSET = 2; -+ - vector<float> LinesSampler::init_ratios_table() { - // Pre-computes and outputs the symbol ratio table. - vector<vector<float> > table (BitMatrixParser::SYMBOL_TABLE_LENGTH); diff --git a/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.h b/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.h deleted file mode 100644 index 221ef74afe8f..000000000000 --- a/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.h +++ /dev/null @@ -1,19 +0,0 @@ ---- core/src/zxing/pdf417/detector/LinesSampler.h.orig 2016-11-14 22:55:07 UTC -+++ core/src/zxing/pdf417/detector/LinesSampler.h -@@ -28,12 +28,12 @@ namespace detector { - - class LinesSampler { - protected: -- static const int MODULES_IN_SYMBOL = 17; -- static const int BARS_IN_SYMBOL = 8; -- static const int POSSIBLE_SYMBOLS = 2787; -+ static const int MODULES_IN_SYMBOL; -+ static const int BARS_IN_SYMBOL; -+ static const int POSSIBLE_SYMBOLS; - static const std::vector<float> RATIOS_TABLE; - static std::vector<float> init_ratios_table(); -- static const int BARCODE_START_OFFSET = 2; -+ static const int BARCODE_START_OFFSET; - - Ref<BitMatrix> linesMatrix_; - int symbolsPerLine_; |