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.

Sign up for GitHub

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

[pull] master from OSGeo:master #149

Merged
merged 4 commits into from
Jan 14, 2025
+26 −2
Merged

[pull] master from OSGeo:master #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1107465
Avoid clang warning in -fsanitize=undefined -O mode (master only)
rouault Jan 13, 2025
2ad0a28
Merge pull request #11646 from rouault/fix_11645
rouault Jan 13, 2025
ff557b8
DOC: configoptions fix ignore-env-var directive
mdsumner Jan 14, 2025
b4ddb34
Merge pull request #11647 from mdsumner/patch-10
rouault Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/source/user/configoptions.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@ or through the ``--config`` command line switch.
The value of environment variables set before GDAL starts will be used instead
of the value set in the configuration files, unless, starting with GDAL 3.6,
the configuration file starts with a ``[directives]`` section that contains a
``ignore-env-variables=yes`` entry.
``ignore-env-vars=yes`` entry.

.. code-block::

[directives]
# ignore environment variables. Take only into account the content of the
# [configoptions] section, or ones defined programmatically with
# CPLSetConfigOption / CPLSetThreadLocalConfigOption.
ignore-env-variables=yes
ignore-env-vars=yes


Starting with GDAL 3.5, a configuration file can also contain credentials
Expand Down
16 changes: 16 additions & 0 deletions gcore/rasterio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5944,6 +5944,11 @@ __attribute__((optimize("tree-vectorize")))
#if defined(__GNUC__)
__attribute__((noinline))
#endif
#if defined(__clang__) && !defined(__INTEL_CLANG_COMPILER)
// clang++ -O2 -fsanitize=undefined fails to vectorize, ignore that warning
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpass-failed"
#endif
static void
GDALInterleave2Byte(const uint8_t *CPL_RESTRICT pSrc,
uint8_t *CPL_RESTRICT pDst, size_t nIters)
Expand All @@ -5957,6 +5962,9 @@ GDALInterleave2Byte(const uint8_t *CPL_RESTRICT pSrc,
pDst[2 * i + 1] = pSrc[i + 1 * nIters];
}
}
#if defined(__clang__) && !defined(__INTEL_CLANG_COMPILER)
#pragma clang diagnostic pop
#endif

#endif

Expand Down Expand Up @@ -6039,6 +6047,11 @@ __attribute__((optimize("tree-vectorize")))
#if defined(__GNUC__)
__attribute__((noinline))
#endif
#if defined(__clang__) && !defined(__INTEL_CLANG_COMPILER)
// clang++ -O2 -fsanitize=undefined fails to vectorize, ignore that warning
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpass-failed"
#endif
static void
GDALInterleave4Byte(const uint8_t *CPL_RESTRICT pSrc,
uint8_t *CPL_RESTRICT pDst, size_t nIters)
Expand All @@ -6054,6 +6067,9 @@ GDALInterleave4Byte(const uint8_t *CPL_RESTRICT pSrc,
pDst[4 * i + 3] = pSrc[i + 3 * nIters];
}
}
#if defined(__clang__) && !defined(__INTEL_CLANG_COMPILER)
#pragma clang diagnostic pop
#endif

#endif

Expand Down
8 changes: 8 additions & 0 deletions gcore/rasterio_ssse3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,11 @@ __attribute__((optimize("tree-vectorize")))
#if defined(__GNUC__)
__attribute__((noinline))
#endif
#if defined(__clang__) && !defined(__INTEL_CLANG_COMPILER)
// clang++ -O2 -fsanitize=undefined fails to vectorize, ignore that warning
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpass-failed"
#endif
static void
GDALInterleave3Byte_SSSE3(const uint8_t *CPL_RESTRICT pSrc,
uint8_t *CPL_RESTRICT pDst, size_t nIters)
Expand All @@ -434,6 +439,9 @@ GDALInterleave3Byte_SSSE3(const uint8_t *CPL_RESTRICT pSrc,
pDst[3 * i + 2] = pSrc[i + 2 * nIters];
}
}
#if defined(__clang__) && !defined(__INTEL_CLANG_COMPILER)
#pragma clang diagnostic pop
#endif

#endif

Expand Down
Loading