songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
89,056 Commits 3 Branches 156 Tags 958 MiB
Commit Graph

211 Commits

Author SHA1 Message Date
Laurent Rineau 312aee625a New overloads of CGAL::IMAGEIO::static_evaluate() 2016-06-15 18:10:14 +02:00
Clement Jamin f354c0187e Minor improvement 2016-06-15 17:59:35 +02:00
Clement Jamin 3b61a9d611 Fix types 2016-06-15 17:51:23 +02:00
Clement Jamin dfc9a2f04b writeGisHeader now returns a boolean 2016-06-15 12:01:35 +02:00
Clement Jamin 4e121c471e Fix `status` type and usage 2016-06-15 11:39:24 +02:00
Clement Jamin a95ae40c65 Fix warnings 2016-06-10 14:08:16 +02:00
Guillaume Damiand a15d3dd798 missing inline 2016-05-25 11:57:56 +02:00
Guillaume Damiand 0e4aa8525e Second merge 2016-05-25 11:06:17 +02:00
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +02:00
Clement Jamin 186b525ba0 In Header-only mode, only 1 instance of firstFormat, InrimageFormat and rsff 
See #626
 2016-05-23 17:03:25 +02:00
Laurent Rineau 589a45e65e Fix minor -Wconversion warnings in ImageIO 
The old implementation seems harmless. I have added explicit casts to
quiet the warnings.
 2016-04-22 12:36:11 +02:00
Laurent Rineau 810538d221 Fix 32bits issues in ImageIO 
Those issues were detected by the compilation flag `-Wconversion` of
g++-5.3.

That changes the ABI of CGAL_ImageIO.
 2016-04-22 12:35:32 +02:00
Laurent Rineau f63605355a Bug-fix in Image_3::labellized_trilinear_interpolation 
The 'value_outside` was not correctly used.
 2016-04-20 15:25:06 +02:00
Laurent Rineau 36ee6cc30b Renaming: Target_word_type->Target_type 
The target type may be a floating point type. Strange to call it a "word".
 2016-04-20 15:16:04 +02:00
Laurent Rineau e8bd026dd0 Fix Image_3 
The value outside must be 0. in the trilinear interpolation of indicator
functions.
 2016-04-19 12:24:30 +02:00
Laurent Rineau 81e53df5f1 Fix a pedantic error 2016-04-19 12:24:17 +02:00
Laurent Rineau 35cb7bd5b8 Improve CGAL::Image_3 
- The type of `value_outside` is now directory `Return_type`: no need to
  apply the transformation.

- The indicator functions of the labelized trilinear interpolation can
  be changed.
 2016-04-14 19:36:20 +02:00
Laurent Rineau 12be44eac3 Merge pull request #997 from lrineau/CGAL_ImageIO-fix_with_huge_files-GF 
(Merged from remote-tracking branch 'cgal/releases/CGAL-4.8-branch')
 2016-04-14 15:44:05 +02:00
Andreas Fabri 7bea6910ab Perform the multiplication with size_t and not with int 2016-04-12 11:20:04 +02:00
Laurent Rineau c6e4efb5f7 Fix when operating on huge files (>2GB) 2016-04-11 19:21:06 +02:00
Laurent Rineau ff515d72bb Fix issue #954 (resource leak) 2016-03-29 13:34:44 +02:00
Laurent Rineau fd42bc1d15 Step 2 
CGAL_ImageIO and CGAL_Qt5 are not even configured in header-only
mode. They will be configured later by `CGALConfig.cmake`.
 2016-03-09 17:14:04 +01:00
Clement Jamin dd3ed5b07c Remove the "S" from HEADERS_ONLY 2016-03-09 10:58:55 +01:00
Clement Jamin 35a11c0e13 Use CGAL_HEADERS_ONLY everywhere 2016-03-09 10:56:11 +01:00
Guillaume Damiand 7c670764a8 iris_impl.h is not in CGAL dir 2016-03-09 10:33:53 +01:00
Guillaume Damiand 83d5151077 Add src/CGAL_ImageIO/ in include dirs in header mode 2016-03-09 10:33:53 +01:00
Guillaume Damiand c58ab58860 Do not empty cgal configured libraries variable in header only mode. 2016-03-09 10:31:17 +01:00
Guillaume Damiand 6d55c3b140 Do the target_link_libraries in all CGAL_XXX libraries only in non header only mode. 2016-03-09 10:22:43 +01:00
Andreas Fabri 143fcd3b52 Only interpolate for existing labels 2016-03-03 10:35:33 +01:00
Jane Tournois ee54380b73 fix conversion warnings 2016-02-12 14:30:31 +01:00
Sébastien Loriot 2ed0fc0fdf Merge pull request #151 from cjamin/gsoc2014-2d-reconstruction-ivovigan 
2D Reconstruction Simplification, new package, GSoC 2014
 2016-02-09 19:42:32 +01:00
Simon Giraudot 35c2f29ded Add missing includes to CGAL_ImageIO files 2016-02-04 15:30:16 +01:00
Simon Giraudot 006f3ee6ba Remove useless string header 2016-02-04 13:06:05 +01:00
Sébastien Loriot 9fceea22cc add missing include directive 2016-02-04 12:43:30 +01:00
Andreas Fabri 13ff46e8d5 Add a static global singleton responsible for deallocation of memory to avoid vld warning 2016-01-18 14:24:37 +01:00
Andreas Fabri 1fa552c1cb Explain usage when called without arguments 2016-01-13 16:16:33 +01:00
Andreas Fabri 57ad151cd4 ImageIO no longer depends on VTK 
* The non-documented WITH_VTK is no longer supported.
* The function CGAL::Image_3::read_vtk_image_data
  has been replaced by a global function.
* Added Mesh_3/examples/Mesh_3/mesh_3D_gray_vtk_image.cpp
 2016-01-13 15:50:54 +01:00
Laurent Rineau 9404a1e0ef Fix compilation errors when WITH_VTK=ON in CMake 2016-01-11 16:28:13 +01:00
Sebastien Loriot 78dc72841e Merge pull request #562 from sgiraudot/CGAL-Remove_register_keyword-GF 
Remove deprecated "register" keyword
 2015-12-18 16:52:14 +01:00
Sébastien Loriot dd955cef30 Merge pull-request #483 from 'janetournois/Mesh_3-gray_level_image_oracle-lrineau' 
Mesh 3 : add gray level image oracle
 2015-12-18 16:46:46 +01:00
Simon Giraudot f21cb46900 Remove deprecated "register" keyword 2015-12-17 08:20:56 +01:00
Andreas Fabri c5ee0a9139 Include missing header 2015-12-08 11:25:00 +01:00
Andreas Fabri 0a1ecead08 Do not use a std::set to find the at most 8 different labels 2015-12-06 18:44:05 +01:00
Clement Jamin d35c807619 Missing includes 2015-11-25 16:40:39 +01:00
Jane Tournois 3f308a48af Merge branch 'Mesh_3-gray_level_image_oracle-lrineau-old' into Mesh_3-gray_level_image_oracle-lrineau 2015-11-17 11:16:53 +01:00
Maxime Gimeno 864c95ae08 Fix for #295 
- Replacement of assert() by CGAL_assertion()
 2015-10-29 10:39:53 +01:00
Jane Tournois 745a4f0288 Revert "fix conversion warning" 
This reverts commit 74e5117dfb.
 2015-10-13 12:38:16 +02:00
Jane Tournois 74e5117dfb fix conversion warning 2015-10-13 12:06:26 +02:00
Guillaume Damiand e4342d50d2 Merge remote-tracking branch 'cgal-dev/CGAL_headers_only-gdamiand_cjamin' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:48:54 +02:00
Guillaume Damiand cf1c0ea0ca Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:12:55 +02:00
Sébastien Loriot d0bd9c6557 fix conversion from float to unsigned char warning 2015-07-22 14:18:59 +02:00
Laurent Rineau f9917c487e CMake 2.8.11 2015-07-13 12:36:43 +02:00
Laurent Rineau 6d892480be Merge branch 'lrineau/CGAL_ImageIO-fix_VTK_6_support-lrineau' into CGAL-Qt5_support-GF 
Conflicts:
	CGAL_ImageIO/demo/CGALimageIO/CMakeLists.txt
	Installation/changes.html
 2015-07-10 18:05:25 +02:00
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00
Laurent Rineau 9550a41b67 Merge pull request #133 from bo0ts/Installation-add_exports-pmoeller 
Add a CGALExports.cmake file

Conflicts:
	GraphicsView/src/CGAL_Qt5/CMakeLists.txt
	Installation/cmake/modules/CGALConfig_binary.cmake.in
	Installation/cmake/modules/CGALConfig_install.cmake.in

There was also a conceptual conflict in:
	Installation/src/CMakeLists.txt
 2015-07-10 14:03:20 +02:00
Laurent Rineau 3ec0c69f8f We want 2.8.10 for all demos 
Previous versions are not tested by the CGAL daily test suite.
 2015-07-09 17:50:22 +02:00
Laurent Rineau 6b24740299 Update the VTK support to VTK 6.x 2015-07-09 14:44:02 +02:00
Sébastien Loriot e199f546d4 remove QT4 specific code 2015-07-07 19:36:04 +02:00
Laurent Rineau e5bcdc5f3e Update all CMakeLists.txt 
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
 2015-07-06 18:14:34 +02:00
Philipp Möller 33a1fdbcbc Replace CGAL_LIBRARY with the actual CGAL target 
The variable CGAL_LIBRARY is no longer defined within the build as it is
completely unnecessary and using the actual target allows more features.
 2015-07-03 12:30:23 +02:00
Guillaume Damiand 4bbe2a82e9 Add missing #include; add some case IO::PRETTY to avoid some warning. 2015-06-12 14:08:29 +02:00
Guillaume Damiand b13fbae825 Move #include in header file instead of cpp. 2015-06-09 15:09:35 +02:00
Guillaume Damiand 1712a1b889 Modify #include for CGAL_ImageIO after the moves of header files 2015-03-26 21:16:09 +01:00
Guillaume Damiand 808c7c02fa Move .h files of CGAL_ImageIO in src/CGAL_ImageIO/ (their original position) 2015-03-26 19:59:18 +01:00
Guillaume Damiand 0e31ccf5e5 Remove commented lines 2015-03-17 08:58:25 +01:00
Guillaume Damiand 7457fc2fc7 Replace #include name 2015-03-16 21:17:42 +01:00
Guillaume Damiand cca136c131 Wip 2015-03-16 18:06:53 +01:00
Guillaume Damiand f2576275de typo in #include 2015-03-16 16:26:28 +01:00
Guillaume Damiand e887fc1606 Ok for cgal_imageio 2015-03-16 16:22:01 +01:00
Clement Jamin 87579773c0 Merge branch 'CGAL_headers_only-gdamiand_cjamin' of github.com:CGAL/cgal-dev into CGAL_headers_only-gdamiand_cjamin 2015-03-16 16:16:42 +01:00
Clement Jamin 75e831e92e inr now header-only 2015-03-16 16:16:24 +01:00
Guillaume Damiand 1f9e9eb57f Replace include to use CGAL/ 2015-03-16 16:15:29 +01:00
Guillaume Damiand af94bfd463 Merge branch 'CGAL_headers_only-gdamiand_cjamin' of github.com:CGAL/cgal-dev into CGAL_headers_only-gdamiand_cjamin 2015-03-16 16:11:10 +01:00
Guillaume Damiand a4afce92b6 Image_3, ImageIO, vmpendian and fgets 2015-03-16 16:11:01 +01:00
Clement Jamin 27cb122059 pnm now header-only 2015-03-16 16:05:47 +01:00
Clement Jamin d5f5d3859b iris now header-only 2015-03-16 15:57:56 +01:00
Clement Jamin 3eb3d85517 Merge branch 'CGAL_headers_only-gdamiand_cjamin' of github.com:CGAL/cgal-dev into CGAL_headers_only-gdamiand_cjamin 2015-03-16 15:47:22 +01:00
Clement Jamin c5185334a1 Remove useless include 2015-03-16 15:45:53 +01:00
Guillaume Damiand 162c6c2cc0 bmp ho 2015-03-16 15:45:38 +01:00
Clement Jamin b144467ac6 Reech4x4 now header only 2015-03-16 15:45:37 +01:00
Guillaume Damiand d07a62fb56 Merge branch 'CGAL_headers_only-gdamiand_cjamin' of github.com:CGAL/cgal-dev into CGAL_headers_only-gdamiand_cjamin 2015-03-16 15:40:35 +01:00
Guillaume Damiand 34737af0e8 gis and gif are header only 2015-03-16 15:40:18 +01:00
Clement Jamin ae11a78b8e recbuffer now header-only 2015-03-16 15:25:59 +01:00
Clement Jamin 9eb08ce947 Merge branch 'CGAL_headers_only-gdamiand_cjamin' of github.com:CGAL/cgal-dev into CGAL_headers_only-gdamiand_cjamin 2015-03-16 14:47:55 +01:00
Clement Jamin 46a1756b00 mincio now header-only 2015-03-16 14:44:51 +01:00
Guillaume Damiand 249b41b569 Wip 2015-03-16 14:41:45 +01:00
Clement Jamin 4fe4313caa Fix typo 2015-03-16 14:23:31 +01:00
Guillaume Damiand 9c78897ba5 Merge branch 'CGAL_headers_only-gdamiand_cjamin-old' into CGAL_headers_only-gdamiand_cjamin 2015-03-16 14:00:43 +01:00
Guillaume Damiand 28cf600b2f Inline only analyze.cpp 2014-12-15 21:20:34 +01:00
Guillaume Damiand ebc4300334 Header only for random.cpp. 
For the header only version, the global variable default_random no more exist => we need to replace all occurences of default_random by a call to the global function get_default_random().
As usual, no modification for the non header only version.
 2014-11-14 14:20:26 +01:00
Jane Tournois 9c4038d267 add consistency in the use of size_t everywhere 2014-11-13 11:13:35 +01:00
Jane Tournois f9e7e834a8 fix the use of istringstream 2014-11-12 10:46:43 +01:00
Jane Tournois 1957fe9d92 %zu in printf/scanf is not supported by most windows compilers 
%zu does not match the ANSI norm either
We should use %Iu on Windows, %zu on other platforms.
So let's remove %zu and %Iu, and use C++ stringstream(s) instead
 2014-11-06 14:22:59 +01:00
Jane Tournois 6529a13915 wdim should also be a std::size_t 2014-10-24 13:51:23 +02:00
Jane Tournois 127a07b0b1 fix warnings 2014-10-21 10:47:49 +02:00
Jane Tournois b4a8992e2a complete the use of std::size_t instead of unsigned int in Image_IO 2014-10-20 13:06:33 +02:00
Jane Tournois 06eb921215 fix the use of integers 
patch suggested by Bryn Lloyd on cgal-discuss to avoid an integer overflow
problem that occurs when generating a 3D mesh from very large images
 2014-10-20 12:39:03 +02:00
Laurent Rineau 36d8b5bd18 Convert source files encoding to utf-8 
All non-ASCII files should be encoded in UTF-8. So far, the ZSH script
`Scripts/developer_scripts/detect_wrong_encoding` detects wrong encoding
in source/header files of include/, src/, and doc/.
 2014-08-01 11:20:13 +02:00
Clement Jamin fbf824c711 Merge branch 'Mesh_3-parallel-cjamin' 
This branch introduces parallel algorithms in Triangulation_3 and Mesh_3,
as well as a Concurrent_compact_container. The corresponding features are:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_triangulation_3
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_Mesh_3

Tested in CGAL-4.5-Ic-98.
Approved by the Release Manager.
 2014-07-17 19:08:24 +02:00
Sébastien Loriot bb191be68b use cmake variable instead of hard-coded lib names 
trivial bugfix for master
 2014-07-15 11:32:52 +02:00
Clement Jamin f19c4b29d8 Fix MSVC warnings 2014-07-03 16:18:48 +02:00
Laurent Rineau 6a93169874 Fix warnings from g++-4.8, about unsigned int used with %i or %u, in scanf 2013-04-19 14:09:49 +02:00
Laurent Rineau 3f9df99964 Partially revert the commit 455190a2e4 
The commit 455190a2e4 contains debugging code
that should have never being commited (and does not compile if
CGAL_USE_ZLIB is not defined).
 2013-03-18 15:40:29 +01:00
Andreas Fabri 455190a2e4 removed one parameter too much 2013-03-01 08:55:10 +01:00
Laurent Rineau 26a7e70785 New license.txt files (eol changes) 
The new version 2.13.0 of licensecheck has changed the spaces at eol.
 2013-02-19 16:46:39 +01:00
Eric Berberich 4dc69cd3c0 this demo needs ImageIO 
Now only raise a "r" instead of a compile error in testsuite if CGAL_ImageIO=OFF
 2012-10-10 12:06:11 +00:00
Laurent Rineau 7fbe8d6bef That package has been renamed, but but its package_info. 2012-10-09 09:24:27 +00:00
Laurent Rineau 2db4effa7e CMake: Fix the handling of cmake_policy 
That is a followup-to my commit last year:
  | ------------------------------------------------------------------------
  | r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
  | 
  | Try to fix my last revision about cmake_policy, with CMake-2.6.x
  | 
  | CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
  | x.y.z is greater than the current CMake version.
  | 
  | ------------------------------------------------------------------------

The following check:
  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
 cmake_minimum_required(VERSION 2.6.2)



The script used to fix that was:


#!/usr/bin/env perl

$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
  cmake_policy(VERSION 2.8.4)
else()
  cmake_policy(VERSION 2.6)
endif()
END

while(<>) {
    if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
        while(<>) {
            if(/^endif\(\)/) {
                print "$replacement";
                while(<>) {
                    print;
                }
                exit 0
            }
        }
    }
    print;
}
 2012-08-22 12:35:03 +00:00
Eric Berberich 1d686a07b5 new packagename 2012-08-05 11:22:11 +00:00
Eric Berberich 0608eba0f1 correct library names 2012-08-03 18:09:57 +00:00
Eric Berberich 326179f482 packagename reflects library name (CGAL_ImageIO is shipped with CGAL) 2012-08-03 17:31:39 +00:00