songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge from next

This commit is contained in:
Sébastien Loriot 2012-07-27 14:17:21 +00:00
parent eb95b00499 0b8cff4f1a
commit d00a870e9f
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Installation/CMakeLists.txt
View File

@ -771,10 +771,10 @@ endif()
# Set CGAL_LIBRARY_NAME, CGAL_Qt3_LIBRARY_NAME and so on. Those variables
# are the name of CGAL libraries, without the path. Used in the generation
# of the installed CGALConfig.cmake
get_filename_component(CGAL_LIBRARY_NAME "${CGAL_LIBRARY}" NAME CACHE)
get_filename_component(CGAL_LIBRARY_NAME "${CGAL_LIBRARY}" NAME)
hide_variable(CGAL_LIBRARY_NAME)
foreach(lib ${CGAL_CONFIGURED_LIBRARIES})
get_filename_component(CGAL_${lib}_LIBRARY_NAME "${CGAL_${lib}_LIBRARY}" NAME CACHE)
get_filename_component(CGAL_${lib}_LIBRARY_NAME "${CGAL_${lib}_LIBRARY}" NAME)
hide_variable(CGAL_${lib}_LIBRARY_NAME)
endforeach()

2
Maintenance/infrastructure/cgal.geometryfactory.com/bin/dump_crontab
View File

@ -1,6 +1,6 @@
#!/bin/zsh
cd $HOME/CGAL/trunk/Maintenance/infrastructure/cgal.geometryfactory.com/
cd $HOME/CGAL/next/Maintenance/infrastructure/cgal.geometryfactory.com/
crontab -l >| crontab
svn add -q crontab
[ -n "`svn st crontab`" ] && svn ci -m 'updated crontab (automated commit)' crontab

3
Polynomial/include/CGAL/Polynomial/Polynomial_type.h
View File

@ -41,6 +41,7 @@ typename CGAL::internal::Innermost_coefficient_type<T>::Type , 2>::Type
#include <CGAL/ipower.h>
#include <cstdio>
#include <sstream>
#include <CGAL/Polynomial/misc.h>
@ -1330,7 +1331,7 @@ void Polynomial<NT>::output_maple(std::ostream& os) const {
static const char *varnames[] = { "x", "y", "z" };
varname = varnames[Polynomial_traits_d<NT>::d];
} else {
sprintf(vnbuf, "w%d", Polynomial_traits_d<NT>::d - 2);
std::sprintf(vnbuf, "w%d", Polynomial_traits_d<NT>::d - 2);
varname = vnbuf;
}

1
Surface_mesh_parameterization/include/CGAL/Parameterization_mesh_patch_3.h
View File

@ -22,6 +22,7 @@
#ifndef CGAL_PARAMETERIZATION_MESH_PATCH_3_H
#define CGAL_PARAMETERIZATION_MESH_PATCH_3_H
#include <cstdio>
#include <CGAL/iterator.h>
#include <CGAL/circulator.h>
#include <CGAL/Convertible_iterator_project.h>

5
Surface_mesh_parameterization/include/CGAL/Taucs_matrix.h
View File

@ -27,6 +27,7 @@
#include <CGAL/Taucs_fix.h>
#include <CGAL/assertions.h>
#include <cstring>
#include <vector>
namespace CGAL {
@ -322,9 +323,9 @@ public:
int nb_elements = m_columns[col].size(); // Number of non null elements of the column
// Fast copy of column indices and values
memcpy(&m_matrix->rowind[first_index], &m_columns[col].m_indices[0], nb_elements*sizeof(int));
std::memcpy(&m_matrix->rowind[first_index], &m_columns[col].m_indices[0], nb_elements*sizeof(int));
T* taucs_values = (T*) m_matrix->values.v;
memcpy(&taucs_values[first_index], &m_columns[col].m_values[0], nb_elements*sizeof(T));
std::memcpy(&taucs_values[first_index], &m_columns[col].m_values[0], nb_elements*sizeof(T));
// Start of next column will be:
m_matrix->colptr[col+1] = first_index + nb_elements;