Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix two errors #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix two errors #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09e60b5
fix an error that prevents c++ applications from building when includ…
Aug 6, 2017
565f927
fix #3 error: redeclaration of void iulib::addscaled
MohamadIsmail Aug 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions colib/narray-util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#ifndef h_narray_util__
#define h_narray_util__

#include <math.h>
#include <cmath>
#include <stdlib.h>
#include "colib/checks.h"
#include "misc.h"
Expand Down Expand Up @@ -176,7 +176,7 @@ namespace colib {
double total = 0.0;
for(int i=0;i<a.length1d();i++)
total += sqr(a.at1d(i)-b.at1d(i));
CHECK_ARG(!isnan(total));
CHECK_ARG(!std::isnan(total));
return total;
}

Expand Down
Binary file added commands/iuedges
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion imglib/imgops.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ namespace iulib {

template<class T,class V>
void addscaled(narray<T> &dest,narray<T> &src,
V scale=1,int dx=0,int dy=0) {
V scale,int dx,int dy) {
for (int i=0; i<dest.dim(0); i++)
for (int j=0; j<dest.dim(1); j++)
dest.unsafe_at(i,j) += (T)(scale*xref(src,i+dx,j+dy));
Expand Down
2 changes: 1 addition & 1 deletion imglib/imgops.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ namespace iulib {
}

template<class T, class V>
void addscaled(colib::narray<T> &, colib::narray<T> &, V, int, int);
void addscaled(colib::narray<T> &, colib::narray<T> &, V scale=1,int dx=0,int dy=0);
template<class T>
void tighten(colib::narray<T> &image);
template<class T>
Expand Down