[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-3
From:       Gilles Caulier <caulier.gilles () free ! fr>
Date:       2004-12-24 9:20:22
Message-ID: 20041224092022.B95171BABD () office ! kde ! org
[Download RAW message or body]

CVS commit by cgilles: 

Fixed Bug 95744 (Digikam crashes when selecting "Automatic level" in the editor) :
Since histogram calculation use a thread, i have missing to add a non-threaded \
calculation for this operation :

- AutoLevels.
- Normalize.
- Equalize.

Fixed Histogram lib and imageplugin core implementation.

CCMAIL: digikam-devel@lists.sourceforge.net


  M +3 -3      digikam/imageplugins/imageeffect_colorsenhance.cpp   1.13
  M +7 -2      digikam/libs/histogram/imagehistogram.cpp   1.9
  M +1 -1      digikam/libs/histogram/imagehistogram.h   1.5
  M +1 -1      digikamimageplugins/Makefile.am   1.17


--- kdeextragear-3/digikam/imageplugins/imageeffect_colorsenhance.cpp  #1.12:1.13
@@ -69,5 +69,5 @@ void ImageEffect_ColorsEnhance::equalize
     
     // Create an histogram of the current image.     
-    Digikam::ImageHistogram *histogram = new Digikam::ImageHistogram(data, w, h);
+    Digikam::ImageHistogram *histogram = new Digikam::ImageHistogram(data, w, h, 0, \
false);  
     // Memory allocation.
@@ -189,5 +189,5 @@ void ImageEffect_ColorsEnhance::normaliz
         
     // Create an histogram of the current image.     
-    Digikam::ImageHistogram *histogram = new Digikam::ImageHistogram(data, w, h);
+    Digikam::ImageHistogram *histogram = new Digikam::ImageHistogram(data, w, h, 0, \
false);  
     // Memory allocation.
@@ -463,5 +463,5 @@ void ImageEffect_ColorsEnhance::autoLeve
        
     // Create an histogram of the current image.     
-    Digikam::ImageHistogram *histogram = new Digikam::ImageHistogram(orgData, w, h);
+    Digikam::ImageHistogram *histogram = new Digikam::ImageHistogram(orgData, w, h, \
0, false);  
     // Create an empty instance of levels to use.

--- kdeextragear-3/digikam/libs/histogram/imagehistogram.cpp  #1.8:1.9
@@ -45,5 +45,5 @@ namespace Digikam
 {
 
-ImageHistogram::ImageHistogram(uint *i_data, uint i_w, uint i_h, QObject *parent)
+ImageHistogram::ImageHistogram(uint *i_data, uint i_w, uint i_h, QObject *parent, \
bool threaded)  : QThread()
 { 
@@ -56,6 +56,11 @@ ImageHistogram::ImageHistogram(uint *i_d
     
     if (m_imageData && m_imageWidth && m_imageHeight)
+       {
+       if (threaded)
        start();
     else
+          calcHistogramValues();
+       }
+    else
        {
        if (m_parent)

--- kdeextragear-3/digikam/libs/histogram/imagehistogram.h  #1.4:1.5
@@ -74,5 +74,5 @@ struct double_packet
 public:
     
-    ImageHistogram(uint *i_data, uint i_w, uint i_h, QObject *parent=0);
+    ImageHistogram(uint *i_data, uint i_w, uint i_h, QObject *parent=0, bool \
threaded=true);  ~ImageHistogram();
     

--- kdeextragear-3/digikamimageplugins/Makefile.am  #1.16:1.17
@@ -1,4 +1,4 @@
 SUBDIRS = adjustlevels solarize despeckle oilpaint emboss charcoal unsharp \
-          raindrop filmgrain freerotation adjustcurves 
+          raindrop filmgrain freerotation adjustcurves sheartool 
 
 AUTOMAKE_OPTIONS = foreign 


[prev in list] [next in list] [prev in thread] [next in thread]