[qgis] SOLVE https://bugzilla.redhat.com/show_bug.cgi?id=725161

[Volker Fröhlich]

commit ee595cfd5e9f3737af334c1fb3f3d2ca9caf4b85
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Sat Jul 23 19:04:37 2011 +0200

    SOLVE https://bugzilla.redhat.com/show_bug.cgi?id=725161
    
    - Incomplete patch (was not marked at "backport" upstream)

 qgis-1.7.0-histogram.patch |   12 ++++++++++++
 qgis.spec                  |    6 +++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/qgis-1.7.0-histogram.patch b/qgis-1.7.0-histogram.patch
index adfa735..459d259 100644
--- a/qgis-1.7.0-histogram.patch
+++ b/qgis-1.7.0-histogram.patch
@@ -1,3 +1,15 @@
+diff --git a/src/core/raster/qgsrasterbandstats.h b/src/core/raster/qgsrasterbandstats.h
+index 1d0c52e..25b5bb9 100644
+--- a/src/core/raster/qgsrasterbandstats.h
++++ b/src/core/raster/qgsrasterbandstats.h
+@@ -45,6 +45,7 @@ class CORE_EXPORT QgsRasterBandStats
+       stdDev = 0.0;
+       sum = 0.0;
+       elementCount = 0;
++      histogramVector = new HistogramVector();
+       isHistogramEstimated = false;
+       isHistogramOutOfRange = false;
+     }
 diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
 index 32455e8..92c056c 100644
 --- a/src/core/raster/qgsrasterlayer.cpp
diff --git a/qgis.spec b/qgis.spec
index 1071ec4..de6b063 100644
--- a/qgis.spec
+++ b/qgis.spec
@@ -9,7 +9,7 @@
 
 Name:           qgis
 Version:        1.7.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A user friendly Open Source Geographic Information System
 
 Group:          Applications/Engineering
@@ -32,6 +32,7 @@ Patch0: qgis-1.5.0-grass.patch
 # Avoid segfault when geo-referencing
 Patch1: %{name}-1.7.0-georef-crash.patch
 
+# https://github.com/qgis/Quantum-GIS/commit/7d145a94524a6bfc025bfe36388c071f35a16f8a
 # https://github.com/qgis/Quantum-GIS/commit/834fc0b710171a80a29038f74ad2c603bf015424
 # Remove potential memory leak and negative frequencies in histogram
 Patch2: %{name}-1.7.0-histogram.patch
@@ -354,6 +355,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libexecdir}/%{name}
 
 %changelog
+* Mon Jul 23 2011 Volker Fröhlich <volker27 at gmx.at> - 1.7.0-5
+- Extend histogram patch, see BZ 725161
+
 * Mon Jul 06 2011 Volker Fröhlich <volker27 at gmx.at> - 1.7.0-4
 - Remove icon path macros, that don't work in EPEL
 - Avoid creating unnecessary directories there