368116fb55
== list of removed patches == * 0001-Use-a-patch-file-to-document-changes-from-upstream-s.patch: fixed upstream[1]. * 0002-Update-stb_image_write-from-1.14-to-1.16.patch: fixed upstream. * 0003-Update-stb_image-from-2.25-to-2.27.patch: fixed upstream * 0004-Apply-stb-PR-1223-to-stb_image.patch: "stb_image.h" and "stb_image.patch" were removed upstream[1][2]. * include.patch.0: fixed upstream (added #include <cstdint>)[3]. * zxing_newline.patch: this issue has been fixed since gcc 11.2/12 or later[4]. == list of added patches == * android_include.patch.0: added missing #include <cmath>(for std::abs) * assume.__cpp_lib_string_view.patch.0 (by Caolán McNamara): fixed "error: no member named 'asString' in 'ZXing::ByteArray'" [1]b208f4bd90[2]d2603139c5[3]53da58625d[4] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100392 Change-Id: I6266fd6609f0d4235a8d2bcb6571817ef2135101 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142553 Tested-by: Jenkins Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
26 lines
659 B
Plaintext
26 lines
659 B
Plaintext
--- ./core/src/ByteArray.h 2022-12-05 10:05:07.330193204 +0000
|
|
+++ ./core/src/ByteArray.h 2022-12-05 10:05:13.897892011 +0000
|
|
@@ -11,9 +11,7 @@
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
-#ifdef __cpp_lib_string_view
|
|
#include <string_view>
|
|
-#endif
|
|
|
|
namespace ZXing {
|
|
|
|
@@ -30,12 +28,10 @@
|
|
|
|
void append(const ByteArray& other) { insert(end(), other.begin(), other.end()); }
|
|
|
|
-#ifdef __cpp_lib_string_view
|
|
std::string_view asString(size_t pos = 0, size_t len = std::string_view::npos) const
|
|
{
|
|
return std::string_view(reinterpret_cast<const char*>(data()), size()).substr(pos, len);
|
|
}
|
|
-#endif
|
|
};
|
|
|
|
inline std::string ToHex(const ByteArray& bytes)
|