[Digikam-devel] extragear/graphics

Gilles Caulier caulier.gilles at gmail.com
Mon Mar 19 09:16:04 GMT 2007


SVN commit 644093 by cgilles:

digiKam from trunk : Usability issue in Image Editor : Merge Unsharp Mask and Sharp tools to reduce duplicate menu entries and functions. 
We will provide just one menu entrie to sharp an image : Fix/Sharp. The Sharp tool will become a Sharpness Editor. I will merge Refocus tool later.

To packagers : Unsharp Mask tool is removed to DigikamImagePlugins. Please update you package rule for 0.9.2 release
To translators : Unsharp Mask i18n are moved to digikam.po. Take a care. Unsharp Mask plugin translations files are invalid now.
Gerhard : You just need to merge the Unsharp Mask handbook content to digiKam handbook as well. The Unsharp Mask tool options are unchanged.

CCMAIL: digikam-devel at kde.org
CCBUGS: 103244

 M  +6 -2      digikam/imageplugins/Makefile.am  
 D             digikam/imageplugins/imageeffect_sharpen.cpp  
 D             digikam/imageplugins/imageeffect_sharpen.h  
 A             digikam/imageplugins/sharpnesseditor (directory)  
 A             digikam/imageplugins/sharpnesseditor/imageeffect_sharpen.cpp   digikam/imageplugins/imageeffect_sharpen.cpp#644056 [License: GPL]
 A             digikam/imageplugins/sharpnesseditor/imageeffect_sharpen.h   digikam/imageplugins/imageeffect_sharpen.h#644056 [License: GPL]
 A             digikam/imageplugins/sharpnesseditor/unsharp.cpp   digikamimageplugins/unsharp/unsharp.cpp#644056 [License: GPL]
 A             digikam/imageplugins/sharpnesseditor/unsharp.h   digikamimageplugins/unsharp/unsharp.h#644056 [License: GPL]
 M  +1 -1      digikamimageplugins/Makefile.am  
 M  +21 -22    digikamimageplugins/README  
 D             digikamimageplugins/unsharp/Makefile.am  
 D             digikamimageplugins/unsharp/digikamimageplugin_unsharp.desktop  
 D             digikamimageplugins/unsharp/digikamimageplugin_unsharp_ui.rc  
 D             digikamimageplugins/unsharp/hi128-action-unsharpedmask.png  
 D             digikamimageplugins/unsharp/hi16-action-unsharpedmask.png  
 D             digikamimageplugins/unsharp/hi22-action-unsharpedmask.png  
 D             digikamimageplugins/unsharp/hi32-action-unsharpedmask.png  
 D             digikamimageplugins/unsharp/hi48-action-unsharpedmask.png  
 D             digikamimageplugins/unsharp/hi64-action-unsharpedmask.png  
 D             digikamimageplugins/unsharp/hisc-action-unsharpedmask.svgz  
 D             digikamimageplugins/unsharp/imageeffect_unsharp.cpp  
 D             digikamimageplugins/unsharp/imageeffect_unsharp.h  
 D             digikamimageplugins/unsharp/imageplugin_unsharp.cpp  
 D             digikamimageplugins/unsharp/imageplugin_unsharp.h  
 D             digikamimageplugins/unsharp/unsharp.cpp  
 D             digikamimageplugins/unsharp/unsharp.h  


--- trunk/extragear/graphics/digikam/imageplugins/Makefile.am #644092:644093
@@ -1,3 +1,5 @@
+SUBDIRS = sharpnesseditor
+COMPILE_FIRST = sharpnesseditor
 METASOURCES = AUTO
 
 INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
@@ -14,9 +16,10 @@
 	   -I$(top_srcdir)/digikam/libs/dmetadata \
 	   -I$(top_srcdir)/digikam/libs/dimg/filters \
 	   -I$(top_srcdir)/digikam/digikam \
+	   -I$(top_srcdir)/digikam/imageplugins/sharpnesseditor \
 	   $(all_includes) 
 
-digikamimageplugin_core_la_SOURCES = hspreviewwidget.cpp imageplugin_core.cpp imageeffect_sharpen.cpp \
+digikamimageplugin_core_la_SOURCES = hspreviewwidget.cpp imageplugin_core.cpp \
 	                             imageeffect_autocorrection.cpp imageeffect_bwsepia.cpp \
 	                             imageeffect_ratiocrop.cpp imageeffect_rgb.cpp \
 	                             imageeffect_redeye.cpp imageeffect_blur.cpp \
@@ -25,9 +28,10 @@
 noinst_HEADERS = imageeffect_autocorrection.h imageeffect_blur.h imageeffect_hsl.h \
                  imageeffect_ratiocrop.h imageeffect_rgb.h imageplugin_core.h imageeffect_bcg.h \
                  imageeffect_bwsepia.h imageeffect_iccproof.h imageeffect_redeye.h \
-		 imageeffect_sharpen.h hspreviewwidget.h imageplugin_core.h 
+		 hspreviewwidget.h imageplugin_core.h 
 
 digikamimageplugin_core_la_LIBADD = $(LIB_KPARTS) \
+	                            $(top_builddir)/digikam/imageplugins/sharpnesseditor/libsharpnesseditor.la \
 	                            $(top_builddir)/digikam/digikam/libdigikam.la
 
 digikamimageplugin_core_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
--- trunk/extragear/graphics/digikamimageplugins/Makefile.am #644092:644093
@@ -1,4 +1,4 @@
-SUBDIRS = common adjustlevels colorfx noisereduction oilpaint emboss charcoal unsharp \
+SUBDIRS = common adjustlevels colorfx noisereduction oilpaint emboss charcoal \
 	      raindrop filmgrain freerotation adjustcurves sheartool antivignetting \
 	      lensdistortion perspective border blurfx distortionfx superimpose \
 	      inserttext infrared channelmixer texture whitebalance restoration \
--- trunk/extragear/graphics/digikamimageplugins/README #644092:644093
@@ -17,28 +17,27 @@
  4) OilPaint         : An oil painting effect filter.
  5) Emboss           : An embossed image effect filter.
  6) Charcoal         : A charcoal drawing image effect filter.
- 7) Unsharp          : An unsharp mask image filter.
- 8) RainDrop         : A plugin to add rain-drops randomly over a picture.
- 9) FilmGrain        : A plugin to add film grain over an image.
-10) FreeRotation     : A plugin to perform image rotation with a free angle in degrees.
-11) AdjustCurves     : A plugin to adjust manually the histogram curves.
-12) ShearTool        : A plugin to shear a picture.
-13) AntiVignetting   : A plugin to reduce image vignetting generated by wide lens.
-14) LensDistortion   : A plugin to reduce optical distortions generated by wide lens.
-15) SuperImpose      : A plugin to superimpose an image template to a picture.
-16) Perpective       : A plugin to adjust perpective of picture.
-17) Border           : A plugin to add a decorative border around a picture.
-18) InsertText       : A plugin to add text over a picture.
-19) Infrared         : A plugin to simulate infrared film.
-20) ChannelMixer     : A color channels mixer tool.
-21) BlurFX           : Blurring special effects package.
-22) DistortionFX     : Distortion special effects package. 
-23) Texture          : A plugin to apply a decorative texture over a picture.
-24) WhiteBalance     : A plugin to correct picture white color balance.
-25) Restoration      : An advanced filter to restore photograph using CImg library.
-26) Inpainting       : An advanced filter to inpaint photograph area using CImg library.
-27) Refocus          : An advanced sharpness editor based on deconvolution filter to refocus a photograph.
-28) HotPixels        : A plugin to remove Stuff/Hot Pixels from pictures taken with deficient camera CCD.
+ 7) RainDrop         : A plugin to add rain-drops randomly over a picture.
+ 8) FilmGrain        : A plugin to add film grain over an image.
+ 9) FreeRotation     : A plugin to perform image rotation with a free angle in degrees.
+10) AdjustCurves     : A plugin to adjust manually the histogram curves.
+11) ShearTool        : A plugin to shear a picture.
+12) AntiVignetting   : A plugin to reduce image vignetting generated by wide lens.
+13) LensDistortion   : A plugin to reduce optical distortions generated by wide lens.
+14) SuperImpose      : A plugin to superimpose an image template to a picture.
+15) Perpective       : A plugin to adjust perpective of picture.
+16) Border           : A plugin to add a decorative border around a picture.
+17) InsertText       : A plugin to add text over a picture.
+18) Infrared         : A plugin to simulate infrared film.
+19) ChannelMixer     : A color channels mixer tool.
+20) BlurFX           : Blurring special effects package.
+21) DistortionFX     : Distortion special effects package. 
+22) Texture          : A plugin to apply a decorative texture over a picture.
+23) WhiteBalance     : A plugin to correct picture white color balance.
+24) Restoration      : An advanced filter to restore photograph using CImg library.
+25) Inpainting       : An advanced filter to inpaint photograph area using CImg library.
+26) Refocus          : An advanced sharpness editor based on deconvolution filter to refocus a photograph.
+27) HotPixels        : A plugin to remove Stuff/Hot Pixels from pictures taken with deficient camera CCD.
 
 Visit the web project page available at this url: http://www.digikam.org
 



More information about the Digikam-devel mailing list