From 3d7f26b2d25064c2b29fdafd6fe86de5aec66742 Mon Sep 17 00:00:00 2001 From: pradeep Date: Fri, 11 Sep 2015 19:06:50 -0400 Subject: [PATCH 1/2] bug fix in image_editing example --- examples/image_processing/image_editing.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/image_processing/image_editing.cpp b/examples/image_processing/image_editing.cpp index 85b2f73cc8..d765734559 100644 --- a/examples/image_processing/image_editing.cpp +++ b/examples/image_processing/image_editing.cpp @@ -101,7 +101,7 @@ int main(int argc, char **argv) array man = loadImage(ASSETS_DIR "/examples/images/man.jpg", true); array fight = loadImage(ASSETS_DIR "/examples/images/fight.jpg", true); - array nature = loadImage(ASSETS_DIR "/examples/images/nature.jpg", true); + array nature = resize(loadImage(ASSETS_DIR "/examples/images/nature.jpg", true), fight.dims(0), fight.dims(1)); array intensity = colorSpace(fight, AF_GRAY, AF_RGB); array mask = clamp(intensity, 10.0f, 255.0f)>0.0f; From f2474cfc96826e3084f00a6272fc776379961880 Mon Sep 17 00:00:00 2001 From: pradeep Date: Fri, 11 Sep 2015 20:11:33 -0400 Subject: [PATCH 2/2] Updated forge tag for 3.1 release --- CMakeModules/build_forge.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeModules/build_forge.cmake b/CMakeModules/build_forge.cmake index b376895942..a0757bfe26 100644 --- a/CMakeModules/build_forge.cmake +++ b/CMakeModules/build_forge.cmake @@ -22,7 +22,7 @@ ENDIF() ExternalProject_Add( forge-ext GIT_REPOSITORY https://github.com/arrayfire/forge.git - GIT_TAG 79fac0b7ed35c96f25c8006075ec934729cf9dc4 + GIT_TAG af3.1 PREFIX "${prefix}" INSTALL_DIR "${prefix}" UPDATE_COMMAND ""