mirror of
https://github.com/status-im/qzxing.git
synced 2025-01-12 12:04:36 +00:00
WinRt (and Windows Phone) compilation fixes. std::Min and std::Max are in algorithm header.
This commit is contained in:
parent
45aa03fdca
commit
4ad07d7cb3
@ -291,3 +291,6 @@ win32-g++{
|
|||||||
!win32{
|
!win32{
|
||||||
DEFINES += NO_ICONV
|
DEFINES += NO_ICONV
|
||||||
}
|
}
|
||||||
|
winrt {
|
||||||
|
DEFINES += NO_ICONV
|
||||||
|
}
|
||||||
|
@ -35,7 +35,6 @@ private:
|
|||||||
ArrayRef<char> rawBytes_;
|
ArrayRef<char> rawBytes_;
|
||||||
ArrayRef< Ref<ResultPoint> > resultPoints_;
|
ArrayRef< Ref<ResultPoint> > resultPoints_;
|
||||||
BarcodeFormat format_;
|
BarcodeFormat format_;
|
||||||
//NOTE: My
|
|
||||||
std::string charSet_;
|
std::string charSet_;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
@ -46,7 +46,6 @@ public:
|
|||||||
|
|
||||||
ArrayRef<char> getRawBytes();
|
ArrayRef<char> getRawBytes();
|
||||||
Ref<String> getText();
|
Ref<String> getText();
|
||||||
// NOTE: my
|
|
||||||
std::string charSet();
|
std::string charSet();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include <zxing/NotFoundException.h>
|
#include <zxing/NotFoundException.h>
|
||||||
#include <zxing/common/detector/MonochromeRectangleDetector.h>
|
#include <zxing/common/detector/MonochromeRectangleDetector.h>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
using std::vector;
|
using std::vector;
|
||||||
using zxing::Ref;
|
using zxing::Ref;
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
#include <zxing/NotFoundException.h>
|
#include <zxing/NotFoundException.h>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
using std::abs;
|
using std::abs;
|
||||||
using zxing::Ref;
|
using zxing::Ref;
|
||||||
|
@ -26,6 +26,7 @@
|
|||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
using std::vector;
|
using std::vector;
|
||||||
using std::string;
|
using std::string;
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
#include <zxing/ChecksumException.h>
|
#include <zxing/ChecksumException.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
using std::vector;
|
using std::vector;
|
||||||
using zxing::Ref;
|
using zxing::Ref;
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include <zxing/NotFoundException.h>
|
#include <zxing/NotFoundException.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
using std::vector;
|
using std::vector;
|
||||||
using zxing::Ref;
|
using zxing::Ref;
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
#include <algorithm>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <zxing/pdf417/detector/Detector.h>
|
#include <zxing/pdf417/detector/Detector.h>
|
||||||
#include <zxing/pdf417/detector/LinesSampler.h>
|
#include <zxing/pdf417/detector/LinesSampler.h>
|
||||||
|
@ -30,6 +30,7 @@
|
|||||||
#include <zxing/common/detector/MathUtils.h>
|
#include <zxing/common/detector/MathUtils.h>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
using std::ostringstream;
|
using std::ostringstream;
|
||||||
using std::abs;
|
using std::abs;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user