[Kst] extragear/graphics/kst/kst

[Rick Chern]

On Mon, 2005-06-06 at 00:24 -0400, George Staikos wrote:

> 
> 4) Two unexplained hunks in the diff still:
> Index: kstimage.cpp
> ===================================================================
> --- kstimage.cpp	(revision 417847)
> +++ kstimage.cpp	(revision 417848)
> @@ -292,7 +292,8 @@
>    _zLower = lowerZ;
>    _zUpper = upperZ;
>    _autoThreshold = autoThreshold;
> -  delete _pal;
> +  if (_pal != pal)
> +    delete _pal;
>    _pal = pal;
>    _hasColorMap = true;
>    _hasContourMap = false;
> @@ -324,7 +325,8 @@
>    _zLower = lowerZ;
>    _zUpper = upperZ;
>    _autoThreshold = autoThreshold;
> -  delete _pal;
> +  if (_pal != pal)
> +    delete _pal;
>    _pal = pal;
>    _numContourLines = numContours;
>    _contourWeight = contourWeight;


I made this change because previously, changeToColorAndContour and
changeToColorOnly would not be called with the same palette that the
image already has, but now it can be possible (because of changes to the
image dialog) that the palette is the same as the existing one.