[kimageprocess-devel] kimageprocess/src/methods/hsvcm/features/entropy Makefile.am entropy.cpp

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/entropy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23386/src/methods/hsvcm/features/entropy

Modified Files:
	Makefile.am entropy.cpp 
Log Message:
Fixed compilation


Index: Makefile.am
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/entropy/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	5 Apr 2005 22:49:10 -0000	1.1
+++ Makefile.am	6 Apr 2005 01:50:46 -0000	1.2
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I$(srcdir)/../../../libkimageprocess
+INCLUDES = $(all_includes) -I$(srcdir)/../../../../libkimageprocess
 METASOURCES = AUTO
 kde_module_LTLIBRARIES = kimageprocess_hsvcm_entropy.la
 kimageprocess_hsvcm_entropy_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)

Index: entropy.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/entropy/entropy.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- entropy.cpp	5 Apr 2005 22:49:10 -0000	1.1
+++ entropy.cpp	6 Apr 2005 01:50:46 -0000	1.2
@@ -27,12 +27,13 @@
 
 #include <ktimage.h>
 #include <ktfeaturemanager.h>
+#include <ktmethod.h>
 
 K_EXPORT_COMPONENT_FACTORY( kimageprocess_hsvcm_entropy,
                             KGenericFactory<KTHSVCMEntropy>( "kimageprocess_hsvcm_entropy" ) )
                             
 KTHSVCMEntropy::KTHSVCMEntropy(QObject *parent, const char* name, const QStringList&)
- : KTFeature()
+ : KTFeature("hsvcm")
 {
     //check dependencies
     m_featureName = i18n("Entropy");
@@ -49,11 +50,11 @@
 {
 	int cmSize[3];
 	float ***cm = (float***) method()->data(direction);
-    KTMethod *method = method();
+    KTMethod *m = method();
 
-    cmSize[0] = method->dataSize(0);
-    cmSize[1] = method->dataSize(1);
-    cmSize[2] = method->dataSize(2);
+    cmSize[0] = m->dataSize(0);
+    cmSize[1] = m->dataSize(1);
+    cmSize[2] = m->dataSize(2);
 
 	return 0.0;
 }