Skip to content

Commit

Permalink
V.200.5 (#1744)
Browse files Browse the repository at this point in the history
* version upgrade (#1702)

* version upgrade

* few stragglers

* Add additional permission for testing purposes. (#1703)

* QFuturize EditFeatureAttachments and Geotriggers sample (#1704)

* QFuturize EditFeatureAttachments and Geotriggers sample

* comment updated.

* Update ArcGISRuntimeSDKQt_CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.cpp

Co-authored-by: James Ballard <[email protected]>

* review comment fixed

* Review comment fixed.

* self review

* review comment fixed

* review comment fixed

---------

Co-authored-by: James Ballard <[email protected]>

* Let the implicit sizing handle displaying the button. (#1705)

* Jared/remove extras dependency (#1707)

* extras dependency removed and sample app still builds, and runs without the ability to download data.

* samples download and unzip with the replacement zlib-ng/minizip-ng. testing unzip on other platforms.

* zlib-ng/minizip-ng

* zconf.h before cmake generation

* updates

* update to pro

* fix paths for storing data

* first pass of cleanup. Needs another pass and condensing of extras api moved into the sampleviewer.

* not sure how these were getting pickedup in the includepath but this is fixed now.

* files no longer needed.

* updated to have a constructor that sets the path rather than having to call setPath after it has been created.

* Almost ready for review. Quick test on windows.

* reog

* put it back

* no longer needed.

* update.

* QML stuff no longer needed.

* Disabling since we don't need it to build.

* no longer needed.

* undoing changes no longer needed.

* remove build folder and other remnants.

* remove build folder from minizip-ng

* Lots of files not needed for zlib-ng/minizip-ng. Reducing to whats necessary.

* moving this back.

* moved zlib, minizip, and helper file into it's own pri

* Update ArcGISRuntimeSDKQt_SampleViewers/ArcGISRuntimeSDKQt_CppSamples/ZipHelper.h

Co-authored-by: James Ballard <[email protected]>

* pr feedback.

* pr feedback.

* cleaned up a little.

* little more condensing.

* cleanup.

* rogue parentheses

* reduced zlib-ng files

* forward declare.

* adding ignore for all build directories.

* Testing to see if we really need this. This call into zlib-ng/minizip-ng which requires us to include mz_crypt currently.

* this seems to be the only way to read a zip file which is needed by our ZipHelper to properly unzip an archive. Oh well.

---------

Co-authored-by: James Ballard <[email protected]>

* Revert "Jared/remove extras dependency (#1707)" (#1709)

This reverts commit a254a04.

* Jared/lets try to merge (#1710)

* Revert "Revert "Jared/remove extras dependency (#1707)" (#1709)"

This reverts commit e155a75.

* pch was being compiled with C which we didn't want.

* need to keep qml until devops can remove the qml sample build from their scripts.

* we want qml to build but need it to not use the same entrypoint, ugly but it does what it needs to do.

* These should be quotes and not angle brackets

* putting this back.

* Revert "Revert "Jared/remove extras dependency (#1707)" (#1709)"

This reverts commit e155a75.

* Switch paths to bypass path issues on Windows.

* removing duplicates.

* duplicates.

* Removing comments.

* review comment

---------

Co-authored-by: James Ballard <[email protected]>

* Update tile source (#1711)

* Jared/re org no qml sample app (#1712)

* remove qml sample viewer. Reorganize and rename.

* when using relative paths we need to remove one level as the Samples app moved up a directory

* Reduce ArcGISRuntimeSDKQt_Samples -> SampleViewer

* rename and update contents of .pro and .rc

* rename samples folders to be less verbose.

* remove qml template folder. Rename existing folders to be less verbose and to ahead to CamelCase like we do everywhere else in the repo.

* location of samples changed.

* Revert "rename samples folders to be less verbose."

This reverts commit 207849a.

* move for Widgets

* move CppSamples

* simplification, no longer support 32-bit builds of windows.

* path was incorrect.

* Updated for Qt6.5.6 (#1715)

* qml samples removed. (#1716)

Goodbeye QML Samples, we will miss you.

* Create Dynamic Basemap Gallery sample (#1714)

* Revert "Create Dynamic Basemap Gallery sample (#1714)" (#1718)

This reverts commit 461cefd.

* Adding Snap geometry edits sample (#1706)

* Dynamic Basemap Gallery (fixed) (#1719)

* change folder (#1720)

* Add BasemapStyleListModel to qrc (#1721)

* Update for LoadableImage disk path (#1722)

* Update for LoadableImage disk path

* review comment fixed

* Update CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp

Co-authored-by: James Ballard <[email protected]>

* Update CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp

Co-authored-by: James Ballard <[email protected]>

* Update CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp

Co-authored-by: James Ballard <[email protected]>

* Update BasemapStyleListModel.cpp

removed const.

---------

Co-authored-by: James Ballard <[email protected]>

* Jared/sample download when offline (#1725)

* minor samples repo doc update.

* I remember my confusion from before. I still don't know why or how this ever worked before.

* fix to partial data download issue (#1724)

* minor samples repo doc update. (#1717)

* minor samples repo doc update.

* no need to specify c++.

* duplicate text

* Fixing reachability implementation in samples (#1726)

* didn't realize I missed part of the port required for Reachability to work. Needs to be loaded. Reverting other changes.

* typo

* tabbing fix.

* Fix build number oddities and compiler warning (#1727)

* Fix strange build number parsing, maybe.

* Fix unrelated build warnings:
warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
const int CreateDynamicBasemapGallery::indexOfSelectedStyle() const

* api key changes (#1723)

* api key changes

* Update FindAddress.cpp

* Update FindPlace.cpp

* Update README.md

* Update ReverseGeocodeOnline.cpp

* Update FindAddress.cpp

* fix sample names (#1729)

* Jared/qml cleanup (#1728)

* rename

* ifdefs removed.

* remove qml auth view and rename cppauthenticationview

* remove api from title.

* no longer applicable. Reduced down to just the one authentication view.

* using an alias since using our own AuthenticationView ontop of the toolkits was giving a warning.

* no longer being used.

* last little bit of clean up

* add branch in github action (#1731)

* Jared/api key to access token (#1733)

* find and replace with updated access token.

* odd man out disabled setting the API key. There is no comment explaining why so im guessing this was a mistake but I wanted to make a note.

* apikey replace with token access

* remove forward declare of helper.

* helper removed.

* remove excess trailing new lines from earlier find and replace.

* catching a few stragglers

* unification across all samples.

* renamed all samples when running standalone to remove the ` - C++` to the application name. Also unified the formatting to what the templates currently have.

* forgot to commit the rest of the files. Same comment as the previous commit.

* templates updated to remove the helper and for qquickitem samples, to remove ` - C++` from the sample name.

* I always forget good old widgets.

* change qAsConst to std::as_const (#1734)

* I think this is it. (#1735)

* updating samples with reticle (#1736)

* updating samples with reticle

* Update CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.cpp

Co-authored-by: James Ballard <[email protected]>

---------

Co-authored-by: James Ballard <[email protected]>

* James/restore ls samples (#1740)

* Restore the local server samples.

* There is no more base class.
Remove virtual.

* Const correctness.
Don't shadow vars.

* Bri12415/display device perm check (#1738)

* Use QPermissions API to request Location permissions.

* Update qml with dialog popup to inform user of denied permissions.

* Update info.plist with permissions entries.

* James PR: Provide explicit parameters for Accuracy and Availability on the requested location permissions.

* QPermission(s) not QPermission

* Add work around for permissions API qt bug https://bugreports.qt.io/browse/QTBUG-116178

* Bri12415/display device location fix (#1742)

* Replace deprecated plist entry and add whenInUse entry for ios DisplayDeviceLocation

* Add Info.plist for mac DisplayDeviceLocation for location permissions entries

* Add location permission entries to SampleViewer mac/info.plist

* Modify SampleViewer/mac/info.plist

* Remove old ios info.plist from DisplayDeviceLocation

* Add permission entry for ios/Info.plist

---------

Co-authored-by: Jared Caccamo <[email protected]>
Co-authored-by: James Ballard <[email protected]>
Co-authored-by: Ajith Challiyil Pulakkatuthodi <[email protected]>
Co-authored-by: Brian Noble <[email protected]>
Co-authored-by: James Ballard <[email protected]>
Co-authored-by: Tanner Yould <[email protected]>
Co-authored-by: Andrew Bladon <[email protected]>
Co-authored-by: Harini Chaganti <[email protected]>
Co-authored-by: Guillaume Belz <[email protected]>
  • Loading branch information
10 people authored Aug 1, 2024
1 parent fccfd4a commit e46be5e
Show file tree
Hide file tree
Showing 5,925 changed files with 71,810 additions and 160,356 deletions.
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

0 comments on commit e46be5e

Please sign in to comment.