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

use std number types and add 64 bits word types

This commit is contained in:
Jane Tournois 2022-05-05 11:14:40 +02:00 committed by Jane Tournois
parent 715295fdc8
commit 106f9e7f92
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CGAL_ImageIO/include/CGAL/ImageIO.h
View File

@ -20,7 +20,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <boost/cstdint.hpp> // for uint32_t, etc. #include <cstdint> // for uint32_t, etc.
#ifdef CGAL_USE_ZLIB #ifdef CGAL_USE_ZLIB
#include <zlib.h> #include <zlib.h>
@ -562,38 +562,50 @@ struct Word_type_generator<WK_FLOAT, sign, 8>
template <> template <>
struct Word_type_generator<WK_FIXED, SGN_SIGNED, 1> struct Word_type_generator<WK_FIXED, SGN_SIGNED, 1>
{ {
// typedef boost::int8_t type; // typedef std::int8_t type;
typedef char type; typedef char type;
}; };
template <> template <>
struct Word_type_generator<WK_FIXED, SGN_UNSIGNED, 1> struct Word_type_generator<WK_FIXED, SGN_UNSIGNED, 1>
{ {
typedef boost::uint8_t type; typedef std::uint8_t type;
}; };
template <> template <>
struct Word_type_generator<WK_FIXED, SGN_SIGNED, 2> struct Word_type_generator<WK_FIXED, SGN_SIGNED, 2>
{ {
typedef boost::int16_t type; typedef std::int16_t type;
}; };
template <> template <>
struct Word_type_generator<WK_FIXED, SGN_UNSIGNED, 2> struct Word_type_generator<WK_FIXED, SGN_UNSIGNED, 2>
{ {
typedef boost::uint16_t type; typedef std::uint16_t type;
}; };
template <> template <>
struct Word_type_generator<WK_FIXED, SGN_SIGNED, 4> struct Word_type_generator<WK_FIXED, SGN_SIGNED, 4>
{ {
typedef boost::int32_t type; typedef std::int32_t type;
}; };
template <> template <>
struct Word_type_generator<WK_FIXED, SGN_UNSIGNED, 4> struct Word_type_generator<WK_FIXED, SGN_UNSIGNED, 4>
{ {
typedef boost::uint32_t type; typedef std::uint32_t type;
};
template <>
struct Word_type_generator<WK_FIXED, SGN_SIGNED, 8>
{
typedef std::int64_t type;
};
template <>
struct Word_type_generator<WK_FIXED, SGN_UNSIGNED, 8>
{
typedef std::uint64_t type;
}; };
template <WORD_KIND wordKind, SIGN sign, std::size_t wdim> template <WORD_KIND wordKind, SIGN sign, std::size_t wdim>