Skip to content

Commit

Permalink
-
Browse files Browse the repository at this point in the history
  • Loading branch information
System Administrator authored and System Administrator committed Jan 23, 2017
1 parent 4b98d6a commit bc55fcc
Show file tree
Hide file tree
Showing 1,725 changed files with 374,299 additions and 372,096 deletions.
74 changes: 37 additions & 37 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
*.user
*.suo
*.opensdf
*.sdf
*.xcuserdatad
*.DS_Store
/ipch
/x64
*.idb
/Debug
Release
*.orig
*.tlog
Debug
*.gray
*.yuv
*.rgb
*.ipch
*.opendb
*.db
*.iws
.idea/tasks.xml
.idea/vcs.xml
.idea/workspace.xml
workspace.xml
local.properties
.gradle
gradle
gradlew
gradlew.bat
build
gen
out
.externalNativeBuild
My Amplifier XE Results*
My Advisor Results*
/plugin_androidcamera/.idea/libraries
*.user
*.suo
*.opensdf
*.sdf
*.xcuserdatad
*.DS_Store
/ipch
/x64
*.idb
/Debug
Release
*.orig
*.tlog
Debug
*.gray
*.yuv
*.rgb
*.ipch
*.opendb
*.db
*.iws
.idea/tasks.xml
.idea/vcs.xml
.idea/workspace.xml
workspace.xml
local.properties
.gradle
gradle
gradlew
gradlew.bat
build
gen
out
.externalNativeBuild
My Amplifier XE Results*
My Advisor Results*
/plugin_androidcamera/.idea/libraries
Empty file modified AStyle.sh
100644 → 100755
View file
Empty file.
1,039 changes: 1,039 additions & 0 deletions CompV.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions CompV.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

230 changes: 115 additions & 115 deletions api/include/compv/compv_api.h
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,115 +1,115 @@
/* Copyright (C) 2016-2017 Doubango Telecom <https://www.doubango.org>
* File author: Mamadou DIOP (Doubango Telecom, France).
* License: GPLv3. For commercial license please contact us.
* Source code: https://github.com/DoubangoTelecom/compv
* WebSite: http://compv.org
*/
#if !defined(_COMPV_API_H_)
#define _COMPV_API_H_ //!\\ Must not change this name, used as guard in private header files and many other places

/* Module: Base */
#include <compv/base/compv_base.h>
#include <compv/base/compv_bind.h>
#include <compv/base/compv_box.h>
#include "compv/base/compv_box_interestpoint.h"
#include <compv/base/compv_buffer.h>
#include <compv/base/compv_cpu.h>
#include <compv/base/compv_debug.h>
#include <compv/base/compv_features.h>
#include <compv/base/compv_fileutils.h>
#include <compv/base/compv_mat.h>
#include <compv/base/compv_md5.h>
#include <compv/base/compv_mem.h>
#include <compv/base/compv_obj.h>

#include <compv/base/android/compv_android_native_activity.h>

#include <compv/base/image/compv_image.h>
#include <compv/base/image/compv_image_decoder.h>

#include <compv/base/math/compv_math.h>

#include <compv/base/parallel/compv_condvar.h>
#include <compv/base/parallel/compv_mutex.h>
#include <compv/base/parallel/compv_parallel.h>
#include <compv/base/parallel/compv_runnable.h>
#include <compv/base/parallel/compv_semaphore.h>
#include <compv/base/parallel/compv_thread.h>

#include <compv/base/time/compv_time.h>

/* Module: Core */
#include <compv/core/compv_core.h>

/* Module: GPU */
#include <compv/gpu/compv_gpu.h>

/* Module: Camera */
#include <compv/camera/compv_camera.h>

/* Module: GL */
#include <compv/gl/compv_gl.h>

/* Module: Drawing */
#include <compv/drawing/compv_drawing.h>
#include <compv/drawing/compv_drawing_factory.h>

/* Android native activity entry point */

/* main definition */
#if COMPV_OS_WINDOWS
# include <tchar.h>
# define compv_main() int _tmain(int argc, _TCHAR* argv[])
# define compv_main_return(code) return (code)
#elif COMPV_OS_ANDROID
# define compv_main() \
void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState, size_t savedStateSize) { ANativeActivity_onCreatePriv(activity, savedState, savedStateSize); } \
void android_main(struct android_app* state)
# define compv_main_return(code) /* exit(code) - must not, after return the app must not exit, could be restarted (swithing orientation, put on background....) */
#else
# define compv_main() int main(int argc, char** argv)
# define compv_main_return(code) return (code)
#endif

COMPV_NAMESPACE_BEGIN()
COMPV_GCC_DISABLE_WARNINGS_BEGIN("-Wunused-function")

// Optional
// TODO(dmi): add a param defining which modules to initialize. For example, chroma conversion
// testing requires 'COMPV_MODULE_BASE' only
static COMPV_ERROR_CODE CompVInit(int32_t numThreads = -1)
{
COMPV_CHECK_CODE_RETURN(CompVBase::init(numThreads));
COMPV_CHECK_CODE_RETURN(CompVCore::init());
COMPV_CHECK_CODE_RETURN(CompVGL::init());
COMPV_CHECK_CODE_RETURN(CompVGpu::init());
COMPV_CHECK_CODE_RETURN(CompVCamera::init());
COMPV_CHECK_CODE_RETURN(CompVDrawing::init());
return COMPV_ERROR_CODE_S_OK;
}

// Optional (used for debugging to make sure all memory will be freed)
static COMPV_ERROR_CODE CompVDeInit()
{
COMPV_CHECK_CODE_RETURN(CompVDrawing::deInit());
COMPV_CHECK_CODE_RETURN(CompVCamera::deInit());
COMPV_CHECK_CODE_ASSERT(CompVGL::deInit());
COMPV_CHECK_CODE_ASSERT(CompVGpu::deInit());
COMPV_CHECK_CODE_RETURN(CompVCore::deInit());
COMPV_CHECK_CODE_ASSERT(CompVBase::deInit());
return COMPV_ERROR_CODE_S_OK;
}

#define COMPV_DEBUG_CHECK_FOR_MEMORY_LEAKS() \
/* All allocated objects and ptrs will be freed when they go out of scoop and the reference counting value reach zero.*/ \
/* To check for memory leak we explicitly call CompVDeInit (not required) for checking. */ \
COMPV_CHECK_CODE_ASSERT(CompVDeInit()); \
/* Make sure we freed all allocated memory */ \
COMPV_CHECK_EXP_ASSERT(!CompVMem::isEmpty(), COMPV_ERROR_CODE_E_MEMORY_LEAK, "Memory leak: you missed some pointers allocated using CompVMem::malloc"); \
/* Make sure we freed all allocated objects */ \
COMPV_CHECK_EXP_ASSERT(!CompVObj::isEmpty(), COMPV_ERROR_CODE_E_MEMORY_LEAK, "Memory leak: you missed some object allocated using CompVObj::newObj");

COMPV_GCC_DISABLE_WARNINGS_END()
COMPV_NAMESPACE_END()

#endif /* _COMPV_API_H_ */
/* Copyright (C) 2016-2017 Doubango Telecom <https://www.doubango.org>
* File author: Mamadou DIOP (Doubango Telecom, France).
* License: GPLv3. For commercial license please contact us.
* Source code: https://github.com/DoubangoTelecom/compv
* WebSite: http://compv.org
*/
#if !defined(_COMPV_API_H_)
#define _COMPV_API_H_ //!\\ Must not change this name, used as guard in private header files and many other places

/* Module: Base */
#include <compv/base/compv_base.h>
#include <compv/base/compv_bind.h>
#include <compv/base/compv_box.h>
#include "compv/base/compv_box_interestpoint.h"
#include <compv/base/compv_buffer.h>
#include <compv/base/compv_cpu.h>
#include <compv/base/compv_debug.h>
#include <compv/base/compv_features.h>
#include <compv/base/compv_fileutils.h>
#include <compv/base/compv_mat.h>
#include <compv/base/compv_md5.h>
#include <compv/base/compv_mem.h>
#include <compv/base/compv_obj.h>

#include <compv/base/android/compv_android_native_activity.h>

#include <compv/base/image/compv_image.h>
#include <compv/base/image/compv_image_decoder.h>

#include <compv/base/math/compv_math.h>

#include <compv/base/parallel/compv_condvar.h>
#include <compv/base/parallel/compv_mutex.h>
#include <compv/base/parallel/compv_parallel.h>
#include <compv/base/parallel/compv_runnable.h>
#include <compv/base/parallel/compv_semaphore.h>
#include <compv/base/parallel/compv_thread.h>

#include <compv/base/time/compv_time.h>

/* Module: Core */
#include <compv/core/compv_core.h>

/* Module: GPU */
#include <compv/gpu/compv_gpu.h>

/* Module: Camera */
#include <compv/camera/compv_camera.h>

/* Module: GL */
#include <compv/gl/compv_gl.h>

/* Module: Drawing */
#include <compv/drawing/compv_drawing.h>
#include <compv/drawing/compv_drawing_factory.h>

/* Android native activity entry point */

/* main definition */
#if COMPV_OS_WINDOWS
# include <tchar.h>
# define compv_main() int _tmain(int argc, _TCHAR* argv[])
# define compv_main_return(code) return (code)
#elif COMPV_OS_ANDROID
# define compv_main() \
void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState, size_t savedStateSize) { ANativeActivity_onCreatePriv(activity, savedState, savedStateSize); } \
void android_main(struct android_app* state)
# define compv_main_return(code) /* exit(code) - must not, after return the app must not exit, could be restarted (swithing orientation, put on background....) */
#else
# define compv_main() int main(int argc, char** argv)
# define compv_main_return(code) return (code)
#endif

COMPV_NAMESPACE_BEGIN()
COMPV_GCC_DISABLE_WARNINGS_BEGIN("-Wunused-function")

// Optional
// TODO(dmi): add a param defining which modules to initialize. For example, chroma conversion
// testing requires 'COMPV_MODULE_BASE' only
static COMPV_ERROR_CODE CompVInit(int32_t numThreads = -1)
{
COMPV_CHECK_CODE_RETURN(CompVBase::init(numThreads));
COMPV_CHECK_CODE_RETURN(CompVCore::init());
COMPV_CHECK_CODE_RETURN(CompVGL::init());
COMPV_CHECK_CODE_RETURN(CompVGpu::init());
COMPV_CHECK_CODE_RETURN(CompVCamera::init());
COMPV_CHECK_CODE_RETURN(CompVDrawing::init());
return COMPV_ERROR_CODE_S_OK;
}

// Optional (used for debugging to make sure all memory will be freed)
static COMPV_ERROR_CODE CompVDeInit()
{
COMPV_CHECK_CODE_RETURN(CompVDrawing::deInit());
COMPV_CHECK_CODE_RETURN(CompVCamera::deInit());
COMPV_CHECK_CODE_ASSERT(CompVGL::deInit());
COMPV_CHECK_CODE_ASSERT(CompVGpu::deInit());
COMPV_CHECK_CODE_RETURN(CompVCore::deInit());
COMPV_CHECK_CODE_ASSERT(CompVBase::deInit());
return COMPV_ERROR_CODE_S_OK;
}

#define COMPV_DEBUG_CHECK_FOR_MEMORY_LEAKS() \
/* All allocated objects and ptrs will be freed when they go out of scoop and the reference counting value reach zero.*/ \
/* To check for memory leak we explicitly call CompVDeInit (not required) for checking. */ \
COMPV_CHECK_CODE_ASSERT(CompVDeInit()); \
/* Make sure we freed all allocated memory */ \
COMPV_CHECK_EXP_ASSERT(!CompVMem::isEmpty(), COMPV_ERROR_CODE_E_MEMORY_LEAK, "Memory leak: you missed some pointers allocated using CompVMem::malloc"); \
/* Make sure we freed all allocated objects */ \
COMPV_CHECK_EXP_ASSERT(!CompVObj::isEmpty(), COMPV_ERROR_CODE_E_MEMORY_LEAK, "Memory leak: you missed some object allocated using CompVObj::newObj");

COMPV_GCC_DISABLE_WARNINGS_END()
COMPV_NAMESPACE_END()

#endif /* _COMPV_API_H_ */
Loading

0 comments on commit bc55fcc

Please sign in to comment.