Commit Graph

130 Commits

Author SHA1 Message Date
Laurent Rineau 1e696a6907 - Move up the "set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)", to avoid errors.
- At the same time, I add the comment to the endif() of if(COMMAND
  cmake_policy).
2008-11-13 10:06:16 +00:00
Laurent Rineau eeac591e0f Add and test a trilinear interpolation for labellized images. 2008-11-10 17:38:35 +00:00
Laurent Rineau fa912f218c Add NOTICE: where needed, so that the test results scripts can generate a "r". 2008-11-10 11:09:21 +00:00
Fernando Cacciola 547bffecd9 Put CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS in the right place for cmake 2.4 2008-11-06 13:03:41 +00:00
Laurent Rineau 1418ecd7ce Fix the CMakeLists.txt: one need to link with Qt. 2008-11-06 09:15:22 +00:00
Laurent Rineau ee8d9b6b97 WITH_VTK is not defined by CGALConfig.cmake. 2008-11-05 13:15:18 +00:00
Fernando Cacciola 994028ec51 Prefixed CreateSingleSourceCGALProgram.cmake with CGAL_ 2008-11-04 13:09:48 +00:00
Fernando Cacciola 70fa9503fd Added CMP0003 policy 2008-11-04 12:30:29 +00:00
Fernando Cacciola 6bae1045df Fixed handling of flags when defined interactively 2008-11-03 21:00:22 +00:00
Andreas Fabri 9597450d53 Suppress deprecated warning for fileno and strdup 2008-10-31 21:02:10 +00:00
Laurent Rineau 6f789d3e94 Add -DCGAL_USE_ZLIB, so that zlib code is activated. 2008-10-30 16:26:10 +00:00
Laurent Rineau 54fd823261 Add benches, and improve the implementation of trilinear_interpolation. 2008-10-30 15:20:04 +00:00
Laurent Rineau a63ed4f05f Fix the trilinear interpolation, and its test. 2008-10-30 14:11:01 +00:00
Laurent Rineau 11cd0ee8e3 Remove unneeded stuff. 2008-10-30 14:10:43 +00:00
Laurent Rineau c7c2ee29fb Fix CGAL_ImageIO_ERG_PARTY_* variables, when VTK is used. 2008-10-30 11:19:00 +00:00
Laurent Rineau d5f352c6c5 Fix that CMakeLists.txt file, if VTK is used. 2008-10-30 10:53:13 +00:00
Laurent Rineau b714f4cd32 Add a trilinear interpolation, and a test for it. 2008-10-30 09:48:22 +00:00
Laurent Rineau ac69199dbd Add the implementation of _createImage, which was missing. 2008-10-30 09:47:56 +00:00
Laurent Rineau e89f1739ab Remove a debug output. 2008-10-30 09:46:54 +00:00
Fernando Cacciola d70bdaea18 Prefixed cmake variables with CGAL_ 2008-10-23 14:59:02 +00:00
Laurent Rineau f10a590672 Mass-remove vcproj files. 2008-10-21 09:21:22 +00:00
Laurent Rineau de29665fc0 - License modification: now LGPL v2.1.
- Pierre has not modified include/CGAL/Image_3_vtk_interface.h: I am the
  only author.
2008-10-17 08:39:19 +00:00
Sylvain Pion 1652fec82f Add license notice. 2008-10-13 12:46:01 +00:00
Laurent Rineau 43cc745311 Commit work of previous days (week-end, yesterday and this morning):
The surface mesher Qt4 demo can now deal with labellized images.
2008-10-07 13:00:59 +00:00
Fernando Cacciola b3a611f4a0 (fixed) Allowed CGAL components to be configured and compiled independently
Make library naming consistent with component names
2008-10-02 18:13:13 +00:00
Laurent Rineau 3ce5feec55 Conditional compilation. 2008-10-02 11:07:23 +00:00
Fernando Cacciola 6fdf8251bd Allowed CGAL components to be configured and compiled independently
Make library naming consistent with component names
2008-10-01 21:38:37 +00:00
Laurent Rineau 202d2b53ca Force variables CGAL_<component>_LIBRARY.
For an unkwnon reason, they are copied from the reference cache, which is wrong.
2008-09-29 10:09:35 +00:00
Laurent Rineau 594bb16960 Add cmake_minimum_required (to avoid a warning). 2008-09-29 07:59:46 +00:00
Laurent Rineau 3476df25a9 Fix for cmake-2.6. 2008-09-24 15:59:59 +00:00
Laurent Rineau 0c7637dece Fixed CMakeLists.txt. That one was old. 2008-09-24 15:54:47 +00:00
Laurent Rineau 8ada6a98da Fix indentation. 2008-09-24 14:35:14 +00:00
Laurent Rineau b52c7a09e9 - Fix soname and soversion of libraries (they were exchanged).
- Make get_dependency_version found the print_${LIB}_version.cpp, even
  if the lib is compiled separately.
- Rename FindQt3.cmake to FindQt3-patched.cmake and Qt3Macros to
  Qt3Macros-patched.
- Make CGAL-Qt3 compilable separately.
- Fix all commited CMakeLists.txt:
    - use Qt3-patched and Qt3Macros-patched, and s/QT_/QT3_/
    - add a comment about FindQt3-patched,
    - wrap target creation with if(CGAL_FOUND AND QT3_FOUND)/else/endif
- Modified cgal_create_cmake_script
2008-09-24 10:32:44 +00:00
Laurent Rineau aa3da9b64d Commit a file CMakeLists.txt for that directory that needs CGALimageIO. 2008-09-22 15:57:48 +00:00
Laurent Rineau 8ebe4539d2 Followup of revision 45554:
"prefix enum values by CGAL_, to avoid a conflict with windows.h on
 WIndows!"

There was still some conflicts, in other files.
2008-09-16 12:45:40 +00:00
Laurent Rineau 7d412a1ac7 prefix enum values by CGAL_, to avoid a conflict with windows.h on WIndows! 2008-09-15 14:30:53 +00:00
Fernando Cacciola cd00979002 Added explicit link directives from libCGAL* to libCGAL
Added OpenGL to CGALQt4
2008-09-09 18:53:02 +00:00
Laurent Rineau d4affa0e84 Add libCGAL as a dependency of CGALimageIO. 2008-09-08 17:26:03 +00:00
Fernando Cacciola ab07405874 Use unique names for example, demo and test targets
Renamed CGAL-Qt as CGAL-Qt3
Re-spelled cgal components as CORE, ImageIO, PDB, Qt3 and Qt4
2008-09-04 18:58:09 +00:00
Fernando Cacciola ee6fae2991 Added separation in components 2008-09-03 16:55:21 +00:00
Fernando Cacciola 8bd571a638 Added OpenGL libraries to CGALQt and CGALimageIO 2008-08-27 17:57:10 +00:00
Fernando Cacciola 717b7cf5fb soversion added 2008-08-22 22:25:25 +00:00
Fernando Cacciola a84b7f58a2 Fixed variable handling within subdirectories 2008-08-22 21:50:04 +00:00
Fernando Cacciola 9949de466f Add CGAL as a dependency for ImageIO 2008-08-22 17:43:23 +00:00
Laurent Rineau c8bf73082e Leftover of revision 45057:
"- Make CGALimageIO compile at once (and not in two compilation units)."

I forgot to modify the (non-cmake) makefile.
2008-08-22 09:11:40 +00:00
Laurent Rineau 6e199ed734 - Make CGALimageIO compile at once (and not in two compilation units).
- Add $URL$ and $Id$ at some places.
2008-08-21 09:22:39 +00:00
Laurent Saboret a9e6b6fdfc Fixed compilation errors (Visual C++ 2005) 2008-08-19 16:00:52 +00:00
Fernando Cacciola 6e36eda87b CMake stuff moved into the appropriate packages 2008-07-16 20:56:17 +00:00
Laurent Rineau f356c5cd3c Make VTK optional! 2008-06-12 11:55:01 +00:00
Laurent Rineau ba5de5d964 Conditionnal use of VTK. If CGAL_USE_VTK is not defined, the demo displays
"That demo needs VTK support."
2008-05-20 08:18:03 +00:00
Laurent Rineau 3b4ca6c84d Add CMakeLists.txt. 2008-04-29 13:19:40 +00:00
Laurent Rineau d0676c9983 Sun CC does not like the "::" (void) namespace. 2008-04-25 12:06:17 +00:00
Laurent Rineau ae5c1d2243 Attempt to fix a compilation bug on Windows : remove Image_3.cpp from
src/CGALimageIO/all_files.cpp (Image_3.cpp is now compiled separately).
2008-04-20 16:53:36 +00:00
Laurent Rineau f6a84df19c Do not try to display the image bouding box if the image is not
initialized.
2008-04-18 09:18:26 +00:00
Laurent Rineau 2ce23ea470 Add a new header <CGAL/gl.h>, whose purpose is to wrap the #include of
GL/gl.h: on windows, <windows.h> has to be included first.

Image_3.cpp uses that header now.
2008-04-18 09:02:03 +00:00
Laurent Rineau e5cffb39c9 Broken ABI since CGAL-3.3 => bump SOMAJOR. 2008-04-17 10:17:47 +00:00
Laurent Rineau e78c6b9855 image's vx, vy, vz are in double (not float). 2008-04-17 10:11:30 +00:00
Laurent Rineau 02eb074d62 CGALimageIO needs to be linked with libCGAL and libGL. 2008-04-17 10:07:04 +00:00
Laurent Rineau 8ea291d1fd Add a default value for point requests outside of the image viewport.
That breaks the ABI (which is already incompatible with CGAL-3.3 anyway).

MOTE: That also gives a slightly different semantic, in the default case!
2008-04-16 12:15:56 +00:00
Laurent Rineau 56057487d5 - Add a class CGAL::Image_3, that summarize useful features of CGALimageIO.
- Add VTK import/export functions to CGALimageIO.
- Add a CGALimageIO+VTK demo: open an image file with CGALimageIO then
  use VTK's marching cubes to display an isolevel.
2008-04-16 11:05:15 +00:00
Laurent Rineau a9ccb7251e Reduce the amount of code, by using a macro CGAL_IMAGE_IO_CASE that
implements a switch for all image type cases (similar to
vtkTemplateMacroCase in VTK).
2008-04-16 11:00:54 +00:00
Laurent Rineau 09a919365f Move most of Gray_level_image_3 to a new class <CGAL/Image_3.h>. 2008-04-08 08:59:13 +00:00
Laurent Rineau f0226fd8a2 Add three new parameteres to _readImage_raw, to specify the spacing of the
image (vx, vy, vz).
2008-04-08 08:58:00 +00:00
Laurent Rineau 4f66ba21b8 Fix the license header, that was referring to a non-existent file. 2008-04-01 09:06:34 +00:00
Laurent Rineau a70137ac2c - Fix _readImage_raw in CGALLImageIO:
- image->vdim was not initialized,
    - use ::_openReadImage/::ImageIO_close instead of fopen/fclose, so that
      internal flags of CGALImageIO are set up.
- Fix a bug in ImageIO_read that was du to an incorrect use of size_t, to
  store an int.
- Add examples/CGALImageIO/convert_raw_to_inr, that permits to convert a
  raw image (data without headers) to an Inrimage (compressed or not).
2008-03-31 09:28:17 +00:00
Laurent Rineau 2e6719c0d3 move test_imageio.cpp from demo/Surface_mesher to examples/CGALimageIO 2008-03-27 11:20:25 +00:00
Andreas Fabri c2fc0798a0 Added autolinking 2008-02-08 13:52:47 +00:00
Laurent Rineau 8dd198a4b7 forgot to add allfiles.cpp 2008-02-08 08:48:34 +00:00
Laurent Rineau 093d93d73d - CGALimageIO now has a header <CGAL/ImageIO.h>,
- all files and headers have a copyright header,
- CGALimageIO no longer need the cpp flag -I. (use #include "..." instead
  of #include <...>.

Checked: local compilation of libCGALimageIO works. I assume the
install_cgal will be able to compile it as well.
2008-01-24 14:42:03 +00:00
Laurent Rineau be03ef0b18 new uniform copyright headers for all files of CGALimageIO 2008-01-24 14:17:12 +00:00
Laurent Rineau 570ed3cd53 Make trilinear_interpolation inline (otherwise there are multiple
definitions at linking time).
2008-01-24 10:58:23 +00:00
Laurent Rineau 40e9b7b4bd Add copyright headers in files I have modified.
Merge functionnalities from Pierre Alliez's own copy:
  - add a function  _readImage_raw, similar to _readImage, that reads
    unsigned char raw images,
  - the function triLinInterp can now interpolate most images, whatever is
    the word kind, and trilinear_interpolation is a new name for
    triLinInterp.
  - add a function evaluate, that can return the value of the image at one
    voxel, casted in float.
Those changed should preserve the binary compatibility.
2008-01-24 10:55:40 +00:00
Sylvain Pion a46b55bf71 The files "changes.txt", "description.txt", "long_description.txt" and "maintainer"
are now under /trunk/$Package/package_info/$Package/ .
2007-12-02 15:06:42 +00:00
Fernando Cacciola 88111fcf70 VS project files merged back 2007-06-06 15:35:17 +00:00
Sylvain Pion 9baef3bcac - Centralize duplicated static function fgetns in a separate object file.
- Rename _VERBOSE_ static variables to avoid clashes in compile-all-files-at-once mode.
2007-05-19 22:03:08 +00:00
Laurent Rineau 49f3e78255 Keep the typedefs ALLOCATION_FUNCTION and DEALLOCATION_FUNCTION with the "C"
function call convention.
2007-04-03 09:17:50 +00:00
Laurent Rineau bce1a7694c CGALimageIO is now a C++ library: 'extern "C"' are removed. 2007-04-02 09:50:40 +00:00
Sylvain Pion bf0e32a0e5 remove pgcc warnings 2007-03-09 13:55:29 +00:00
Laurent Rineau 8cc302c7c0 no maintainer for CGALimageIO 2007-03-07 12:15:24 +00:00
Sylvain Pion c4fcbbad46 Split CGALimageIO from Surface_mesher (different license, etc.). 2007-03-07 11:00:59 +00:00