Skip to content

Commit

Permalink
histogram copy in the nPhysImage.f shallow copy
Browse files Browse the repository at this point in the history
  • Loading branch information
iltommi committed Mar 18, 2014
1 parent f98e250 commit 2a1a5ad
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 0 additions & 2 deletions nPhysImage/nPhysFormats.cc
Original file line number Diff line number Diff line change
Expand Up @@ -344,14 +344,12 @@ physInt_sif::physInt_sif(string ifilename)
if (temp_string.compare(0,control_string.length(),control_string)==0) {
found_control_string=true;
}
DEBUG(found_control_string << " " << skiplines << " : " << ifile.tellg() << " : " << temp_string);
}

// get data
DEBUG(5,"size : "<<getW()<< " x " <<getH() << " + " << ifile.tellg() );
vector<float> readb(getSurf());

DEBUG(ifile.gcount());
ifile.read((char*)(&readb[0]),getSurf()*sizeof(float));
DEBUG(ifile.gcount());
ifile.close();
Expand Down
2 changes: 2 additions & 0 deletions nPhysImage/nPhysImageF.h
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,8 @@ class nPhysImageF {
Timg_buffer = rhs.Timg_buffer;
width = rhs.width;
height = rhs.height;
histogram=rhs.histogram;


_n_inst = rhs._n_inst;
_trash_new();
Expand Down
4 changes: 2 additions & 2 deletions nPhysImage/nPhysMaths.cc
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,8 @@ phys_fast_gaussian_blur(nPhysImageF<double> &m1, double radius)

fftw_execute(fb);

double sx=pow(m1.getW()/(radius*M_PI),2)/2.0;
double sy=pow(m1.getH()/(radius*M_PI),2)/2.0;
double sx=pow(m1.getW()/(radius),2)/2.0;
double sy=pow(m1.getH()/(radius),2)/2.0;

for (size_t j = 0 ; j < m1.getH(); j++) {
for (size_t i = 0 ; i < m1.getW()/2+1 ; i++) {
Expand Down

0 comments on commit 2a1a5ad

Please sign in to comment.