[Git][debian-gis-team/qgis][master] 5 commits: New upstream version 2.18.26+dfsg
Bas Couwenberg
gitlab at salsa.debian.org
Fri Nov 23 17:57:50 GMT 2018
Bas Couwenberg pushed to branch master at Debian GIS Project / qgis
Commits:
686ac27f by Bas Couwenberg at 2018-11-23T15:16:50Z
New upstream version 2.18.26+dfsg
- - - - -
30d59630 by Bas Couwenberg at 2018-11-23T15:20:00Z
Merge tag 'upstream/2.18.26+dfsg'
Upstream version 2.18.26+dfsg
- - - - -
de7272bb by Bas Couwenberg at 2018-11-23T15:30:30Z
New upstream release.
- - - - -
749ad1e3 by Bas Couwenberg at 2018-11-23T16:50:15Z
Update symbols for amd64.
- - - - -
5bab0f48 by Bas Couwenberg at 2018-11-23T16:50:16Z
Set distribution to experimental.
- - - - -
23 changed files:
- CMakeLists.txt
- ChangeLog
- debian/changelog
- debian/control
- debian/libqgis-analysis2.18.25.install → debian/libqgis-analysis2.18.26.install
- debian/libqgis-analysis2.18.25.symbols → debian/libqgis-analysis2.18.26.symbols
- debian/libqgis-app2.18.25.install → debian/libqgis-app2.18.26.install
- debian/libqgis-app2.18.25.symbols → debian/libqgis-app2.18.26.symbols
- debian/libqgis-core2.18.25.install → debian/libqgis-core2.18.26.install
- debian/libqgis-core2.18.25.symbols → debian/libqgis-core2.18.26.symbols
- debian/libqgis-gui2.18.25.install → debian/libqgis-gui2.18.26.install
- debian/libqgis-gui2.18.25.symbols → debian/libqgis-gui2.18.26.symbols
- debian/libqgis-networkanalysis2.18.25.install → debian/libqgis-networkanalysis2.18.26.install
- debian/libqgis-networkanalysis2.18.25.symbols → debian/libqgis-networkanalysis2.18.26.symbols
- debian/libqgis-server2.18.25.install → debian/libqgis-server2.18.26.install
- debian/libqgis-server2.18.25.symbols → debian/libqgis-server2.18.26.symbols
- debian/libqgisgrass7-2.18.25.install → debian/libqgisgrass7-2.18.26.install
- debian/libqgisgrass7-2.18.25.lintian-overrides → debian/libqgisgrass7-2.18.26.lintian-overrides
- debian/libqgisgrass7-2.18.25.symbols → debian/libqgisgrass7-2.18.26.symbols
- debian/libqgispython2.18.25.install → debian/libqgispython2.18.26.install
- debian/libqgispython2.18.25.symbols → debian/libqgispython2.18.26.symbols
- src/core/symbology-ng/qgsfillsymbollayerv2.cpp
- src/providers/oracle/ocispatial/qsql_ocispatial.cpp
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -1,6 +1,6 @@
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "18")
-SET(CPACK_PACKAGE_VERSION_PATCH "25")
+SET(CPACK_PACKAGE_VERSION_PATCH "26")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
SET(RELEASE_NAME "Las Palmas")
IF (POLICY CMP0048) # in CMake 3.0.0+
=====================================
ChangeLog
=====================================
@@ -1,3 +1,40 @@
+rldhont <rldhont at gmail.com> 2018-11-16
+
+ [Bugfix][Symbology] Fill to SLD does not export Stroke color
+
+ The commit 2f268d4747c355a48fcadb2c55d58a06d848cffa fixing the way SLD is exporting size, from mm to pixels. But in the case of exporting line to SLD the stroke color has not been preserved.
+
+Merge: cbd7adecf2 0e066db97b
+rldhont <rldhont at gmail.com> 2018-11-02
+
+ Merge pull request #8387 from rldhont/bjornhartell-oci-fix-218
+
+ [oracle] Prefetch memory variable changed to 32-bit and default raised to 8MB
+
+Björn Harrtell <bjorn at wololo.org> 2018-10-31
+
+ [oracle] Remove meaningless conditional and improve user input handling
+
+ (cherry-pick from commit 4ab377b)
+
+ Author : Björn Harrtell <bjorn at wololo.org>
+ Date : Wed Oct 31 14:45:37 2018 +0100
+
+Björn Harrtell <bjorn at wololo.org> 2018-10-29
+
+ [oracle] Prefetch memory variable changed to 32-bit and default raised to 8MB
+
+ Speeds up oracle table access by orders of magnitude
+
+ (cherry-pick from commit c3e7632)
+
+ Author : Björn Harrtell <bjorn at wololo.org>
+ Date : Mon Oct 29 21:27:46 2018 +0100
+
+Juergen E. Fischer <jef at norbit.de> 2018-10-26
+
+ Release of 2.18.25
+
Merge: 75a170dfb0 81f4bdbe88
rldhont <rldhont at gmail.com> 2018-10-26
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+qgis (2.18.26+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.18.26
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 23 Nov 2018 16:31:32 +0100
+
qgis (2.18.25+dfsg-1) unstable; urgency=medium
* Update symbols for other architectures.
=====================================
debian/control
=====================================
@@ -111,7 +111,7 @@ Description: QGIS - architecture-independent data
This package contains architecture-independent supporting data files for use
with QGIS.
-Package: libqgis-app2.18.25
+Package: libqgis-app2.18.26
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -122,7 +122,7 @@ Description: QGIS - shared app library
.
This package contains the shared app library.
-Package: libqgis-core2.18.25
+Package: libqgis-core2.18.26
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -133,7 +133,7 @@ Description: QGIS - shared core library
.
This package contains the shared core library.
-Package: libqgis-gui2.18.25
+Package: libqgis-gui2.18.26
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -144,7 +144,7 @@ Description: QGIS - shared gui library
.
This package contains the shared gui library.
-Package: libqgis-analysis2.18.25
+Package: libqgis-analysis2.18.26
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -155,7 +155,7 @@ Description: QGIS - shared analysis library
.
This package contains the shared analysis library.
-Package: libqgis-networkanalysis2.18.25
+Package: libqgis-networkanalysis2.18.26
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -166,7 +166,7 @@ Description: QGIS - shared network analysis library
.
This package contains the shared network analysis library.
-Package: libqgisgrass7-2.18.25
+Package: libqgisgrass7-2.18.26
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -177,7 +177,7 @@ Description: QGIS - shared grass library
.
This package contains the shared grass library.
-Package: libqgispython2.18.25
+Package: libqgispython2.18.26
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -208,7 +208,7 @@ Description: QGIS custom widgets for Qt Designer
.
This package contains a library to use specific QGIS widgets in Qt Designer.
-Package: libqgis-server2.18.25
+Package: libqgis-server2.18.26
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -229,14 +229,14 @@ Depends: grass-dev (>= 7.4.0),
libgsl-dev,
libpq-dev,
libproj-dev,
- libqgis-app2.18.25 (= ${binary:Version}),
- libqgis-core2.18.25 (= ${binary:Version}),
- libqgis-gui2.18.25 (= ${binary:Version}),
- libqgis-analysis2.18.25 (= ${binary:Version}),
- libqgis-networkanalysis2.18.25 (= ${binary:Version}),
- libqgis-server2.18.25 (= ${binary:Version}),
- libqgisgrass7-2.18.25 (= ${binary:Version}),
- libqgispython2.18.25 (= ${binary:Version}),
+ libqgis-app2.18.26 (= ${binary:Version}),
+ libqgis-core2.18.26 (= ${binary:Version}),
+ libqgis-gui2.18.26 (= ${binary:Version}),
+ libqgis-analysis2.18.26 (= ${binary:Version}),
+ libqgis-networkanalysis2.18.26 (= ${binary:Version}),
+ libqgis-server2.18.26 (= ${binary:Version}),
+ libqgisgrass7-2.18.26 (= ${binary:Version}),
+ libqgispython2.18.26 (= ${binary:Version}),
libqt4-dev (>= 4.7.0),
libsqlite3-dev,
python-qt4 (>= 4.1.0),
@@ -343,7 +343,7 @@ Depends: python-qgis-common (= ${source:Version}),
python-six,
python-tz,
python-yaml,
- libqgispython2.18.25,
+ libqgispython2.18.26,
${shlibs:Depends},
${python:Depends},
${misc:Depends},
=====================================
debian/libqgis-analysis2.18.25.install → debian/libqgis-analysis2.18.26.install
=====================================
=====================================
debian/libqgis-analysis2.18.25.symbols → debian/libqgis-analysis2.18.26.symbols
=====================================
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 2.18.25 arm64 armel armhf i386 m68k mips powerpc ppc64 ppc64el s390x x32
-libqgis_analysis.so.2.18.25 #PACKAGE# #MINVER#
+libqgis_analysis.so.2.18.26 #PACKAGE# #MINVER#
* Build-Depends-Package: libqgis-dev
_ZN12TriDecorator10calcNormalEddP8Vector3D at Base 2.0.1
_ZN12TriDecorator11getTriangleEddP7Point3DPiS1_S2_S1_S2_ at Base 2.0.1
=====================================
debian/libqgis-app2.18.25.install → debian/libqgis-app2.18.26.install
=====================================
=====================================
debian/libqgis-app2.18.25.symbols → debian/libqgis-app2.18.26.symbols
=====================================
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 2.18.25 i386
-libqgis_app.so.2.18.25 #PACKAGE# #MINVER#
+libqgis_app.so.2.18.26 #PACKAGE# #MINVER#
* Build-Depends-Package: libqgis-dev
(optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !x32)_Z10qDeleteAllI5QListIPN13QFormInternal11DomPropertyEEEvRKT_ at Base 2.14.18
(optional=templinst)_Z13qvariant_castI26QUiTranslatableStringValueET_RK8QVariant at Base 2.14.0
=====================================
debian/libqgis-core2.18.25.install → debian/libqgis-core2.18.26.install
=====================================
=====================================
debian/libqgis-core2.18.25.symbols → debian/libqgis-core2.18.26.symbols
=====================================
@@ -1,5 +1,5 @@
-# SymbolsHelper-Confirmed: 2.18.25 armel armhf i386 m68k mips powerpc
-libqgis_core.so.2.18.25 #PACKAGE# #MINVER#
+# SymbolsHelper-Confirmed: 2.18.26 amd64
+libqgis_core.so.2.18.26 #PACKAGE# #MINVER#
* Build-Depends-Package: libqgis-dev
GEOPROJ4 at Base 2.0.1
GEOWKT at Base 2.0.1
@@ -14,6 +14,7 @@ libqgis_core.so.2.18.25 #PACKAGE# #MINVER#
(subst)_Z9qgsCalloc{size_t}{size_t}@Base 2.14.0
(subst)_Z9qgsMalloc{size_t}@Base 2.14.0
_ZN10QgsClipper14clippedLineWKBER14QgsConstWkbPtrRK12QgsRectangleR9QPolygonF at Base 2.18.17
+ _ZN10QgsClipper15clipLineSegmentEddddRdS0_S0_S0_ at Base 2.18.26
_ZN10QgsClipper21connectSeparatedLinesEddddRK12QgsRectangleR9QPolygonF at Base 2.0.1
(arch=mips mipsel)_ZN10QgsClipper21trimPolygonToBoundaryERK9QPolygonFRS0_RK12QgsRectangleNS_8BoundaryEd at Base 2.18.23
_ZN10QgsClipper5MAX_XE at Base 2.0.1
@@ -1157,36 +1158,36 @@ libqgis_core.so.2.18.25 #PACKAGE# #MINVER#
_ZN14QgsApplication15activeThemePathEv at Base 2.0.1
_ZN14QgsApplication15authorsFilePathEv at Base 2.0.1
_ZN14QgsApplication15licenceFilePathEv at Base 2.0.1
- _ZN14QgsApplication15mThemeName21825E at Base 2.18.25
+ _ZN14QgsApplication15mThemeName21826E at Base 2.18.26
_ZN14QgsApplication15settingsChangedEv at Base 2.14.5
_ZN14QgsApplication15shortNameRegExpEv at Base 2.14.0
_ZN14QgsApplication15userStyleV2PathEv at Base 2.0.1
_ZN14QgsApplication16defaultThemePathEv at Base 2.0.1
- _ZN14QgsApplication16mConfigPath21825E at Base 2.18.25
- _ZN14QgsApplication16mMaxThreads21825E at Base 2.18.25
- _ZN14QgsApplication16mPluginPath21825E at Base 2.18.25
- _ZN14QgsApplication16mPrefixPath21825E at Base 2.18.25
+ _ZN14QgsApplication16mConfigPath21826E at Base 2.18.26
+ _ZN14QgsApplication16mMaxThreads21826E at Base 2.18.26
+ _ZN14QgsApplication16mPluginPath21826E at Base 2.18.26
+ _ZN14QgsApplication16mPrefixPath21826E at Base 2.18.26
_ZN14QgsApplication16reportStyleSheetEv at Base 2.0.1
_ZN14QgsApplication16setAuthDbDirPathERK7QString at Base 2.14.0
_ZN14QgsApplication16sponsorsFilePathEv at Base 2.0.1
_ZN14QgsApplication16staticMetaObjectE at Base 2.0.1
_ZN14QgsApplication16userThemesFolderEv at Base 2.14.0
_ZN14QgsApplication17createThemeFolderEv at Base 2.14.0
- _ZN14QgsApplication17mLibexecPath21825E at Base 2.18.25
- _ZN14QgsApplication17mLibraryPath21825E at Base 2.18.25
- _ZN14QgsApplication17mPkgDataPath21825E at Base 2.18.25
- _ZN14QgsApplication17mUIThemeName21825E at Base 2.18.25
+ _ZN14QgsApplication17mLibexecPath21826E at Base 2.18.26
+ _ZN14QgsApplication17mLibraryPath21826E at Base 2.18.26
+ _ZN14QgsApplication17mPkgDataPath21826E at Base 2.18.26
+ _ZN14QgsApplication17mUIThemeName21826E at Base 2.18.26
_ZN14QgsApplication17restoreGdalDriverERK7QString at Base 2.14.0
_ZN14QgsApplication18defaultStyleV2PathEv at Base 2.0.1
- _ZN14QgsApplication18mGdalSkipList21825E at Base 2.18.25
+ _ZN14QgsApplication18mGdalSkipList21826E at Base 2.18.26
_ZN14QgsApplication18qgisAuthDbFilePathEv at Base 2.14.0
_ZN14QgsApplication18qgisUserDbFilePathEv at Base 2.0.1
_ZN14QgsApplication18registerOgrDriversEv at Base 2.0.1
_ZN14QgsApplication18setDefaultSvgPathsERK11QStringList at Base 2.0.1
_ZN14QgsApplication19defaultThemesFolderEv at Base 2.14.0
_ZN14QgsApplication19emitSettingsChangedEv at Base 2.14.5
- _ZN14QgsApplication19mAuthDbDirPath21825E at Base 2.18.25
- _ZN14QgsApplication19mSystemEnvVars21825E at Base 2.18.25
+ _ZN14QgsApplication19mAuthDbDirPath21826E at Base 2.18.26
+ _ZN14QgsApplication19mSystemEnvVars21826E at Base 2.18.26
_ZN14QgsApplication19qgisSettingsDirPathEv at Base 2.0.1
_ZN14QgsApplication19translatorsFilePathEv at Base 2.0.1
_ZN14QgsApplication20contributorsFilePathEv at Base 2.0.1
@@ -1194,18 +1195,18 @@ libqgis_core.so.2.18.25 #PACKAGE# #MINVER#
_ZN14QgsApplication21QGIS_APPLICATION_NAMEE at Base 2.4.0
_ZN14QgsApplication21composerTemplatePathsEv at Base 2.14.0
_ZN14QgsApplication21developersMapFilePathEv at Base 2.8.0
- _ZN14QgsApplication21mBuildOutputPath21825E at Base 2.18.25
- _ZN14QgsApplication21mBuildSourcePath21825E at Base 2.18.25
- _ZN14QgsApplication21mDefaultSvgPaths21825E at Base 2.18.25
+ _ZN14QgsApplication21mBuildOutputPath21826E at Base 2.18.26
+ _ZN14QgsApplication21mBuildSourcePath21826E at Base 2.18.26
+ _ZN14QgsApplication21mDefaultSvgPaths21826E at Base 2.18.26
_ZN14QgsApplication22QGIS_ORGANIZATION_NAMEE at Base 2.4.0
_ZN14QgsApplication23applyGdalSkippedDriversEv at Base 2.0.1
- _ZN14QgsApplication23mFileOpenEventList21825E at Base 2.18.25
+ _ZN14QgsApplication23mFileOpenEventList21826E at Base 2.18.26
_ZN14QgsApplication24QGIS_ORGANIZATION_DOMAINE at Base 2.4.0
_ZN14QgsApplication24setFileOpenEventReceiverEP7QObject at Base 2.0.1
- _ZN14QgsApplication25mRunningFromBuildDir21825E at Base 2.18.25
+ _ZN14QgsApplication25mRunningFromBuildDir21826E at Base 2.18.26
_ZN14QgsApplication26absolutePathToRelativePathERK7QStringS2_ at Base 2.14.0
_ZN14QgsApplication26relativePathToAbsolutePathERK7QStringS2_ at Base 2.14.0
- _ZN14QgsApplication27mFileOpenEventReceiver21825E at Base 2.18.25
+ _ZN14QgsApplication27mFileOpenEventReceiver21826E at Base 2.18.26
_ZN14QgsApplication4initE7QString at Base 2.0.1
_ZN14QgsApplication5eventEP6QEvent at Base 2.0.1
_ZN14QgsApplication6endianEv at Base 2.0.1
=====================================
debian/libqgis-gui2.18.25.install → debian/libqgis-gui2.18.26.install
=====================================
=====================================
debian/libqgis-gui2.18.25.symbols → debian/libqgis-gui2.18.26.symbols
=====================================
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 2.18.24 amd64 arm64 armel armhf i386 m68k mips mips64el mipsel powerpc ppc64 ppc64el s390x x32
-libqgis_gui.so.2.18.25 #PACKAGE# #MINVER#
+libqgis_gui.so.2.18.26 #PACKAGE# #MINVER#
* Build-Depends-Package: libqgis-dev
(optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !x32)_Z10qDeleteAllI5QListIPN13QFormInternal11DomPropertyEEEvRKT_ at Base 2.14.16
(optional=templinst)_Z13qvariant_castI26QUiTranslatableStringValueET_RK8QVariant at Base 2.0.1
=====================================
debian/libqgis-networkanalysis2.18.25.install → debian/libqgis-networkanalysis2.18.26.install
=====================================
=====================================
debian/libqgis-networkanalysis2.18.25.symbols → debian/libqgis-networkanalysis2.18.26.symbols
=====================================
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 2.18.24 x32
-libqgis_networkanalysis.so.2.18.25 #PACKAGE# #MINVER#
+libqgis_networkanalysis.so.2.18.26 #PACKAGE# #MINVER#
* Build-Depends-Package: libqgis-dev
_ZN11QgsGraphArcC1Ev at Base 2.0.1
_ZN11QgsGraphArcC2Ev at Base 2.0.1
=====================================
debian/libqgis-server2.18.25.install → debian/libqgis-server2.18.26.install
=====================================
=====================================
debian/libqgis-server2.18.25.symbols → debian/libqgis-server2.18.26.symbols
=====================================
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 2.18.25 amd64 arm64 armel m68k mips
-libqgis_server.so.2.18.25 #PACKAGE# #MINVER#
+libqgis_server.so.2.18.26 #PACKAGE# #MINVER#
* Build-Depends-Package: libqgis-dev
_ZN14QgsConfigCache11qt_metacallEN11QMetaObject4CallEiPPv at Base 2.8.0
_ZN14QgsConfigCache11qt_metacastEPKc at Base 2.8.0
=====================================
debian/libqgisgrass7-2.18.25.install → debian/libqgisgrass7-2.18.26.install
=====================================
=====================================
debian/libqgisgrass7-2.18.25.lintian-overrides → debian/libqgisgrass7-2.18.26.lintian-overrides
=====================================
=====================================
debian/libqgisgrass7-2.18.25.symbols → debian/libqgisgrass7-2.18.26.symbols
=====================================
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 2.18.17 alpha amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x
-libqgisgrass7.so.2.18.25 #PACKAGE# #MINVER#
+libqgisgrass7.so.2.18.26 #PACKAGE# #MINVER#
* Build-Depends-Package: libqgis-dev
_ZN11QgsGrassWin10hideWindowEi at Base 2.14.0
_ZN12QgsGrassCopy11qt_metacallEN11QMetaObject4CallEiPPv at Base 2.14.0
=====================================
debian/libqgispython2.18.25.install → debian/libqgispython2.18.26.install
=====================================
=====================================
debian/libqgispython2.18.25.symbols → debian/libqgispython2.18.26.symbols
=====================================
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 2.14.0 amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64el s390x
-libqgispython.so.2.18.25 #PACKAGE# #MINVER#
+libqgispython.so.2.18.26 #PACKAGE# #MINVER#
* Build-Depends-Package: libqgis-dev
_ZTI14QgsPythonUtils at Base 2.0.1
_ZTS14QgsPythonUtils at Base 2.0.1
=====================================
src/core/symbology-ng/qgsfillsymbollayerv2.cpp
=====================================
@@ -353,7 +353,7 @@ void QgsSimpleFillSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element,
QDomElement strokeElem = doc.createElement( "se:Stroke" );
symbolizerElem.appendChild( strokeElem );
double borderWidth = QgsSymbolLayerV2Utils::rescaleUom( mBorderWidth, mBorderWidthUnit, props );
- QgsSymbolLayerV2Utils::lineToSld( doc, strokeElem, mBorderStyle, borderWidth, borderWidth, &mPenJoinStyle );
+ QgsSymbolLayerV2Utils::lineToSld( doc, strokeElem, mBorderStyle, mBorderColor, borderWidth, &mPenJoinStyle );
}
// <se:Displacement>
=====================================
src/providers/oracle/ocispatial/qsql_ocispatial.cpp
=====================================
@@ -86,8 +86,8 @@
#include <stdlib.h>
#define QOCISPATIAL_DYNAMIC_CHUNK_SIZE 65535
-#define QOCISPATIAL_PREFETCH_MEM 10240
-
+#define QOCISPATIAL_PREFETCH_ROWS 10000
+#define QOCISPATIAL_PREFETCH_MEM 8388608 // 8MB
// setting this define will allow using a query from a different
// thread than its database connection.
// warning - this is not fully tested and can lead to race conditions
@@ -355,7 +355,7 @@ struct QOCISpatialResultPrivate
QList<QOCISDOGeometryInd*> sdoind;
bool transaction;
int serverVersion;
- int prefetchRows, prefetchMem;
+ ub4 prefetchRows, prefetchMem;
OCIType *geometryTDO;
QOCISDOGeometryObj *geometryObj;
QOCISDOGeometryInd *geometryInd;
@@ -415,28 +415,23 @@ void QOCISpatialResultPrivate::setStatementAttributes()
int r = OCI_SUCCESS;
- if ( prefetchRows >= 0 )
- {
- r = OCIAttrSet( sql,
- OCI_HTYPE_STMT,
- &prefetchRows,
- 0,
- OCI_ATTR_PREFETCH_ROWS,
- err );
- if ( r != OCI_SUCCESS )
- qOraWarning( "Couldn't set OCI_ATTR_PREFETCH_ROWS: ", err );
- }
- if ( prefetchMem >= 0 )
- {
- r = OCIAttrSet( sql,
- OCI_HTYPE_STMT,
- &prefetchMem,
- 0,
- OCI_ATTR_PREFETCH_MEMORY,
- err );
- if ( r != OCI_SUCCESS )
- qOraWarning( "Couldn't set OCI_ATTR_PREFETCH_MEMORY: ", err );
- }
+ r = OCIAttrSet( sql,
+ OCI_HTYPE_STMT,
+ &prefetchRows,
+ 0,
+ OCI_ATTR_PREFETCH_ROWS,
+ err );
+ if ( r != OCI_SUCCESS )
+ qOraWarning( "Couldn't set OCI_ATTR_PREFETCH_ROWS: ", err );
+ r = OCIAttrSet( sql,
+ OCI_HTYPE_STMT,
+ &prefetchMem,
+ 0,
+ OCI_ATTR_PREFETCH_MEMORY,
+ err );
+ if ( r != OCI_SUCCESS )
+ qOraWarning( "QOCISpatialResultPrivate::setStatementAttributes:"
+ " Couldn't set OCI_ATTR_PREFETCH_MEMORY: ", err );
}
int QOCISpatialResultPrivate::bindValue( OCIStmt *sql, OCIBind **hbnd, OCIError *err, int pos,
@@ -765,7 +760,7 @@ struct QOCISpatialDriverPrivate
bool transaction;
int serverVersion;
ub4 prefetchRows;
- ub2 prefetchMem;
+ ub4 prefetchMem;
QString user;
OCIType *geometryTDO;
@@ -782,7 +777,7 @@ QOCISpatialDriverPrivate::QOCISpatialDriverPrivate()
, err( 0 )
, transaction( false )
, serverVersion( -1 )
- , prefetchRows( 0xffffffff )
+ , prefetchRows( QOCISPATIAL_PREFETCH_ROWS )
, prefetchMem( QOCISPATIAL_PREFETCH_MEM )
, geometryTDO( 0 )
{
@@ -3379,15 +3374,19 @@ static void qParseOpts( const QString &options, QOCISpatialDriverPrivate *d )
bool ok;
if ( opt == QLatin1String( "OCI_ATTR_PREFETCH_ROWS" ) )
{
- d->prefetchRows = val.toInt( &ok );
+ int intVal = val.toInt( &ok );
if ( !ok )
- d->prefetchRows = 0xffffffff;
+ d->prefetchRows = QOCISPATIAL_PREFETCH_ROWS;
+ else if ( intVal >= 0 )
+ d->prefetchRows = static_cast<ub4>( intVal );
}
else if ( opt == QLatin1String( "OCI_ATTR_PREFETCH_MEMORY" ) )
{
- d->prefetchMem = val.toInt( &ok );
+ int intVal = val.toInt( &ok );
if ( !ok )
- d->prefetchMem = 0xffff;
+ d->prefetchMem = QOCISPATIAL_PREFETCH_MEM;
+ else if ( intVal >= 0 )
+ d->prefetchMem = static_cast<ub4>( intVal );
}
else
{
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/17026f483863ecbe45c5e3472c3bfacfca246e2c...5bab0f489c5dcd1e05f3325b9011c1fb384b1636
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/17026f483863ecbe45c5e3472c3bfacfca246e2c...5bab0f489c5dcd1e05f3325b9011c1fb384b1636
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20181123/55f8ad38/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list