[mapserver-commits] [mapserver/mapserver] b1604a: Oraclespatial: remove filteritem (RFC91) (#5229)

GitHub noreply at github.com
Wed Jun 15 01:40:28 PDT 2016 

  Branch: refs/heads/master
  Home:   https://github.com/mapserver/mapserver
  Commit: b1604a748c6944570a5e5b6d0966d9c1bf1e4920
      https://github.com/mapserver/mapserver/commit/b1604a748c6944570a5e5b6d0966d9c1bf1e4920
  Author: Michael Smith <michael.smith at usace.army.mil>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M maporaclespatial.c

  Log Message:
  -----------
  Oraclespatial: remove filteritem (RFC91) (#5229)

Remove addition of filteritem to sql since its being added via the
filter translation processes


  Commit: efd386b81490abb71c29833d171f3d99fe33442b
      https://github.com/mapserver/mapserver/commit/efd386b81490abb71c29833d171f3d99fe33442b
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M .gitattributes
    A release.sh

  Log Message:
  -----------
  Backport release script


  Commit: 5449a6ad858659f3dfed34886237567b207cb85e
      https://github.com/mapserver/mapserver/commit/5449a6ad858659f3dfed34886237567b207cb85e
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M CMakeLists.txt

  Log Message:
  -----------
  update for 6.4.3 release


  Commit: 5c300285190c38332b487a889ccc2cc96433b4eb
      https://github.com/mapserver/mapserver/commit/5c300285190c38332b487a889ccc2cc96433b4eb
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Log Message:
  -----------
  Merge branch 'branch-6-4' into branch-7-0


  Commit: 6ae2bc6915d73417f4fea78201d4f7087c25b3f1
      https://github.com/mapserver/mapserver/commit/6ae2bc6915d73417f4fea78201d4f7087c25b3f1
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M CMakeLists.txt

  Log Message:
  -----------
  update for 7.0.1 release


  Commit: 4af7028c58c23eb9ebd1a1aa4b7ee388ada4333c
      https://github.com/mapserver/mapserver/commit/4af7028c58c23eb9ebd1a1aa4b7ee388ada4333c
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

  Changed paths:
    M mapogroutput.c
    A msautotest/wxs/expected/wfsogr10_geojson.json
    A msautotest/wxs/wfs_ogr_geojson.map
    M print-test-results.sh

  Log Message:
  -----------
  OGR-output: output fid if requested (#5207)

* outputformat must contain option "USE_FEATUREID=true"
* layer must have a ows_featureid metadata set


  Commit: fb73a0509ba19075549ccc8c6dce0acf289b44e0
      https://github.com/mapserver/mapserver/commit/fb73a0509ba19075549ccc8c6dce0acf289b44e0
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-03-03 (Thu, 03 Mar 2016)

  Changed paths:
    M maputfgrid.cpp

  Log Message:
  -----------
  Make utfgrid driver use msIO output (#5260)


  Commit: 40c8ffddb0a6c9defa05bcf13dd25767c9c8db8b
      https://github.com/mapserver/mapserver/commit/40c8ffddb0a6c9defa05bcf13dd25767c9c8db8b
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2016-03-04 (Fri, 04 Mar 2016)

  Changed paths:
    M mapogroutput.c

  Log Message:
  -----------
  msOGRWriteFromQuery(): use OSRRelease() instead of OSRDestroySpatialReference()

The CreateLayer() implementation of some OGR drivers might potentially only
increase the reference counter on the passed SRS instead of doing a full clone.
Consequently using OSRDestroySpatialReference() is not appropriate, as it will
destroy the SRS even if it is referenced by the OGR layer.


  Commit: 6acfaf410dfb744340dce83ec918565ad1db5f53
      https://github.com/mapserver/mapserver/commit/6acfaf410dfb744340dce83ec918565ad1db5f53
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-03-04 (Fri, 04 Mar 2016)

  Changed paths:
    M mapchart.c
    M mapdraw.c
    M mapgraticule.c
    M mapogroutput.c
    M mapquery.c
    M maprasterquery.c

  Log Message:
  -----------
  Avoid calling msProjectionsDiffer over and over again (#5259)


  Commit: 075519a91bbf13fe6d74d6caaef77a3bcdaff20c
      https://github.com/mapserver/mapserver/commit/075519a91bbf13fe6d74d6caaef77a3bcdaff20c
  Author: geographika <geographika at gmail.com>
  Date:   2016-03-08 (Tue, 08 Mar 2016)

  Changed paths:
    M mapmssql2008.c

  Log Message:
  -----------
  Update to new ODBC types SQLLEN and SQLULEN to fix issue #5172


  Commit: cb0cb44eea8fc5738231fd556a453655a8ea73a2
      https://github.com/mapserver/mapserver/commit/cb0cb44eea8fc5738231fd556a453655a8ea73a2
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
    M mapmssql2008.c

  Log Message:
  -----------
  Merge pull request #5262 from geographika/branch-7-0

Update to new ODBC types SQLLEN and SQLULEN to fix issue #5172


  Commit: abd34934c6d97a479977e22695681ffcc9c6b3cd
      https://github.com/mapserver/mapserver/commit/abd34934c6d97a479977e22695681ffcc9c6b3cd
  Author: Jeff McKenna <jeffmckenna at gmail.com>
  Date:   2016-04-12 (Tue, 12 Apr 2016)

  Changed paths:
    M mapscript/php/layer.c

  Log Message:
  -----------
  add encoding property to PHP mapscript source


  Commit: c7fa5aa535a1d844f55dcedd41887663fc85f8b7
      https://github.com/mapserver/mapserver/commit/c7fa5aa535a1d844f55dcedd41887663fc85f8b7
  Author: Jeff McKenna <jeffmckenna at gmail.com>
  Date:   2016-04-13 (Wed, 13 Apr 2016)

  Changed paths:
    M mapscript/php/layer.c

  Log Message:
  -----------
  Merge pull request #5272 from jmckenna/phpmapscript-sandbox

add encoding property to PHP mapscript source (mapserver/mapserver#4758, mapserver/docs#147)


  Commit: 105877468590e99401d234e1bbac13d7645b77d0
      https://github.com/mapserver/mapserver/commit/105877468590e99401d234e1bbac13d7645b77d0
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M maplibxml2.c
    M mapogcsos.c
    M mapowscommon.c
    M mapwfs11.c
    M mapwfs20.c
    A msautotest/wxs/expected/wfs10_test_xml_escaping.xml
    A msautotest/wxs/expected/wfs11_test_xml_escaping.xml
    A msautotest/wxs/expected/wfs20_test_xml_escaping.xml
    A msautotest/wxs/expected/wms111_test_xml_escaping.xml
    A msautotest/wxs/expected/wms130_test_xml_escaping.xml
    A msautotest/wxs/ows_test_xml_escaping.map

  Log Message:
  -----------
  WFS/OWS: fix absence of XML escaping in GetCapabilities response

We improperly use xmlNewChild() instead of xmlNewTextChild(). The
form expects the value to be already XML-escaped, while the later
do the escaping.

Fix issue reported on
https://lists.osgeo.org/pipermail/mapserver-users/2016-April/078832.html


  Commit: cc03ceec064a0b2fb07e1f68f5b189dcdb2d67d3
      https://github.com/mapserver/mapserver/commit/cc03ceec064a0b2fb07e1f68f5b189dcdb2d67d3
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2016-05-13 (Fri, 13 May 2016)

  Changed paths:
    M mapcluster.c

  Log Message:
  -----------
  Fix Cluster Layers Filter Translation (#5205)


  Commit: b509261ef97a71bcae9a2706743143cabb44ab1d
      https://github.com/mapserver/mapserver/commit/b509261ef97a71bcae9a2706743143cabb44ab1d
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2016-05-14 (Sat, 14 May 2016)

  Changed paths:
    M mapcluster.c

  Log Message:
  -----------
  Merge pull request #5279 from szekerest/clusterfix

Fix Cluster Layers Filter Translation (#5205)


  Commit: 8771b597eaee8f4b74afa5844247ed0bb5b86714
      https://github.com/mapserver/mapserver/commit/8771b597eaee8f4b74afa5844247ed0bb5b86714
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M mapscript/csharp/swig_csharp_extensions.i

  Log Message:
  -----------
  Add UTF8 marshaler to MapScript C# (#5275)

(cherry picked from commit 7bc388d2360d07fb8165a637417338a68257279d)


  Commit: 5870da474f9d834e734e7a4fe2e49ba89d5165ab
      https://github.com/mapserver/mapserver/commit/5870da474f9d834e734e7a4fe2e49ba89d5165ab
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M mapdraw.c
    M maplabel.c
    M mapserver.h

  Log Message:
  -----------
  Fix crash in drawQuery for layers with labelitem (#5281)


  Commit: 4681463afec0a9b7ea3ff2f0162600d5bfec8e57
      https://github.com/mapserver/mapserver/commit/4681463afec0a9b7ea3ff2f0162600d5bfec8e57
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M mapdraw.c
    M maplabel.c
    M mapserver.h

  Log Message:
  -----------
  Merge pull request #5282 from szekerest/issue5281

Fix crash in drawQuery for layers with labelitem (#5281)


  Commit: f60648efd4f01df5a0bc7218f37e34df4a0f8633
      https://github.com/mapserver/mapserver/commit/f60648efd4f01df5a0bc7218f37e34df4a0f8633
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M mapdraw.c
    M mapfile.c

  Log Message:
  -----------
  Fix layer compositer issues (#5283)


  Commit: b717c6386d856faf69d5f62a423451c6a701af6e
      https://github.com/mapserver/mapserver/commit/b717c6386d856faf69d5f62a423451c6a701af6e
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M mapdraw.c
    M mapfile.c

  Log Message:
  -----------
  Merge pull request #5284 from szekerest/issue5283

Fix layer compositer issues (#5283)


  Commit: a8d642fded524dc7bc2f620569f2bf9784a2c497
      https://github.com/mapserver/mapserver/commit/a8d642fded524dc7bc2f620569f2bf9784a2c497
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M mapcopy.c

  Log Message:
  -----------
  Add missing implementation to copy composite filter (#5283)


  Commit: 7e2a8051c83b90064766bb8f580c19daee03101f
      https://github.com/mapserver/mapserver/commit/7e2a8051c83b90064766bb8f580c19daee03101f
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M maplabel.c

  Log Message:
  -----------
  Fix drawQuery issue (#5281)


  Commit: 2ccc63abc9ef2954790f23c711ab7c904bc282ac
      https://github.com/mapserver/mapserver/commit/2ccc63abc9ef2954790f23c711ab7c904bc282ac
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M mapdraw.c

  Log Message:
  -----------
  Fix queryMap issue when no styles specified just labels (#5281)


  Commit: 3c32009e8bb2f463b8ff9e80f998c0124a455c1f
      https://github.com/mapserver/mapserver/commit/3c32009e8bb2f463b8ff9e80f998c0124a455c1f
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M mapcopy.c
    M mapdraw.c
    M maplabel.c

  Log Message:
  -----------
  Merge pull request #5285 from szekerest/msfixes

Add fixes


  Commit: f2b03103f8134b1315fcaf83cb13e45c03b5b37c
      https://github.com/mapserver/mapserver/commit/f2b03103f8134b1315fcaf83cb13e45c03b5b37c
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M mapscript/swiginc/color.i

  Log Message:
  -----------
  Allow to specify empty color in mapscript (#5286)


  Commit: 7121ac7c32642b9c1bf182ef66e2a6324c04ebbe
      https://github.com/mapserver/mapserver/commit/7121ac7c32642b9c1bf182ef66e2a6324c04ebbe
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M mapscript/swiginc/class.i

  Log Message:
  -----------
  Recalculate scale factor in drawLegendIcon from mapscript (#5287)


  Commit: bb577dd7da25335e67987dba144f075ca82cd81f
      https://github.com/mapserver/mapserver/commit/bb577dd7da25335e67987dba144f075ca82cd81f
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2016-05-31 (Tue, 31 May 2016)

  Changed paths:
    M mapscript/swiginc/class.i

  Log Message:
  -----------
  Merge pull request #5288 from szekerest/legendicon

Recalculate scale factor in drawLegendIcon from mapscript (#5287)


  Commit: 3cf682d17003521213868f1e727d7be7a3263c7e
      https://github.com/mapserver/mapserver/commit/3cf682d17003521213868f1e727d7be7a3263c7e
  Author: Ari Jolma <ari.jolma at gmail.com>
  Date:   2016-05-31 (Tue, 31 May 2016)

  Changed paths:
    M mapogr.cpp
    A msautotest/wxs/data/db.sqlite
    A msautotest/wxs/expected/wfs_ogr_native_sql_01.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_02.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_03.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_04.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_05.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_06.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_07.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_08.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_09.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_10.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_11.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_12.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_13.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_14.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_15.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_16.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_17.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_18.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_19.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_20.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_21.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_22.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_23.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_24.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_25.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_26.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_27.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_28.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_29.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_30.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_31.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_32.xml
    A msautotest/wxs/wfs_ogr_native_sql.map
    A msautotest/wxs/wfs_ogr_no_native_sql.map

  Log Message:
  -----------
  OGR: implement expression conversion to Spatialite SQL

When serving a Spatialite DB through WFS for example, the WFS filter
was only evaluated on MapServer side instead of being evaluated by
SQLite + Spatialite functions.


  Commit: 0e20de083d7186298fbebbfd764ba721134ce3a0
      https://github.com/mapserver/mapserver/commit/0e20de083d7186298fbebbfd764ba721134ce3a0
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2016-05-31 (Tue, 31 May 2016)

  Changed paths:
    M mapogr.cpp

  Log Message:
  -----------
  Follow-up of 3cf682d17003521213868f1e727d7be7a3263c7e: simplify string handling in msOGRGetToken()


  Commit: 1f99a9f29fefebb7c0e5f39878061763506f94f1
      https://github.com/mapserver/mapserver/commit/1f99a9f29fefebb7c0e5f39878061763506f94f1
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2016-05-31 (Tue, 31 May 2016)

  Changed paths:
    M mapogr.cpp

  Log Message:
  -----------
  Follow-up of 3cf682d17003521213868f1e727d7be7a3263c7e: windows build fix


  Commit: ee3397f4104d441c11784b2a65eddf6b41f416a3
      https://github.com/mapserver/mapserver/commit/ee3397f4104d441c11784b2a65eddf6b41f416a3
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2016-05-31 (Tue, 31 May 2016)

  Changed paths:
    M mapogr.cpp

  Log Message:
  -----------
  Follow-up of 3cf682d17003521213868f1e727d7be7a3263c7e: fix memleak in Beyond case


  Commit: a534114825e7bcbfc5832be2e6880f15291cb9ef
      https://github.com/mapserver/mapserver/commit/a534114825e7bcbfc5832be2e6880f15291cb9ef
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2016-05-31 (Tue, 31 May 2016)

  Changed paths:
    M msautotest/valgrind-suppressions.txt

  Log Message:
  -----------
  valgrind-suppressions.txt: add suppressions linked to libgdal


  Commit: 9996f079828d9ca1e24e11a5986a8f89d2eff0da
      https://github.com/mapserver/mapserver/commit/9996f079828d9ca1e24e11a5986a8f89d2eff0da
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M mapogr.cpp
    M msautotest/valgrind-suppressions.txt
    A msautotest/wxs/data/db.sqlite
    A msautotest/wxs/expected/wfs_ogr_native_sql_01.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_02.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_03.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_04.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_05.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_06.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_07.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_08.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_09.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_10.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_11.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_12.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_13.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_14.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_15.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_16.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_17.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_18.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_19.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_20.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_21.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_22.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_23.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_24.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_25.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_26.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_27.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_28.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_29.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_30.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_31.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_32.xml
    A msautotest/wxs/wfs_ogr_native_sql.map
    A msautotest/wxs/wfs_ogr_no_native_sql.map

  Log Message:
  -----------
  Merge branch 'ajolma_spatialite' into branch-7-0


  Commit: 3dc88f7bf2d05039b7f7b3fc5da0c1db838b39c2
      https://github.com/mapserver/mapserver/commit/3dc88f7bf2d05039b7f7b3fc5da0c1db838b39c2
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2016-06-10 (Fri, 10 Jun 2016)

  Changed paths:
    M mapscript/csharp/CMakeLists.txt
    M mapscript/csharp/Makefile.vc
    M mapscript/csharp/csmodule.i
    A mapscript/csharp/examples/drawmapGDIPlus.cs
    A mapscript/csharp/examples/drawmapWPF.cs

  Log Message:
  -----------
  Add support to get raw image data in csharp (#5293)


  Commit: 7cff3c32665383363a4f7b2e504dd719e2011c01
      https://github.com/mapserver/mapserver/commit/7cff3c32665383363a4f7b2e504dd719e2011c01
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2016-06-10 (Fri, 10 Jun 2016)

  Changed paths:
    M mapscript/csharp/CMakeLists.txt
    M mapscript/csharp/Makefile.vc
    M mapscript/csharp/csmodule.i
    A mapscript/csharp/examples/drawmapGDIPlus.cs
    A mapscript/csharp/examples/drawmapWPF.cs

  Log Message:
  -----------
  Merge pull request #5294 from szekerest/rawbuffer

Add support to get raw image data in csharp (#5293)


  Commit: a56815ba2e77734a62d2099cd34ba7d4dd5a2db8
      https://github.com/mapserver/mapserver/commit/a56815ba2e77734a62d2099cd34ba7d4dd5a2db8
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-06-11 (Sat, 11 Jun 2016)

  Changed paths:
    M mapogr.cpp

  Log Message:
  -----------
  Fix compilation error with OGR support disabled


  Commit: 6c90a32aa9f3711831596f0a2f9a528a54db26bb
      https://github.com/mapserver/mapserver/commit/6c90a32aa9f3711831596f0a2f9a528a54db26bb
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2016-06-15 (Wed, 15 Jun 2016)

  Changed paths:
    M mapcluster.c

  Log Message:
  -----------
  msClusterLayerEscapeSQLParam(): fix compilation warnings (follow-up of cc03ceec064a0b2fb07e1f68f5b189dcdb2d67d3, #5205)


  Commit: 3e08ab9f3ebfa4d73c69877f8b579220b2e2124c
      https://github.com/mapserver/mapserver/commit/3e08ab9f3ebfa4d73c69877f8b579220b2e2124c
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2016-06-15 (Wed, 15 Jun 2016)

  Changed paths:
    M mapchart.c
    M mapcluster.c
    M mapdraw.c
    M mapgraticule.c
    M maplabel.c
    M maplibxml2.c
    M mapmssql2008.c
    M mapogcsos.c
    M mapogr.cpp
    M mapogroutput.c
    M maporaclespatial.c
    M mapowscommon.c
    M mapquery.c
    M maprasterquery.c
    M mapscript/php/layer.c
    M mapscript/swiginc/class.i
    M mapscript/swiginc/color.i
    M mapserver.h
    M maputfgrid.cpp
    M mapwfs11.c
    M mapwfs20.c
    M msautotest/valgrind-suppressions.txt
    A msautotest/wxs/data/db.sqlite
    A msautotest/wxs/expected/wfs10_test_xml_escaping.xml
    A msautotest/wxs/expected/wfs11_test_xml_escaping.xml
    A msautotest/wxs/expected/wfs20_test_xml_escaping.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_01.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_02.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_03.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_04.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_05.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_06.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_07.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_08.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_09.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_10.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_11.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_12.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_13.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_14.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_15.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_16.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_17.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_18.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_19.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_20.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_21.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_22.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_23.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_24.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_25.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_26.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_27.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_28.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_29.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_30.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_31.xml
    A msautotest/wxs/expected/wfs_ogr_native_sql_32.xml
    A msautotest/wxs/expected/wfsogr10_geojson.json
    A msautotest/wxs/expected/wms111_test_xml_escaping.xml
    A msautotest/wxs/expected/wms130_test_xml_escaping.xml
    A msautotest/wxs/ows_test_xml_escaping.map
    A msautotest/wxs/wfs_ogr_geojson.map
    A msautotest/wxs/wfs_ogr_native_sql.map
    A msautotest/wxs/wfs_ogr_no_native_sql.map
    M print-test-results.sh

  Log Message:
  -----------
  Merge branch 'branch-7-0'

Conflicts:
	CMakeLists.txt
	mapcopy.c
	mapfile.c


Compare: https://github.com/mapserver/mapserver/compare/d8ae59ad7130...3e08ab9f3ebf

More information about the mapserver-commits mailing list