Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V.200.5 #1744

Merged
merged 35 commits into from
Aug 1, 2024
Merged

V.200.5 #1744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a45eed6
version upgrade (#1702)
jared-2016 Apr 11, 2024
b40ca9e
Add additional permission for testing purposes. (#1703)
JamesMBallard Apr 23, 2024
3e85776
QFuturize EditFeatureAttachments and Geotriggers sample (#1704)
aji13187 May 16, 2024
9d0201d
Let the implicit sizing handle displaying the button. (#1705)
bri12415 May 20, 2024
a254a04
Jared/remove extras dependency (#1707)
jared-2016 May 22, 2024
e155a75
Revert "Jared/remove extras dependency (#1707)" (#1709)
jared-2016 May 23, 2024
55ab217
Jared/lets try to merge (#1710)
jared-2016 May 24, 2024
0a84848
Update tile source (#1711)
tanneryould May 30, 2024
2562720
Jared/re org no qml sample app (#1712)
jared-2016 Jun 5, 2024
10602e2
Updated for Qt6.5.6 (#1715)
aji13187 Jun 5, 2024
8bc09fd
qml samples removed. (#1716)
jared-2016 Jun 6, 2024
461cefd
Create Dynamic Basemap Gallery sample (#1714)
AndrewBladon Jun 10, 2024
559aac5
Revert "Create Dynamic Basemap Gallery sample (#1714)" (#1718)
ldanzinger Jun 10, 2024
b5ace56
Adding Snap geometry edits sample (#1706)
har13205 Jun 11, 2024
8b0ee71
Dynamic Basemap Gallery (fixed) (#1719)
AndrewBladon Jun 11, 2024
067f3af
change folder (#1720)
har13205 Jun 11, 2024
3d73267
Add BasemapStyleListModel to qrc (#1721)
AndrewBladon Jun 13, 2024
884bf3f
Update for LoadableImage disk path (#1722)
aji13187 Jun 20, 2024
9e5a831
Jared/sample download when offline (#1725)
jared-2016 Jun 25, 2024
d9f2936
fix to partial data download issue (#1724)
har13205 Jun 25, 2024
fd9e591
minor samples repo doc update. (#1717)
jared-2016 Jun 25, 2024
527e6fa
Fixing reachability implementation in samples (#1726)
jared-2016 Jun 26, 2024
5c7e3b5
Fix build number oddities and compiler warning (#1727)
JamesMBallard Jul 2, 2024
c419ee3
api key changes (#1723)
ldanzinger Jul 3, 2024
6a2a777
fix sample names (#1729)
GuillaumeBelz Jul 5, 2024
e26683a
Jared/qml cleanup (#1728)
jared-2016 Jul 8, 2024
f4a9228
add branch in github action (#1731)
GuillaumeBelz Jul 9, 2024
fe4593b
Jared/api key to access token (#1733)
jared-2016 Jul 9, 2024
3225e46
change qAsConst to std::as_const (#1734)
GuillaumeBelz Jul 10, 2024
fa800b4
I think this is it. (#1735)
jared-2016 Jul 11, 2024
615b7a1
updating samples with reticle (#1736)
ldanzinger Jul 15, 2024
9165df7
James/restore ls samples (#1740)
JamesMBallard Jul 23, 2024
e2496ac
Bri12415/display device perm check (#1738)
bri12415 Jul 23, 2024
bed672d
Bri12415/display device location fix (#1742)
bri12415 Jul 25, 2024
152e44a
Merge branch 'main' into v.200.5
ldanzinger Jul 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,10 @@ Desktop.ini
ehthumbs.db
Thumbs.db

*.user.2.7pre1
# ignore all build directories

*build*
.qmake.stash
*Makefile*
.qtc_clangd
mocinclude.opt
17 changes: 17 additions & 0 deletions 3rdparty/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Condition of use and distribution are the same as zlib:

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.

Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgement in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
19 changes: 19 additions & 0 deletions 3rdparty/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
(C) 1995-2013 Jean-loup Gailly and Mark Adler

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.

Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.

2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.

3. This notice may not be removed or altered from any source distribution.
115 changes: 115 additions & 0 deletions 3rdparty/adler32.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
/* adler32.c -- compute the Adler-32 checksum of a data stream
* Copyright (C) 1995-2011, 2016 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/

#include "zbuild.h"
#include "functable.h"
#include "adler32_p.h"

/* ========================================================================= */
Z_INTERNAL uint32_t adler32_c(uint32_t adler, const uint8_t *buf, size_t len) {
uint32_t sum2;
unsigned n;

/* split Adler-32 into component sums */
sum2 = (adler >> 16) & 0xffff;
adler &= 0xffff;

/* in case user likes doing a byte at a time, keep it fast */
if (UNLIKELY(len == 1))
return adler32_len_1(adler, buf, sum2);

/* initial Adler-32 value (deferred check for len == 1 speed) */
if (UNLIKELY(buf == NULL))
return 1L;

/* in case short lengths are provided, keep it somewhat fast */
if (UNLIKELY(len < 16))
return adler32_len_16(adler, buf, len, sum2);

/* do length NMAX blocks -- requires just one modulo operation */
while (len >= NMAX) {
len -= NMAX;
#ifdef UNROLL_MORE
n = NMAX / 16; /* NMAX is divisible by 16 */
#else
n = NMAX / 8; /* NMAX is divisible by 8 */
#endif
do {
#ifdef UNROLL_MORE
DO16(adler, sum2, buf); /* 16 sums unrolled */
buf += 16;
#else
DO8(adler, sum2, buf, 0); /* 8 sums unrolled */
buf += 8;
#endif
} while (--n);
adler %= BASE;
sum2 %= BASE;
}

/* do remaining bytes (less than NMAX, still just one modulo) */
return adler32_len_64(adler, buf, len, sum2);
}

#ifdef ZLIB_COMPAT
unsigned long Z_EXPORT PREFIX(adler32_z)(unsigned long adler, const unsigned char *buf, size_t len) {
return (unsigned long)functable.adler32((uint32_t)adler, buf, len);
}
#else
uint32_t Z_EXPORT PREFIX(adler32_z)(uint32_t adler, const unsigned char *buf, size_t len) {
return functable.adler32(adler, buf, len);
}
#endif

/* ========================================================================= */
#ifdef ZLIB_COMPAT
unsigned long Z_EXPORT PREFIX(adler32)(unsigned long adler, const unsigned char *buf, unsigned int len) {
return (unsigned long)functable.adler32((uint32_t)adler, buf, len);
}
#else
uint32_t Z_EXPORT PREFIX(adler32)(uint32_t adler, const unsigned char *buf, uint32_t len) {
return functable.adler32(adler, buf, len);
}
#endif

/* ========================================================================= */
static uint32_t adler32_combine_(uint32_t adler1, uint32_t adler2, z_off64_t len2) {
uint32_t sum1;
uint32_t sum2;
unsigned rem;

/* for negative len, return invalid adler32 as a clue for debugging */
if (len2 < 0)
return 0xffffffff;

/* the derivation of this formula is left as an exercise for the reader */
len2 %= BASE; /* assumes len2 >= 0 */
rem = (unsigned)len2;
sum1 = adler1 & 0xffff;
sum2 = rem * sum1;
sum2 %= BASE;
sum1 += (adler2 & 0xffff) + BASE - 1;
sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
if (sum1 >= BASE) sum1 -= BASE;
if (sum1 >= BASE) sum1 -= BASE;
if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1);
if (sum2 >= BASE) sum2 -= BASE;
return sum1 | (sum2 << 16);
}

/* ========================================================================= */
#ifdef ZLIB_COMPAT
unsigned long Z_EXPORT PREFIX(adler32_combine)(unsigned long adler1, unsigned long adler2, z_off_t len2) {
return (unsigned long)adler32_combine_((uint32_t)adler1, (uint32_t)adler2, len2);
}

unsigned long Z_EXPORT PREFIX4(adler32_combine)(unsigned long adler1, unsigned long adler2, z_off64_t len2) {
return (unsigned long)adler32_combine_((uint32_t)adler1, (uint32_t)adler2, len2);
}
#else
uint32_t Z_EXPORT PREFIX4(adler32_combine)(uint32_t adler1, uint32_t adler2, z_off64_t len2) {
return adler32_combine_(adler1, adler2, len2);
}
#endif
16 changes: 16 additions & 0 deletions 3rdparty/adler32_fold.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/* adler32_fold.c -- adler32 folding interface
* Copyright (C) 2022 Adam Stylinski
* For conditions of distribution and use, see copyright notice in zlib.h
*/

#include "zbuild.h"
#include "functable.h"
#include "adler32_fold.h"

#include <limits.h>

Z_INTERNAL uint32_t adler32_fold_copy_c(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len) {
adler = functable.adler32(adler, src, len);
memcpy(dst, src, len);
return adler;
}
11 changes: 11 additions & 0 deletions 3rdparty/adler32_fold.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/* adler32_fold.h -- adler32 folding interface
* Copyright (C) 2022 Adam Stylinski
* For conditions of distribution and use, see copyright notice in zlib.h
*/

#ifndef ADLER32_FOLD_H_
#define ADLER32_FOLD_H_

Z_INTERNAL uint32_t adler32_fold_copy_c(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len);

#endif
70 changes: 70 additions & 0 deletions 3rdparty/adler32_p.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/* adler32_p.h -- Private inline functions and macros shared with
* different computation of the Adler-32 checksum
* of a data stream.
* Copyright (C) 1995-2011, 2016 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/

#ifndef ADLER32_P_H
#define ADLER32_P_H

#define BASE 65521U /* largest prime smaller than 65536 */
#define NMAX 5552
/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */

#define DO1(sum1, sum2, buf, i) {(sum1) += buf[(i)]; (sum2) += (sum1);}
#define DO2(sum1, sum2, buf, i) {DO1(sum1, sum2, buf, i); DO1(sum1, sum2, buf, i+1);}
#define DO4(sum1, sum2, buf, i) {DO2(sum1, sum2, buf, i); DO2(sum1, sum2, buf, i+2);}
#define DO8(sum1, sum2, buf, i) {DO4(sum1, sum2, buf, i); DO4(sum1, sum2, buf, i+4);}
#define DO16(sum1, sum2, buf) {DO8(sum1, sum2, buf, 0); DO8(sum1, sum2, buf, 8);}

static inline uint32_t adler32_len_1(uint32_t adler, const uint8_t *buf, uint32_t sum2) {
adler += buf[0];
adler %= BASE;
sum2 += adler;
sum2 %= BASE;
return adler | (sum2 << 16);
}

static inline uint32_t adler32_len_16(uint32_t adler, const uint8_t *buf, size_t len, uint32_t sum2) {
while (len) {
--len;
adler += *buf++;
sum2 += adler;
}
adler %= BASE;
sum2 %= BASE; /* only added so many BASE's */
/* return recombined sums */
return adler | (sum2 << 16);
}

static inline uint32_t adler32_copy_len_16(uint32_t adler, const uint8_t *buf, uint8_t *dst, size_t len, uint32_t sum2) {
while (len--) {
*dst = *buf++;
adler += *dst++;
sum2 += adler;
}
adler %= BASE;
sum2 %= BASE; /* only added so many BASE's */
/* return recombined sums */
return adler | (sum2 << 16);
}

static inline uint32_t adler32_len_64(uint32_t adler, const uint8_t *buf, size_t len, uint32_t sum2) {
#ifdef UNROLL_MORE
while (len >= 16) {
len -= 16;
DO16(adler, sum2, buf);
buf += 16;
#else
while (len >= 8) {
len -= 8;
DO8(adler, sum2, buf, 0);
buf += 8;
#endif
}
/* Process tail (len < 16). */
return adler32_len_16(adler, buf, len, sum2);
}

#endif /* ADLER32_P_H */
42 changes: 42 additions & 0 deletions 3rdparty/chunkset.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/* chunkset.c -- inline functions to copy small data chunks.
* For conditions of distribution and use, see copyright notice in zlib.h
*/

#include "zbuild.h"

typedef uint64_t chunk_t;

#define CHUNK_SIZE 8

#define HAVE_CHUNKMEMSET_4
#define HAVE_CHUNKMEMSET_8

static inline void chunkmemset_4(uint8_t *from, chunk_t *chunk) {
uint8_t *dest = (uint8_t *)chunk;
memcpy(dest, from, sizeof(uint32_t));
memcpy(dest+4, from, sizeof(uint32_t));
}

static inline void chunkmemset_8(uint8_t *from, chunk_t *chunk) {
memcpy(chunk, from, sizeof(uint64_t));
}

static inline void loadchunk(uint8_t const *s, chunk_t *chunk) {
memcpy(chunk, (uint8_t *)s, sizeof(uint64_t));
}

static inline void storechunk(uint8_t *out, chunk_t *chunk) {
memcpy(out, chunk, sizeof(uint64_t));
}

#define CHUNKSIZE chunksize_c
#define CHUNKCOPY chunkcopy_c
#define CHUNKUNROLL chunkunroll_c
#define CHUNKMEMSET chunkmemset_c
#define CHUNKMEMSET_SAFE chunkmemset_safe_c

#include "chunkset_tpl.h"

#define INFLATE_FAST inflate_fast_c

#include "inffast_tpl.h"
Loading
Loading