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

Minor fix to solve error when compiling with Clang in Mac OS 10.8 #1

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

Minor fix to solve error when compiling with Clang in Mac OS 10.8 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72f1501
Fixed error when compiling with clang
jnuevo Nov 13, 2013
a6819de
Fixed error when compiling with clang.
jnuevo Nov 13, 2013
a25792f
Merge branch 'master' of https://github.com/jnuevo/akaze
jnuevo Nov 13, 2013
5d2455b
Changed installation directories
jnuevo Nov 13, 2013
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 CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ TARGET_LINK_LIBRARIES(
AKAZE
)

install(TARGETS AKAZE DESTINATION /usr/local/akaze/lib)
install(TARGETS AKAZE DESTINATION /usr/local/lib/)
install(FILES
src/lib/AKAZE.h
src/lib/fed.h
src/lib/utils.h
src/lib/nldiffusion_functions.h
src/lib/config.h
DESTINATION
/usr/local/akaze/include
/usr/local/include/akaze/
)

################################
Expand Down
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Date: 16-09-2013

---------------------------------------------------

Version: 1.0.0
Version: 1.0.1
Changes:

- Initial Release
Expand Down Expand Up @@ -34,10 +34,12 @@ You will also need doxygen in case you need to generate the documentation

Tested compilers
- GCC 4.2-4.7
- Clang 5.0 (from Xcode 5)

Tested systems:
- Ubuntu 11.10, 12.04, 12.10
- Kubuntu 10.04
- Mac OS X 10.8

Getting Started
---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/lib/AKAZE.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ void AKAZE::Compute_Multiscale_Derivatives(void) {
#pragma omp parallel for
#endif
for (size_t i = 0; i < evolution_.size(); i++) {
float ratio = pow(2,evolution_[i].octave);
float ratio = powf(2.0f,evolution_[i].octave);
int sigma_size_ = fRound(evolution_[i].esigma*factor_size_/ratio);

Compute_Scharr_Derivatives(evolution_[i].Lsmooth,evolution_[i].Lx,1,0,sigma_size_);
Expand Down