[Git][debian-gis-team/qgis][upstream-ltr] 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 upstream-ltr at Debian GIS Project / qgis
Commits:
686ac27f by Bas Couwenberg at 2018-11-23T15:16:50Z
New upstream version 2.18.26+dfsg
- - - - -
5 changed files:
- CMakeLists.txt
- ChangeLog
- debian/changelog
- 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,8 +1,14 @@
-qgis (2.18.25) UNRELEASED; urgency=medium
+qgis (2.18.26) UNRELEASED; urgency=medium
+
+ * Release of 2.18.26
+
+ -- Jürgen E. Fischer <jef at norbit.de> Fri, 23 Nov 2018 13:08:28 +0100
+
+qgis (2.18.25) unstable; urgency=medium
* Release of 2.18.25
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 26 Oct 2018 13:59:08 +0200
+ -- Jürgen E. Fischer <jef at norbit.de> Fri, 23 Nov 2018 13:08:28 +0100
qgis (2.18.24) unstable; urgency=medium
=====================================
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/commit/686ac27fb18b36e3eb131f58999c8c07393a0fd4
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/commit/686ac27fb18b36e3eb131f58999c8c07393a0fd4
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/859ed8bc/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list