From 4ad07d7cb3dc263920c34317fcbd8fbbd23058d0 Mon Sep 17 00:00:00 2001
From: Alexxey593 <alexxey593@mail.ru>
Date: Wed, 21 Oct 2015 12:24:24 +0300
Subject: [PATCH] WinRt (and Windows Phone) compilation fixes. std::Min and
 std::Max are in algorithm header.

---
 source/QZXing.pri                                              | 3 +++
 source/zxing/zxing/Result.h                                    | 1 -
 source/zxing/zxing/common/DecoderResult.h                      | 1 -
 .../zxing/common/detector/MonochromeRectangleDetector.cpp      | 1 +
 source/zxing/zxing/datamatrix/detector/DataMatrixDetector.cpp  | 1 +
 source/zxing/zxing/oned/Code128Reader.cpp                      | 1 +
 source/zxing/zxing/oned/Code39Reader.cpp                       | 1 +
 source/zxing/zxing/oned/OneDReader.cpp                         | 1 +
 source/zxing/zxing/pdf417/detector/PDF417Detector.cpp          | 2 +-
 source/zxing/zxing/qrcode/detector/QRDetector.cpp              | 1 +
 10 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/source/QZXing.pri b/source/QZXing.pri
index 0d75c2e..8862bac 100644
--- a/source/QZXing.pri
+++ b/source/QZXing.pri
@@ -291,3 +291,6 @@ win32-g++{
 !win32{
     DEFINES += NO_ICONV
 }
+winrt {
+    DEFINES += NO_ICONV
+}
diff --git a/source/zxing/zxing/Result.h b/source/zxing/zxing/Result.h
index 29c5a93..ff61c6b 100644
--- a/source/zxing/zxing/Result.h
+++ b/source/zxing/zxing/Result.h
@@ -35,7 +35,6 @@ private:
   ArrayRef<char> rawBytes_;
   ArrayRef< Ref<ResultPoint> > resultPoints_;
   BarcodeFormat format_;
-  //NOTE: My
   std::string charSet_;
 
 public:
diff --git a/source/zxing/zxing/common/DecoderResult.h b/source/zxing/zxing/common/DecoderResult.h
index 947dd4c..2bb4ece 100644
--- a/source/zxing/zxing/common/DecoderResult.h
+++ b/source/zxing/zxing/common/DecoderResult.h
@@ -46,7 +46,6 @@ public:
 
   ArrayRef<char> getRawBytes();
   Ref<String> getText();
-  // NOTE: my
   std::string charSet();
 };
 
diff --git a/source/zxing/zxing/common/detector/MonochromeRectangleDetector.cpp b/source/zxing/zxing/common/detector/MonochromeRectangleDetector.cpp
index 3ed9df9..d2b9512 100644
--- a/source/zxing/zxing/common/detector/MonochromeRectangleDetector.cpp
+++ b/source/zxing/zxing/common/detector/MonochromeRectangleDetector.cpp
@@ -22,6 +22,7 @@
 #include <zxing/NotFoundException.h>
 #include <zxing/common/detector/MonochromeRectangleDetector.h>
 #include <sstream>
+#include <algorithm>
 
 using std::vector;
 using zxing::Ref;
diff --git a/source/zxing/zxing/datamatrix/detector/DataMatrixDetector.cpp b/source/zxing/zxing/datamatrix/detector/DataMatrixDetector.cpp
index 36c427c..9fc02af 100644
--- a/source/zxing/zxing/datamatrix/detector/DataMatrixDetector.cpp
+++ b/source/zxing/zxing/datamatrix/detector/DataMatrixDetector.cpp
@@ -27,6 +27,7 @@
 #include <zxing/NotFoundException.h>
 #include <sstream>
 #include <cstdlib>
+#include <algorithm>
 
 using std::abs;
 using zxing::Ref;
diff --git a/source/zxing/zxing/oned/Code128Reader.cpp b/source/zxing/zxing/oned/Code128Reader.cpp
index cb53569..e6c8420 100644
--- a/source/zxing/zxing/oned/Code128Reader.cpp
+++ b/source/zxing/zxing/oned/Code128Reader.cpp
@@ -26,6 +26,7 @@
 #include <math.h>
 #include <string.h>
 #include <sstream>
+#include <algorithm>
 
 using std::vector;
 using std::string;
diff --git a/source/zxing/zxing/oned/Code39Reader.cpp b/source/zxing/zxing/oned/Code39Reader.cpp
index 47ee331..d5ae73b 100644
--- a/source/zxing/zxing/oned/Code39Reader.cpp
+++ b/source/zxing/zxing/oned/Code39Reader.cpp
@@ -23,6 +23,7 @@
 #include <zxing/ChecksumException.h>
 #include <math.h>
 #include <limits.h>
+#include <algorithm>
 
 using std::vector;
 using zxing::Ref;
diff --git a/source/zxing/zxing/oned/OneDReader.cpp b/source/zxing/zxing/oned/OneDReader.cpp
index 5920c39..ca0c063 100644
--- a/source/zxing/zxing/oned/OneDReader.cpp
+++ b/source/zxing/zxing/oned/OneDReader.cpp
@@ -22,6 +22,7 @@
 #include <zxing/NotFoundException.h>
 #include <math.h>
 #include <limits.h>
+#include <algorithm>
 
 using std::vector;
 using zxing::Ref;
diff --git a/source/zxing/zxing/pdf417/detector/PDF417Detector.cpp b/source/zxing/zxing/pdf417/detector/PDF417Detector.cpp
index 7bcc966..55a5976 100644
--- a/source/zxing/zxing/pdf417/detector/PDF417Detector.cpp
+++ b/source/zxing/zxing/pdf417/detector/PDF417Detector.cpp
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+#include <algorithm>
 #include <limits>
 #include <zxing/pdf417/detector/Detector.h>
 #include <zxing/pdf417/detector/LinesSampler.h>
diff --git a/source/zxing/zxing/qrcode/detector/QRDetector.cpp b/source/zxing/zxing/qrcode/detector/QRDetector.cpp
index b5ae1f9..e88de3e 100644
--- a/source/zxing/zxing/qrcode/detector/QRDetector.cpp
+++ b/source/zxing/zxing/qrcode/detector/QRDetector.cpp
@@ -30,6 +30,7 @@
 #include <zxing/common/detector/MathUtils.h>
 #include <sstream>
 #include <cstdlib>
+#include <algorithm>
 
 using std::ostringstream;
 using std::abs;