"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/gmic.h" between
gmic_3.0.1.tar.gz and gmic_3.0.2.tar.gz

About: G’MIC (GREY’s Magic for Image Computing) is a framework for image processing. It provides several different user interfaces to convert/manipulate/filter/ visualize generic image datasets (usable standalone or as plug-in for GIMP and Krita).

gmic.h  (gmic_3.0.1):gmic.h  (gmic_3.0.2)
skipping to change at line 55 skipping to change at line 55
# requirements in conditions enabling the security of their systems and/or # requirements in conditions enabling the security of their systems and/or
# data to be ensured and, more generally, to use and operate it in the # data to be ensured and, more generally, to use and operate it in the
# same conditions as regards security. # same conditions as regards security.
# #
# The fact that you are presently reading this means that you have had # The fact that you are presently reading this means that you have had
# knowledge of the CeCILL and CeCILL-C licenses and that you accept its terms. # knowledge of the CeCILL and CeCILL-C licenses and that you accept its terms.
# #
*/ */
#ifndef gmic_version #ifndef gmic_version
#define gmic_version 301 #define gmic_version 302
#ifndef gmic_pixel_type #ifndef gmic_pixel_type
#define gmic_pixel_type float #define gmic_pixel_type float
#endif #endif
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>
// Define gmic_uint64 type. // Define gmic_uint64 type.
#ifndef gmic_uint64 #ifndef gmic_uint64
skipping to change at line 77 skipping to change at line 77
#define gmic_uint64 __int64 #define gmic_uint64 __int64
#else // #if cimg_OS==2 #else // #if cimg_OS==2
#if UINTPTR_MAX==0xffffffff || defined(__arm__) || defined(_M_ARM) || ((ULONG_MA X)==(UINT_MAX)) #if UINTPTR_MAX==0xffffffff || defined(__arm__) || defined(_M_ARM) || ((ULONG_MA X)==(UINT_MAX))
#define gmic_uint64 unsigned long long #define gmic_uint64 unsigned long long
#else #else
#define gmic_uint64 unsigned long #define gmic_uint64 unsigned long
#endif // #if UINTPTR_MAX==0xffffffff || defined(__arm__) || defined(_M_ARM) || ((ULONG_MAX)==(UINT_MAX)) #endif // #if UINTPTR_MAX==0xffffffff || defined(__arm__) || defined(_M_ARM) || ((ULONG_MAX)==(UINT_MAX))
#endif // #if cimg_OS==2 #endif // #if cimg_OS==2
#endif // #ifndef gmic_uint64 #endif // #ifndef gmic_uint64
#ifndef gmic_build // Define some special character codes used for replacement in double quoted str
ings.
const char gmic_dollar = 23, gmic_lbrace = 24, gmic_rbrace = 25, gmic_comma = 26
, gmic_dquote = 28,
gmic_store = 29; // <- this one is only used in variable names.
#ifndef gmic_core
// Define classes 'gmic_image<T>' and 'gmic_list<T>'. // Define classes 'gmic_image<T>' and 'gmic_list<T>'.
//--------------------------------------------------- //---------------------------------------------------
#ifndef cimg_version #ifndef cimg_version
#define gmic_image CImg #define gmic_image CImg
#define gmic_list CImgList #define gmic_list CImgList
namespace cimg_library { namespace cimg_library {
skipping to change at line 176 skipping to change at line 180
const gmic_image<T>& operator()(const unsigned int l) const { const gmic_image<T>& operator()(const unsigned int l) const {
return _data[l]; return _data[l];
} }
}; };
} }
#undef gmic_image #undef gmic_image
#undef gmic_list #undef gmic_list
#endif // #ifndef cimg_version #endif // #ifndef cimg_version
#else // #ifndef gmic_build #else // #ifndef gmic_core
// Define private functions, used to compile libgmic. // Define private functions, used to compile libgmic.
//--------------------------------------------------- //---------------------------------------------------
#ifndef cimg_verbosity #ifndef cimg_verbosity
#define cimg_verbosity 1 #define cimg_verbosity 1
#endif #endif
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma comment(linker,"/STACK:6291456") #pragma comment(linker,"/STACK:6291456")
#pragma inline_depth(2) #pragma inline_depth(2)
#endif #endif
#include <locale> #include <locale>
#ifdef cimg_version #ifdef cimg_version
#error "[gmic] *** Error *** File 'CImg.h' has been already included (should hav e been done first in file 'gmic.h')." #error "[gmic] *** Error *** File 'CImg.h' has been already included (should hav e been done first in file 'gmic.h')."
#endif #endif
#ifndef cimg_plugin
#define cimg_plugin "gmic.cpp" #define cimg_plugin "gmic.cpp"
#endif
#ifndef cimglist_plugin
#define cimglist_plugin "gmic.cpp" #define cimglist_plugin "gmic.cpp"
#endif
#ifdef cimg_use_abort #ifdef cimg_use_abort
inline bool *gmic_abort_ptr(bool *const p_is_abort); inline bool *gmic_abort_ptr(bool *const p_is_abort);
#define cimg_abort_init bool *const gmic_is_abort = ::gmic_abort_ptr(0); cimg::u nused(gmic_is_abort) #define cimg_abort_init bool *const gmic_is_abort = ::gmic_abort_ptr(0); cimg::u nused(gmic_is_abort)
#define cimg_abort_test if (*gmic_is_abort) throw CImgAbortException() #define cimg_abort_test if (*gmic_is_abort) throw CImgAbortException()
#endif #endif
template<typename T> template<typename T>
inline double gmic_mp_dollar(const char *const str, inline double gmic_mp_dollar(const char *const str,
void *const p_list, const T& pixel_type); void *const p_list, const T& pixel_type);
skipping to change at line 260 skipping to change at line 268
#include <process.h> #include <process.h>
#include <psapi.h> #include <psapi.h>
#elif cimg_OS==1 #elif cimg_OS==1
#include <cerrno> #include <cerrno>
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <signal.h> #include <signal.h>
#endif // #if cimg_OS==2 #endif // #if cimg_OS==2
#endif // #ifndef gmic_core
// Define some special character codes used for replacement in double quoted str
ings.
const char gmic_dollar = 23, gmic_lbrace = 24, gmic_rbrace = 25, gmic_comma = 26
, gmic_dquote = 28,
gmic_store = 29; // <- this one is only used in variable names.
#endif // #ifndef gmic_build
// Define main libgmic class 'gmic'. // Define main libgmic class 'gmic'.
//---------------------------------- //----------------------------------
#define gmic_image cimg_library::CImg #define gmic_image cimg_library::CImg
#define gmic_list cimg_library::CImgList #define gmic_list cimg_library::CImgList
// Class 'gmic'. // Class 'gmic'.
struct gmic { struct gmic {
// Destructor. // Destructor.
 End of changes. 7 change blocks. 
11 lines changed or deleted 14 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)