[Digikam-devel] extragear/graphics

[Gilles Caulier]

SVN commit 521046 by cgilles:

digikam from trunk : removing obsolete source codes to prepare beta1. digikam/libs/filters is now moved to DImg API to support 16 bits color depth.

CCMAIL: digikam-devel at kde.org


 M  +1 -3      digikam/digikam/Makefile.am  
 M  +1 -1      digikam/libs/Makefile.am  
 M  +0 -1      digikam/libs/curves/Makefile.am  
 M  +2 -1      digikam/libs/curves/imagecurves.cpp  
 D             digikam/libs/filters (directory)  
 M  +1 -2      digikam/libs/levels/Makefile.am  
 M  +0 -8      digikamimageplugins/common/include/digikamheaders.h  
 M  +2 -2      digikamimageplugins/perspective/perspectivewidget.cpp  


--- trunk/extragear/graphics/digikam/digikam/Makefile.am #521045:521046
@@ -1,11 +1,10 @@
-SUBDIRS = pics
+SUBDIRS = pics icons 
 
 lib_LTLIBRARIES = libdigikam.la
 bin_PROGRAMS = digikam
 
 INCLUDES = -I$(top_srcdir)/digikam/sqlite \
 	   -I$(top_srcdir)/digikam/libs/histogram \
-	   -I$(top_srcdir)/digikam/libs/filters \
 	   -I$(top_srcdir)/digikam/libs/levels \
 	   -I$(top_srcdir)/digikam/libs/curves \
 	   -I$(top_srcdir)/digikam/libs/themeengine \
@@ -51,7 +50,6 @@
 libdigikam_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_KABC) \
 			           $(LIBKEXIF_LIBS) $(LIBKIPI_LIBS) $(LIB_KUTILS) $(LIB_EXIV2) \
 		               $(top_builddir)/digikam/sqlite/libsqlite.la \
-		               $(top_builddir)/digikam/libs/filters/libfilters.la \
 		               $(top_builddir)/digikam/libs/thumbbar/libthumbbar.la \
 		               $(top_builddir)/digikam/libs/themeengine/libthemeengine.la \
 		               $(top_builddir)/digikam/libs/widgets/libwidgets.la \
--- trunk/extragear/graphics/digikam/libs/Makefile.am #521045:521046
@@ -1,2 +1,2 @@
 SUBDIRS = lprof dcraw histogram levels curves dmetadata dimg threadimageio themeengine widgets \
-          filters thumbbar jpegutils imageproperties dialogs 
+          thumbbar jpegutils imageproperties dialogs
--- trunk/extragear/graphics/digikam/libs/curves/Makefile.am #521045:521046
@@ -8,7 +8,6 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/digikam/libs/histogram \
-	-I$(top_srcdir)/digikam/libs/filters \
 	-I$(top_srcdir)/digikam/digikam \
 	$(all_includes) 
 
--- trunk/extragear/graphics/digikam/libs/curves/imagecurves.cpp #521045:521046
@@ -23,6 +23,8 @@
  * 
  * ============================================================ */
 
+#define CLAMP(x,l,u) ((x)<(l)?(l):((x)>(u)?(u):(x)))
+
 // C++ includes.
  
 #include <cstdio>
@@ -41,7 +43,6 @@
 
 // Local includes.
 
-#include "imagefilters.h"
 #include "imagecurves.h"
 
 namespace Digikam
--- trunk/extragear/graphics/digikam/libs/levels/Makefile.am #521045:521046
@@ -10,8 +10,7 @@
 	       -I$(top_srcdir)/digikam/libs/histogram \
 	       -I$(top_srcdir)/digikam/ \
 	       -I$(top_srcdir)/digikam/digikam \
-	       -I$(top_srcdir)/digikam/libs/filters \
-	       $(all_includes) 
+	       $(all_includes)
 
 digikaminclude_HEADERS = imagelevels.h 
 
--- trunk/extragear/graphics/digikamimageplugins/common/include/digikamheaders.h #521045:521046
@@ -52,10 +52,6 @@
 #include <imagedlgbase.h>
 #include <imageguidedlg.h>
 
-// FIXME : Revove these lines when all plugins will be ported to DImg
-#include <threadedfilter.h>
-#include <imagefilters.h>
-
 #else
 
 #include <digikam/dimg.h>
@@ -85,10 +81,6 @@
 #include <digikam/imagedlgbase.h>
 #include <digikam/imageguidedlg.h>
 
-// FIXME : Revove these lines when all plugins will be ported to DImg
-#include <digikam/threadedfilter.h>
-#include <digikam/imagefilters.h>
-
 #endif /* HAVE_DIGIKAM_TOPLEVEL */
 
 #endif /* DIGIKAMHEADERS_H */
--- trunk/extragear/graphics/digikamimageplugins/perspective/perspectivewidget.cpp #521045:521046
@@ -644,12 +644,12 @@
              int u = iu - u1;
              int v = iv - v1;
              
-             if (m_antiAlias)
+/*             if (m_antiAlias)
                 {
                 Digikam::ImageFilters::pixelAntiAliasing((uchar*)data, w, h, u, v, 
                                        &color[3], &color[2], &color[1], &color[0]);
                 }
-             else   
+             else   */
                 memcpy(color, (uchar*)(data + (u + v*w)), 4);
 
              for (b = 0; b < bytes; b++)