[pktools] 299/375: in Makefila.am: pkfsann should be in bin_PROGRAMS only if USE_FANN

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch upstream-master
in repository pktools.

commit ac27baa752f23f5c8778dd187f2693891917f80e
Author: Pieter Kempeneers <kempenep at gmail.com>
Date:   Fri Jun 27 22:11:13 2014 +0200

    in Makefila.am: pkfsann should be in bin_PROGRAMS only if USE_FANN
---
 src/apps/Makefile.am | 5 ++---
 src/apps/pkkalman.cc | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/apps/Makefile.am b/src/apps/Makefile.am
index cccefad..85d7749 100644
--- a/src/apps/Makefile.am
+++ b/src/apps/Makefile.am
@@ -6,14 +6,13 @@ LDADD = $(GSL_LIBS) $(GDAL_LDFLAGS) $(top_builddir)/src/algorithms/libalgorithms
 ###############################################################################
 
 # the program to build and install (the names of the final binaries)
-bin_PROGRAMS = pkinfo pkcrop pkreclass pkgetmask pksetmask pkcreatect pkdumpimg pkdumpogr pksieve pkstatascii pkstatogr pkegcs pkextract pkfillnodata pkfilter pkkalman pkfilterdem pkenhance pkfilterascii pkdsm2shadow pkcomposite pkndvi pkpolygonize pkascii2img pksvm pkfssvm pkfsann pkascii2ogr pkeditogr
+bin_PROGRAMS = pkinfo pkcrop pkreclass pkgetmask pksetmask pkcreatect pkdumpimg pkdumpogr pksieve pkstatascii pkstatogr pkegcs pkextract pkfillnodata pkfilter pkkalman pkfilterdem pkenhance pkfilterascii pkdsm2shadow pkcomposite pkndvi pkpolygonize pkascii2img pksvm pkfssvm pkascii2ogr pkeditogr
 
 # the program to build but not install (the names of the final binaries)
 #noinst_PROGRAMS =  pkxcorimg pkgeom
 
 if USE_FANN
-#bin_PROGRAMS += pkann pkfsann pkregann
-bin_PROGRAMS += pkann pkregann
+bin_PROGRAMS += pkann pkfsann pkregann
 pkann_SOURCES = $(top_srcdir)/src/algorithms/myfann_cpp.h pkann.cc
 pkann_CXXFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/base $(FANN_CFLAGS) -I$(top_srcdir)/src/algorithms $(AM_CXXFLAGS)
 pkann_LDADD = $(FANN_LIBS) $(FANN_CFLAGS) $(AM_LDFLAGS)
diff --git a/src/apps/pkkalman.cc b/src/apps/pkkalman.cc
index ceb0f1b..ed55ba2 100644
--- a/src/apps/pkkalman.cc
+++ b/src/apps/pkkalman.cc
@@ -598,7 +598,7 @@ int main(int argc,char **argv) {
 	vector<double> estWriteBuffer(ncol);
 	vector<double> uncertWriteBuffer(ncol);
 	vector<double> uncertObsBuffer;
-	imgReaderObs.readData(estReadBuffer,GDT_Float64,irow,0);
+	imgReaderObs.readData(estWriteBuffer,GDT_Float64,irow,0);
 	if(imgReaderObs.nrOfBand()>1)
 	  imgReaderObs.readData(uncertObsBuffer,GDT_Float64,irow,1);
 	for(int icol=0;icol<imgWriterEst.nrOfCol();++icol){
@@ -732,6 +732,7 @@ int main(int argc,char **argv) {
 	imgReaderEst.image2geo(0,irow,x,y);
 	imgReaderModel2.geo2image(x,y,modCol,modRow);
 	assert(modRow>=0&&modRow<imgReaderModel2.nrOfRow());
+	imgReaderModel2.readData(modelBuffer,GDT_Float64,modRow,0);
 	if(update){
 	  imgReaderObs.readData(obsBuffer,GDT_Float64,irow,0);
 	  if(imgReaderObs.nrOfBand()>1)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git