[QGIS Commit] [qgis/Quantum-GIS] 3391f4: fix cpt-city svg parsing and display

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 3391f425581188bba63ccc4b0147c54713f0093f
      https://github.com/qgis/Quantum-GIS/commit/3391f425581188bba63ccc4b0147c54713f0093f
  Author: Etienne Tourigny <etourigny.dev at gmail.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M src/core/symbology-ng/qgssymbollayerv2utils.cpp
    M src/core/symbology-ng/qgsvectorcolorrampv2.cpp
    M src/core/symbology-ng/qgsvectorcolorrampv2.h
    M src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
    M src/gui/symbology-ng/qgscptcitycolorrampv2dialog.h
    M src/ui/qgscptcitycolorrampv2dialogbase.ui
    M tests/testdata/control_images/expected_raster_colorRamp3/expected_raster_colorRamp3.png

  Log Message:
  -----------
  fix cpt-city svg parsing and display


  Commit: 6861078d02f0a055f5ba5eb0349ab27be8842aa5
      https://github.com/qgis/Quantum-GIS/commit/6861078d02f0a055f5ba5eb0349ab27be8842aa5
  Author: Etienne Tourigny <etourigny.dev at gmail.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M tests/src/core/testqgsrasterlayer.cpp
    M tests/src/core/testqgsstylev2.cpp
    A tests/testdata/cpt-city/cb/COPYING.xml
    A tests/testdata/cpt-city/cb/DESC.xml
    A tests/testdata/cpt-city/cb/div/DESC.xml
    A tests/testdata/cpt-city/cb/div/PiYG_03.svg
    A tests/testdata/cpt-city/cb/div/PiYG_04.svg
    A tests/testdata/cpt-city/cb/div/PiYG_05.svg
    A tests/testdata/cpt-city/cb/div/PiYG_06.svg
    A tests/testdata/cpt-city/cb/div/PiYG_07.svg
    A tests/testdata/cpt-city/cb/div/PiYG_08.svg
    A tests/testdata/cpt-city/cb/div/PiYG_09.svg
    A tests/testdata/cpt-city/cb/div/PiYG_10.svg
    A tests/testdata/cpt-city/cb/div/PiYG_11.svg
    A tests/testdata/cpt-city/gmt/COPYING.xml
    A tests/testdata/cpt-city/gmt/DESC.xml
    A tests/testdata/cpt-city/gmt/GMT_panoply.svg
    A tests/testdata/cpt-city/jjg/DESC.xml
    A tests/testdata/cpt-city/jjg/misc/COPYING.xml
    A tests/testdata/cpt-city/jjg/misc/DESC.xml
    A tests/testdata/cpt-city/jjg/misc/temperature.svg

  Log Message:
  -----------
  add a few cpt-city svg files to tests


  Commit: fbbb71a490ad4cedcbee87949cce4b0625646412
      https://github.com/qgis/Quantum-GIS/commit/fbbb71a490ad4cedcbee87949cce4b0625646412
  Author: Etienne Tourigny <etourigny.dev at gmail.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M images/images.qrc
    A images/themes/default/mActionFreezeLabels.svg
    A images/themes/default/mActionShowFrozenLabels.svg
    A images/themes/gis/mActionFreezeLabels.svg
    A images/themes/gis/mActionShowFrozenLabels.svg
    M src/app/qgisapp.cpp

  Log Message:
  -----------
  Merge branch 'master' of github.com:qgis/Quantum-GIS


Compare: https://github.com/qgis/Quantum-GIS/compare/2752f66ec1de...fbbb71a490ad