Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv_contrib
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv_contrib
Commits
4bf9cb55
Commit
4bf9cb55
authored
Jan 17, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dnn: fix 'log1p' re-definition in THGeneral
parent
62cc8d86
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
8 deletions
+9
-8
THGeneral.cpp
modules/dnn/src/torch/THGeneral.cpp
+9
-8
No files found.
modules/dnn/src/torch/THGeneral.cpp
View file @
4bf9cb55
#if defined(ENABLE_TORCH_IMPORTER) && ENABLE_TORCH_IMPORTER
#include "THGeneral.h"
#include <opencv2/core.hpp>
extern
"C"
{
#ifndef TH_HAVE_THREAD
#define __thread
#endif
#if defined(TH_DISABLE_HEAP_TRACKING)
#elif (defined(__unix) || defined(_WIN32))
#include <malloc.h>
...
...
@@ -16,6 +8,15 @@ extern "C"
#include <malloc/malloc.h>
#endif
#include "THGeneral.h"
extern
"C"
{
#ifndef TH_HAVE_THREAD
#define __thread
#endif
/* Torch Error Handling */
static
void
defaultTorchErrorHandlerFunction
(
const
char
*
msg
,
void
*
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment