Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CGoGN
CGoGN
Commits
142af152
Commit
142af152
authored
Feb 11, 2015
by
Sylvain Thery
Browse files
remove some warnings
parent
1279207f
Changes
4
Hide whitespace changes
Inline
Side-by-side
CGoGN/src/Algo/Import/ply.c
View file @
142af152
...
...
@@ -618,7 +618,7 @@ PlyFile *ply_read(FILE *fp, int *nelems, char ***elem_names)
PlyFile
*
plyfile
;
int
nwords
;
char
**
words
;
int
found_format
=
0
;
//
int found_format = 0;
char
**
elist
;
PlyElement
*
elem
;
char
*
orig_line
;
...
...
@@ -661,7 +661,7 @@ PlyFile *ply_read(FILE *fp, int *nelems, char ***elem_names)
else
return
(
NULL
);
plyfile
->
version
=
(
float
)
atof
(
words
[
2
]);
found_format
=
1
;
//
found_format = 1;
}
else
if
(
equal_strings
(
words
[
0
],
"element"
))
add_element
(
plyfile
,
words
,
nwords
);
...
...
@@ -1433,7 +1433,7 @@ void ascii_get_element(PlyFile *plyfile, char *elem_ptr)
int
store_it
;
char
**
store_array
;
char
*
orig_line
;
char
*
other_data
;
char
*
other_data
=
NULL
;
int
other_flag
;
/* the kind of element we're reading currently */
...
...
@@ -1566,7 +1566,7 @@ void binary_get_element(PlyFile *plyfile, char *elem_ptr)
int
list_count
;
int
store_it
;
char
**
store_array
;
char
*
other_data
;
char
*
other_data
=
NULL
;
int
other_flag
;
/* the kind of element we're reading currently */
...
...
CGoGN/src/Utils/compress.cpp
View file @
142af152
...
...
@@ -51,6 +51,8 @@ void zlibVTUWriteCompressed( unsigned char* input, unsigned int nbBytes, std::of
strm
.
opaque
=
Z_NULL
;
int
ret
=
deflateInit
(
&
strm
,
level
);
assert
(
ret
==
Z_OK
);
if
(
ret
!=
Z_OK
)
return
;
unsigned
char
*
bufferOut
=
new
unsigned
char
[
nbBytes
];
unsigned
char
*
ptrBufferOut
=
bufferOut
;
...
...
ThirdParty/CMakeLists.txt
deleted
100644 → 0
View file @
1279207f
cmake_minimum_required
(
VERSION 2.8
)
project
(
CGoGN_ThirdParty
)
#cmake_policy(SET CMP0042 NEW) # rpath new policy
SET
(
CGoGN_ROOT_DIR
${
CMAKE_SOURCE_DIR
}
/..
)
IF
(
${
CMAKE_CURRENT_BINARY_DIR
}
MATCHES
"(.*)Debug"
)
set
(
CMAKE_BUILD_TYPE
"Debug"
CACHE STRING
"Debug/Release"
FORCE
)
ELSE
()
set
(
CMAKE_BUILD_TYPE
"Release"
CACHE STRING
"Debug/Release"
FORCE
)
ENDIF
()
IF
(
WIN32
)
set
(
CMAKE_PREFIX_PATH
${
CGoGN_ROOT_DIR
}
/windows_dependencies CACHE STRING
"path to dependencies"
)
INCLUDE_DIRECTORIES
(
${
CGoGN_ROOT_DIR
}
/windows_dependencies/include/
)
INCLUDE_DIRECTORIES
(
${
CGoGN_ROOT_DIR
}
/windows_dependencies/include/suitesparse
)
SET
(
LIBRARY_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/lib
)
set
(
CMAKE_CONFIGURATION_TYPES Release Debug
)
SET
(
BUILD_SHARED_LIBS OFF CACHE BOOL
"if used all library are build as shared type (.so/.dylib/.dll)"
)
ELSE
()
SET
(
LIBRARY_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/lib/
${
CMAKE_BUILD_TYPE
}
)
SET
(
BUILD_SHARED_LIBS ON CACHE BOOL
"if used all library are build as shared type (.so/.dylib/.dll)"
)
ENDIF
()
# for shared or not shared
SET
(
WITH_ASSIMP OFF CACHE BOOL
"build with Assimp"
)
SET
(
WITH_ZINRI ON CACHE BOOL
"build with Zinri libs"
)
SET
(
WITH_PYTHONQT ON CACHE BOOL
"build PythonQt (for Schnapps)"
)
IF
(
APPLE
)
SET
(
CMAKE_OSX_ARCHITECTURES x86_64
)
ENDIF
(
APPLE
)
add_subdirectory
(
Tools Tools/build
)
IF
(
WITH_PYTHONQT
)
add_subdirectory
(
PythonQt PythonQt/build
)
INSTALL
(
DIRECTORY PythonQt/src/ DESTINATION
${
CGoGN_ROOT_DIR
}
/ThirdParty/include/PythonQt FILES_MATCHING PATTERN
"*.h"
)
ENDIF
(
WITH_PYTHONQT
)
add_subdirectory
(
OpenNL OpenNL/build
)
INSTALL
(
DIRECTORY OpenNL/src/NL/ DESTINATION
${
CGoGN_ROOT_DIR
}
/ThirdParty/include/NL FILES_MATCHING PATTERN
"*.h"
)
add_subdirectory
(
tetgen tetgen/build
)
INSTALL
(
DIRECTORY tetgen/ DESTINATION
${
CGoGN_ROOT_DIR
}
/ThirdParty/include/tetgen FILES_MATCHING PATTERN
"*.h"
)
IF
(
WITH_ZINRI
)
add_subdirectory
(
Zinri Zinri/build
)
INSTALL
(
DIRECTORY Zinri/ DESTINATION
${
CGoGN_ROOT_DIR
}
/ThirdParty/include/Zinri FILES_MATCHING PATTERN
"*.h"
)
ENDIF
(
WITH_ZINRI
)
IF
(
WITH_ASSIMP
)
add_subdirectory
(
Assimp Assimp/build
)
INSTALL
(
DIRECTORY Assimp/include/ DESTINATION
${
CGoGN_ROOT_DIR
}
/ThirdParty/include/Assimp
)
ENDIF
(
WITH_ASSIMP
)
add_subdirectory
(
TinyXml2 TinyXml2/build
)
INSTALL
(
DIRECTORY TinyXml2/ DESTINATION
${
CGoGN_ROOT_DIR
}
/ThirdParty/include/TinyXml2 FILES_MATCHING PATTERN
"*.h"
)
ThirdParty/README.TXT
deleted
100644 → 0
View file @
1279207f
Zinri: lecture/ecriture de fichier inr.gz (image3D inria)
Assimp: import de nombreux type de fichiers 3D (maillages)
Compilation:
============
cd build (pour compiler en release)
ou cd buildDebug (pour compiler en Debug)
"cmake .." ou "ccmake .." ou "cmake-gui .."
options (et valeur par defaut)
BUILD_SHARED_LIBS (F)
WITH_ASSIMP (T)
WITH_ZINRI (T)
"make"
"make install"
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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