elucideye · ruslo · Jun 10, 2018 · Jun 10, 2018 · Jun 10, 2018 · Jun 10, 2018
diff --git a/.gitignore b/.gitignore
@@ -29,13 +29,7 @@
 *.app
 
 # Hunter/polly 
-_logs/*
-_builds/*
-_install/*
-_framework/*
-_os/*
-_archives/*
-_assets/*
+_*/
 
 # Stored releases
 releases/*

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -61,8 +61,8 @@ if(ACF_USE_DRISHTI_UPLOAD)
   )
   endif()
 else()
-  set(ACF_HUNTER_GATE_URL "https://github.com/ruslo/hunter/archive/v0.21.19.tar.gz")
-  set(ACF_HUNTER_GATE_SHA1 "5ead1e069b437930d0de8a21824b20fb52b37b50")
+  set(ACF_HUNTER_GATE_URL "https://github.com/ruslo/hunter/archive/v0.22.8.tar.gz")
+  set(ACF_HUNTER_GATE_SHA1 "e7fe3f0b61b1b4844d440ec0a02ac73ddc5f0bb2")
   if(HUNTER_ENABLED AND NOT ACF_IS_REPO_BUILD)
     # DEPENDENCY: if(HUNTER_ENABLE): we are being used as a dependency from
     # another project and we will use the config.cmake from the parent project.
@@ -94,7 +94,7 @@ endif()
 ###################
 
 # See https://github.com/hunter-packages/check_ci_tag when changing VERSION
-project(acf VERSION 0.1.12)
+project(acf VERSION 0.1.13)
 
 set(ACF_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}")
 

diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake
@@ -1,14 +1,8 @@
-# the oepncv protobuf isn't friendly to a lot of compilers, skip it by default
-set(opencv_cmake_args
-  WITH_PROTOBUF=OFF
-  BUILD_PROTOBUF=OFF
-  BUILD_LIBPROTOBUF_FROM_SOURCES=NO
-  BUILD_opencv_dnn=OFF
-
-  WITH_JASPER=OFF
-  BUILD_JASPER=OFF
-  )
-hunter_config(OpenCV VERSION ${HUNTER_OpenCV_VERSION} CMAKE_ARGS ${opencv_cmake_args})
+### aglet ###
+set(aglet_cmake_args
+  AGLET_OPENGL_ES3=${ACF_OPENGL_ES3}
+)
+hunter_config(ogles_gpgpu VERSION ${HUNTER_ogles_gpgpu_VERSION} CMAKE_ARGS ${ogles_gpgpu_cmake_args})
 
 ### ogles_gpgpu ###
 set(ogles_gpgpu_cmake_args
@@ -17,4 +11,20 @@ set(ogles_gpgpu_cmake_args
 )
 hunter_config(ogles_gpgpu VERSION ${HUNTER_ogles_gpgpu_VERSION} CMAKE_ARGS ${ogles_gpgpu_cmake_args})
 
+### opencv ###
+set(opencv_cmake_args
+  BUILD_LIST=core,imgproc,videoio,highgui
+)
+hunter_config(OpenCV VERSION ${HUNTER_OpenCV_VERSION} CMAKE_ARGS ${opencv_cmake_args})
+
+### ACF (GIT_SELF) : support relocatable package testing ###
+set(acf_cmake_args
+  ACF_BUILD_TESTS=${ACF_BUILD_TESTS}
+  ACF_BUILD_EXAMPLES=${ACF_BUILD_EXAMPLES}
+  ACF_SERIALIZE_WITH_CVMATIO=${ACF_SERIALIZE_WITH_CVMATIO}
+  ACF_SERIALIZE_WITH_CEREAL=ON
+  ACF_BUILD_OGLES_GPGPU=${ACF_BUILD_OGLES_GPGPU}
+)
+hunter_config(acf GIT_SELF CMAKE_ARGS ${acf_cmake_args})
+
 
diff --git a/drishti-upload b/drishti-upload
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -1,12 +1,62 @@
-###############
-### cxxopts ### :: std::regex >= gcc 4.8
-###############
-hunter_add_package(cxxopts)
-find_package(cxxopts CONFIG REQUIRED)
+if(NOT TARGET acf::acf)
+
+  set(ACF_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../..")
+
+  cmake_minimum_required(VERSION 3.9) # CMAKE_INTERPROCEDURAL_OPTIMIZATION
+
+  # https://docs.hunter.sh/en/latest/reference/user-variables.html#hunter-keep-package-sources
+  option(HUNTER_KEEP_PACKAGE_SOURCES "Keep installed package sources for debugging (caveat...)" OFF)
+
+  list(APPEND CMAKE_MODULE_PATH "${ACF_ROOT_DIR}/cmake/Modules")
+
+  # Test SDK samples using the Hunter packages (release based)
+  include("${ACF_ROOT_DIR}/cmake/default_options.cmake")
+  include("${ACF_ROOT_DIR}/cmake/HunterGate.cmake")
+
+  HunterGate(
+    URL "https://github.com/ruslo/hunter/archive/v0.22.8.tar.gz"
+    SHA1 "e7fe3f0b61b1b4844d440ec0a02ac73ddc5f0bb2"
+    FILEPATH "${ACF_ROOT_DIR}/cmake/Hunter/config.cmake"
+  )
+
+  project(acf-apps VERSION 0.0.1)
+
+  hunter_add_package(acf)
+  find_package(acf CONFIG REQUIRED)
+
+  hunter_add_package(cxxopts)
+  find_package(cxxopts CONFIG REQUIRED)
+
+  hunter_add_package(spdlog)
+  find_package(spdlog CONFIG REQUIRED)
+
+  hunter_add_package(sugar)
+  find_package(sugar CONFIG REQUIRED)
+
+  # Create acf_util lib
+  sugar_include("${ACF_ROOT_DIR}/src/lib/util")  
+  add_library(acf_util ${ACF_UTIL_SRCS} ${ACF_UTIL_HDRS})
+  target_link_libraries(acf_util PUBLIC spdlog::spdlog)
+  target_include_directories(acf_util
+    PUBLIC
+    "$<BUILD_INTERFACE:${ACF_ROOT_DIR}/src/lib>"
+  )
+
+  if(ACF_BUILD_OGLES_GPGPU AND ACF_HAS_GPU)
+    hunter_add_package(aglet)
+    find_package(aglet CONFIG REQUIRED)
+  endif()
+
+else()
+
+  hunter_add_package(cxxopts)
+  find_package(cxxopts CONFIG REQUIRED)
+
+endif()
 
 add_subdirectory(acf)
 
-if (ACF_BUILD_OGLES_GPGPU AND TARGET aglet::aglet)
+if (ACF_BUILD_OGLES_GPGPU AND ACF_HAS_GPU)
   add_subdirectory(pipeline)
 endif()
 

diff --git a/src/app/acf/CMakeLists.txt b/src/app/acf/CMakeLists.txt
@@ -17,7 +17,7 @@ if(${ACF_DO_GPU})
 endif()
 
 add_executable(${test_app} ${acf_srcs})
-target_link_libraries(${test_app} PUBLIC acf acf_util cxxopts::cxxopts)
+target_link_libraries(${test_app} PUBLIC acf::acf acf_util cxxopts::cxxopts)
 
 if(${ACF_DO_GPU})
   target_include_directories(${test_app} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../>")
@@ -46,7 +46,7 @@ set(conv_app acf-mat2cpb)
 
 if(ACF_SERIALIZE_WITH_CVMATIO)
   add_executable(${conv_app} mat2cpb.cpp)
-  target_link_libraries(${conv_app} PUBLIC acf acf_util cxxopts::cxxopts cereal::cereal)
+  target_link_libraries(${conv_app} PUBLIC acf::acf acf_util cxxopts::cxxopts cereal::cereal)
   set_property(TARGET ${conv_app} PROPERTY FOLDER "app/console")
   install(TARGETS ${conv_app} DESTINATION bin)
 endif()
diff --git a/src/app/acf/acf.cpp b/src/app/acf/acf.cpp
@@ -204,11 +204,11 @@ int gauze_main(int argc, char** argv)
         ("h,help", "Print help message");
     // clang-format on
 
-    options.parse(argc, argv);
+    auto cli = options.parse(argc, argv);
 
-    if ((argumentCount <= 1) || options.count("help"))
+    if ((argumentCount <= 1) || cli.count("help"))
     {
-        std::cout << options.help({ "" }) << std::endl;
+        logger->info("{}", options.help({""}));
         return 0;
     }
 

diff --git a/src/app/acf/mat2cpb.cpp b/src/app/acf/mat2cpb.cpp
@@ -13,9 +13,11 @@
 #  include "io/stdlib_string.h"
 #endif
 #include <acf/ACF.h>
-#include <io/cereal_pba.h>
 #include <util/Logger.h>
 
+#include <cereal/cereal.hpp>
+#include <cereal/archives/portable_binary.hpp>
+
 #include <cxxopts.hpp>
 
 #include <exception>
@@ -43,9 +45,9 @@ int gauze_main(int argc, char** argv)
         ("h,help", "Print help message");
     // clang-format on
 
-    options.parse(argc, argv);
+    auto cli = options.parse(argc, argv);
 
-    if ((argumentCount <= 1) || options.count("help"))
+    if ((argumentCount <= 1) || cli.count("help"))
     {
         logger->info("{}", options.help({ "" }));
         return 0;
@@ -76,7 +78,15 @@ int gauze_main(int argc, char** argv)
 
    acf::Detector acf(sInput);
 
-    save_cpb(sOutput, acf);
+    // Serialize:
+    std::ofstream ofs(sOutput, std::ios::binary);
+    if(!ofs)
+    {
+        logger->error("Failed to open {}", sOutput);
+        return 1;
+    }
+    cereal::PortableBinaryOutputArchive oa(ofs);
+    oa << acf;
 
     return 0;
 }

diff --git a/src/app/pipeline/CMakeLists.txt b/src/app/pipeline/CMakeLists.txt
@@ -19,7 +19,7 @@ set(acf_srcs
 )
 
 add_executable(${test_app} ${acf_srcs})
-target_link_libraries(${test_app} PUBLIC acf acf_util cxxopts::cxxopts ${OpenCV_LIBS})
+target_link_libraries(${test_app} PUBLIC acf::acf acf_util cxxopts::cxxopts ${OpenCV_LIBS})
 
 # cross platform testing
 hunter_add_package(gauze)

diff --git a/src/app/pipeline/pipeline.cpp b/src/app/pipeline/pipeline.cpp
@@ -383,10 +383,10 @@ int gauze_main(int argc, char** argv)
         ;
     // clang-format on
 
-    options.parse(argc, argv);
-    if ((argumentCount <= 1) || options.count("help"))
+    auto cli = options.parse(argc, argv);
+    if ((argumentCount <= 1) || cli.count("help"))
     {
-        std::cout << options.help({ "" }) << std::endl;
+        logger->info("{}", options.help({""}));
         return 0;
     }
 

diff --git a/src/app/pyramid/CMakeLists.txt b/src/app/pyramid/CMakeLists.txt
@@ -5,6
10000
 +5,6 @@ set(test_app acf-pyramid)
 ###############
 
 add_executable(${test_app} pyramid.cpp)
-target_link_libraries(${test_app} PUBLIC acf acf_util cxxopts::cxxopts cereal::cereal)
+target_link_libraries(${test_app} PUBLIC acf::acf acf_util cxxopts::cxxopts cereal::cereal)
 set_property(TARGET ${test_app} PROPERTY FOLDER "app/console")
 install(TARGETS ${test_app} DESTINATION bin)
diff --git a/src/app/pyramid/pyramid.cpp b/src/app/pyramid/pyramid.cpp
@@ -91,9 +91,9 @@ int gauze_main(int argc, char** argv)
         ("h,help", "Print help message");
     // clang-format on
 
-    options.parse(argc, argv);
+    auto cli = options.parse(argc, argv);
 
-    if ((argumentCount <= 1) || options.count("help"))
+    if ((argumentCount <= 1) || cli.count("help"))
     {
         logger->info("{}", options.help({ "" }));
         return 0;

diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
@@ -10,17 +10,15 @@
 find_package(sugar CONFIG REQUIRED)
 sugar_include(.)
 
-
-### acf_util ###
+### acf_util ### : for console apps
 add_library(acf_util ${ACF_UTIL_SRCS} ${ACF_UTIL_HDRS})
-target_link_libraries(acf_util PUBLIC spdlog::spdlog ${OpenCV_LIBS})
-set(acf_modules acf_util)
+target_link_libraries(acf_util PUBLIC spdlog::spdlog)
 
-### acf_shaders ###
+### acf_shaders ### : for acf lib and tests
 if(ACF_BUILD_OGLES_GPGPU)
   add_library(acf_shaders ${ACF_GPU_SRCS} ${ACF_GPU_HDRS})
-  target_link_libraries(acf_shaders PUBLIC spdlog::spdlog ${OpenCV_LIBS})
-  list(APPEND acf_modules acf_shaders)
+  target_link_libraries(acf_shaders PUBLIC ogles_gpgpu::ogles_gpgpu)
+  set(acf_modules acf_shaders)
 endif()
 
 ### acf ###
@@ -30,32 +28,38 @@ else()
   set(acf_lib_type STATIC)
 endif()
 
-add_library(acf ${acf_lib_type}
+set(acf_srcs
   ${ACF_SRCS}
   ${ACF_HDRS}
   ${ACF_HDRS_PUBLIC}
 )
 
+add_library(acf ${acf_lib_type} ${acf_srcs})
+
 add_library(${PROJECT_NAME}::acf ALIAS acf)
 
 target_link_libraries(acf
   PUBLIC ${ACF_3RDPARTY_PKG_LIBS}
   PRIVATE ${ACF_3RDPARTY_PKG_LIBS_} ${acf_modules}
 )
+
 target_compile_definitions(acf PUBLIC ACF_DO_HALF=1)  # half precision serialization
 if(ACF_SERIALIZE_WITH_CVMATIO)
   target_compile_definitions(acf PUBLIC ACF_SERIALIZE_WITH_CVMATIO=1)
 endif()
 
 target_include_directories(acf
   PUBLIC
-  "$<BUILD_INTERFACE:${ACF_ROOT_DIR}/src/lib/>"
-  "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>"
+  "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>" # generated acf_export.h
 )
 
-foreach(lib acf ${acf_modules})
+foreach(lib acf ${acf_modules} acf_util)
   message("LIB = ${lib} >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
-  target_include_directories(${lib} PUBLIC "$<BUILD_INTERFACE:${ACF_ROOT_DIR}/src/lib/>")
+  target_include_directories(${lib}
+    PUBLIC
+    "$<BUILD_INTERFACE:${ACF_ROOT_DIR}/src/lib/>" # for util
+    "$<BUILD_INTERFACE:${ACF_ROOT_DIR}/src/lib/acf>" # for io, acf
+  )
   if(MSVC)
     target_compile_definitions(${lib} PUBLIC _USE_MATH_DEFINES) # define M_PI_2 for Visual Studio
     target_compile_definitions(${lib} PUBLIC NOMINMAX=1) # avoid std::{min,max}() conflicts
@@ -168,6 +172,6 @@ install(
 
 # unit tests:
 if(ACF_BUILD_TESTS)
-    add_subdirectory(acf/ut)
+    add_subdirectory(acf/acf/ut)
 endif()
 
diff --git a/src/lib/acf/ACF.cpp → src/lib/acf/acf/ACF.cpp b/src/lib/acf/ACF.cpp → src/lib/acf/acf/ACF.cpp
@@ -11,6 +11,7 @@
 
 #include <acf/ACF.h>
 #include <acf/MatP.h>
+#include <acf/ACFIO.h>
 #include <acf/acf_common.h>
 #include <acf/acf_export.h>
 #include <acf/random.h>

diff --git a/src/lib/acf/ACF.h → src/lib/acf/acf/ACF.h b/src/lib/acf/ACF.h → src/lib/acf/acf/ACF.h
@@ -19,7 +19,6 @@
 #include <acf/ObjectDetector.h> // interface
 #include <acf/acf_common.h>
 #include <acf/acf_export.h>
-#include <acf/ACFIO.h>
 
 #include <opencv2/core.hpp>
 #include <opencv2/core/mat.hpp>

diff --git a/src/lib/acf/ACFField.h → src/lib/acf/acf/ACFField.h b/src/lib/acf/ACFField.h → src/lib/acf/acf/ACFField.h
diff --git a/src/lib/acf/ACFIO.cpp → src/lib/acf/acf/ACFIO.cpp b/src/lib/acf/ACFIO.cpp → src/lib/acf/acf/ACFIO.cpp
diff --git a/src/lib/acf/ACFIO.h → src/lib/acf/acf/ACFIO.h b/src/lib/acf/ACFIO.h → src/lib/acf/acf/ACFIO.h
diff --git a/src/lib/acf/ACFIOArchive.h → src/lib/acf/acf/ACFIOArchive.h b/src/lib/acf/ACFIOArchive.h → src/lib/acf/acf/ACFIOArchive.h
diff --git a/src/lib/acf/ACFIOArchiveCereal.cpp → src/lib/acf/acf/ACFIOArchiveCereal.cpp b/src/lib/acf/ACFIOArchiveCereal.cpp → src/lib/acf/acf/ACFIOArchiveCereal.cpp
diff --git a/src/lib/acf/ACFObject.h → src/lib/acf/acf/ACFObject.h b/src/lib/acf/ACFObject.h → src/lib/acf/acf/ACFObject.h
diff --git a/src/lib/acf/GPUACF.cpp → src/lib/acf/acf/GPUACF.cpp b/src/lib/acf/GPUACF.cpp → src/lib/acf/acf/GPUACF.cpp
diff --git a/src/lib/acf/GPUACF.h → src/lib/acf/acf/GPUACF.h b/src/lib/acf/GPUACF.h → src/lib/acf/acf/GPUACF.h
diff --git a/src/lib/acf/MatP.cpp → src/lib/acf/acf/MatP.cpp b/src/lib/acf/MatP.cpp → src/lib/acf/acf/MatP.cpp
diff --git a/src/lib/acf/MatP.h → src/lib/acf/acf/MatP.h b/src/lib/acf/MatP.h → src/lib/acf/acf/MatP.h
diff --git a/src/lib/acf/ObjectDetector.cpp → src/lib/acf/acf/ObjectDetector.cpp b/src/lib/acf/ObjectDetector.cpp → src/lib/acf/acf/ObjectDetector.cpp
diff --git a/src/lib/acf/ObjectDetector.h → src/lib/acf/acf/ObjectDetector.h b/src/lib/acf/ObjectDetector.h → src/lib/acf/acf/ObjectDetector.h
diff --git a/src/lib/acf/acfModify.cpp → src/lib/acf/acf/acfModify.cpp b/src/lib/acf/acfModify.cpp → src/lib/acf/acf/acfModify.cpp
diff --git a/src/lib/acf/acf_common.h → src/lib/acf/acf/acf_common.h b/src/lib/acf/acf_common.h → src/lib/acf/acf/acf_common.h
diff --git a/src/lib/acf/bbNms.cpp → src/lib/acf/acf/bbNms.cpp b/src/lib/acf/bbNms.cpp → src/lib/acf/acf/bbNms.cpp
diff --git a/src/lib/acf/chnsCompute.cpp → src/lib/acf/acf/chnsCompute.cpp b/src/lib/acf/chnsCompute.cpp → src/lib/acf/acf/chnsCompute.cpp
diff --git a/src/lib/acf/convTri.cpp → src/lib/acf/acf/convTri.cpp b/src/lib/acf/convTri.cpp → src/lib/acf/acf/convTri.cpp
diff --git a/src/lib/acf/convert.cpp → src/lib/acf/acf/convert.cpp b/src/lib/acf/convert.cpp → src/lib/acf/acf/convert.cpp
diff --git a/src/lib/acf/convert.h → src/lib/acf/acf/convert.h b/src/lib/acf/convert.h → src/lib/acf/acf/convert.h
diff --git a/src/lib/acf/draw.cpp → src/lib/acf/acf/draw.cpp b/src/lib/acf/draw.cpp → src/lib/acf/acf/draw.cpp
@@ -31,9 +31,6 @@ cv::Mat draw(acf::Detector::Pyramid& pyramid)
         }
         cv::vconcat(images, Ccpu);
 
-        // Instead of upright:
-        //cv::vconcat(pyramid.data[i][0].get(), Ccpu);
-
         if (levels.size())
         {
             cv::copyMakeBorder(Ccpu, Ccpu, 0, levels.front().rows - Ccpu.rows, 0, 0, cv::BORDER_CONSTANT);

diff --git a/src/lib/acf/draw.h → src/lib/acf/acf/draw.h b/src/lib/acf/draw.h → src/lib/acf/acf/draw.h
diff --git a/src/lib/acf/gpu/binomial.cpp → src/lib/acf/acf/gpu/binomial.cpp b/src/lib/acf/gpu/binomial.cpp → src/lib/acf/acf/gpu/binomial.cpp
diff --git a/src/lib/acf/gpu/binomial.h → src/lib/acf/acf/gpu/binomial.h b/src/lib/acf/gpu/binomial.h → src/lib/acf/acf/gpu/binomial.h
diff --git a/src/lib/acf/gpu/gradhist.cpp → src/lib/acf/acf/gpu/gradhist.cpp b/src/lib/acf/gpu/gradhist.cpp → src/lib/acf/acf/gpu/gradhist.cpp
diff --git a/src/lib/acf/gpu/gradhist.h → src/lib/acf/acf/gpu/gradhist.h b/src/lib/acf/gpu/gradhist.h → src/lib/acf/acf/gpu/gradhist.h
diff --git a/...b/acf/gpu/multipass/triangle_opt_pass.cpp → ...f/acf/gpu/multipass/triangle_opt_pass.cpp b/...b/acf/gpu/multipass/triangle_opt_pass.cpp → ...f/acf/gpu/multipass/triangle_opt_pass.cpp
diff --git a/...lib/acf/gpu/multipass/triangle_opt_pass.h → ...acf/acf/gpu/multipass/triangle_opt_pass.h b/...lib/acf/gpu/multipass/triangle_opt_pass.h → ...acf/acf/gpu/multipass/triangle_opt_pass.h
diff --git a/src/lib/acf/gpu/multipass/triangle_pass.cpp → ...b/acf/acf/gpu/multipass/triangle_pass.cpp b/src/lib/acf/gpu/multipass/triangle_pass.cpp → ...b/acf/acf/gpu/multipass/triangle_pass.cpp
diff --git a/src/lib/acf/gpu/multipass/triangle_pass.h → ...lib/acf/acf/gpu/multipass/triangle_pass.h b/src/lib/acf/gpu/multipass/triangle_pass.h → ...lib/acf/acf/gpu/multipass/triangle_pass.h
diff --git a/src/lib/acf/gpu/swizzle2.cpp → src/lib/acf/acf/gpu/swizzle2.cpp b/src/lib/acf/gpu/swizzle2.cpp → src/lib/acf/acf/gpu/swizzle2.cpp
diff --git a/src/lib/acf/gpu/swizzle2.h → src/lib/acf/acf/gpu/swizzle2.h b/src/lib/acf/gpu/swizzle2.h → src/lib/acf/acf/gpu/swizzle2.h
diff --git a/src/lib/acf/gpu/triangle.cpp → src/lib/acf/acf/gpu/triangle.cpp b/src/lib/acf/gpu/triangle.cpp → src/lib/acf/acf/gpu/triangle.cpp
diff --git a/src/lib/acf/gpu/triangle.h → src/lib/acf/acf/gpu/triangle.h b/src/lib/acf/gpu/triangle.h → src/lib/acf/acf/gpu/triangle.h
diff --git a/src/lib/acf/gpu/triangle_opt.cpp → src/lib/acf/acf/gpu/triangle_opt.cpp b/src/lib/acf/gpu/triangle_opt.cpp → src/lib/acf/acf/gpu/triangle_opt.cpp
diff --git a/src/lib/acf/gpu/triangle_opt.h → src/lib/acf/acf/gpu/triangle_opt.h b/src/lib/acf/gpu/triangle_opt.h → src/lib/acf/acf/gpu/triangle_opt.h
diff --git a/src/lib/acf/gradientHist.cpp → src/lib/acf/acf/gradientHist.cpp b/src/lib/acf/gradientHist.cpp → src/lib/acf/acf/gradientHist.cpp
diff --git a/src/lib/acf/gradientMag.cpp → src/lib/acf/acf/gradientMag.cpp b/src/lib/acf/gradientMag.cpp → src/lib/acf/acf/gradientMag.cpp
diff --git a/src/lib/acf/random.h → src/lib/acf/acf/random.h b/src/lib/acf/random.h → src/lib/acf/acf/random.h
diff --git a/src/lib/acf/rgbConvert.cpp → src/lib/acf/acf/rgbConvert.cpp b/src/lib/acf/rgbConvert.cpp → src/lib/acf/acf/rgbConvert.cpp
+0 −71		cmake/Modules/drishti_set_opencv_cmake_args_android.cmake
+0 −72		cmake/Modules/drishti_set_opencv_cmake_args_ios.cmake
+0 −74		cmake/Modules/drishti_set_opencv_cmake_args_nix.cmake
+0 −82		cmake/Modules/drishti_set_opencv_cmake_args_osx.cmake
+0 −72		cmake/Modules/drishti_set_opencv_cmake_args_windows.cmake
+145 −47		config.cmake
+4 −3		init.cmake
+16 −0		minimal.cmake