From: cristy Date: Fri, 13 Jan 2012 00:21:44 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6386 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71b27171ca760d049f5d6e9716649e08a9fbe6ae;p=imagemagick --- diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index d618a68e8..3db76f669 100644 --- a/MagickCore/magick-config.h +++ b/MagickCore/magick-config.h @@ -12,9 +12,7 @@ /* #undef AUTOTRACE_DELEGATE */ /* Define if coders and filters are to be built as modules. */ -#ifndef MAGICKCORE_BUILD_MODULES -#define MAGICKCORE_BUILD_MODULES 1 -#endif +/* #undef BUILD_MODULES */ /* Define if you have the bzip2 library */ #ifndef MAGICKCORE_BZLIB_DELEGATE @@ -221,9 +219,7 @@ #endif /* Define to 1 if you have the header file. */ -#ifndef MAGICKCORE_HAVE_CL_CL_H -#define MAGICKCORE_HAVE_CL_CL_H 1 -#endif +/* #undef HAVE_CL_CL_H */ /* Define to 1 if you have the header file. */ #ifndef MAGICKCORE_HAVE_COMPLEX_H @@ -1192,9 +1188,7 @@ #endif /* Define if you have JBIG library */ -#ifndef MAGICKCORE_JBIG_DELEGATE -#define MAGICKCORE_JBIG_DELEGATE 1 -#endif +/* #undef JBIG_DELEGATE */ /* Define if you have JPEG version 2 "Jasper" library */ #ifndef MAGICKCORE_JP2_DELEGATE @@ -1235,7 +1229,7 @@ /* Define to the system default library search path. */ #ifndef MAGICKCORE_LT_DLSEARCH_PATH -#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/alliance/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/lib64/kicad:/usr/lib/llvm:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mpich2/lib/:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/openmotif:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tracker-0.12:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2" +#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib64/tracker-0.12:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2" #endif /* The archive extension */ @@ -1289,9 +1283,7 @@ /* #undef NO_MINUS_C_MINUS_O */ /* Define if you have OPENEXR library */ -#ifndef MAGICKCORE_OPENEXR_DELEGATE -#define MAGICKCORE_OPENEXR_DELEGATE 1 -#endif +/* #undef OPENEXR_DELEGATE */ /* Name of package */ #ifndef MAGICKCORE_PACKAGE @@ -1361,9 +1353,7 @@ #endif /* Define if you have RSVG library */ -#ifndef MAGICKCORE_RSVG_DELEGATE -#define MAGICKCORE_RSVG_DELEGATE 1 -#endif +/* #undef RSVG_DELEGATE */ /* Define to the type of arg 1 for `select'. */ #ifndef MAGICKCORE_SELECT_TYPE_ARG1 @@ -1591,9 +1581,7 @@ /* #undef _MINIX */ /* Define this for the OpenCL Accelerator */ -#ifndef MAGICKCORE__OPENCL -#define MAGICKCORE__OPENCL 1 -#endif +/* #undef _OPENCL */ /* Define to 2 if the system does not provide POSIX.1 features except with this defined. */ diff --git a/MagickCore/quantum-export.c b/MagickCore/quantum-export.c index 9de5ceaee..1f307ebb6 100644 --- a/MagickCore/quantum-export.c +++ b/MagickCore/quantum-export.c @@ -3181,9 +3181,9 @@ static void ExportRGBAQuantum(const Image *image,QuantumInfo *quantum_info, } } -MagickExport size_t ExportQuantumPixels(Image *image,CacheView *image_view, - QuantumInfo *quantum_info,const QuantumType quantum_type, - unsigned char *pixels,ExceptionInfo *exception) +MagickExport size_t ExportQuantumPixels(const Image *image, + CacheView *image_view,QuantumInfo *quantum_info, + const QuantumType quantum_type,unsigned char *pixels,ExceptionInfo *exception) { MagickSizeType number_pixels; diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c index 9dae7b79d..bdb411b21 100644 --- a/MagickCore/quantum-import.c +++ b/MagickCore/quantum-import.c @@ -90,7 +90,7 @@ % % The format of the ImportQuantumPixels method is: % -% size_t ImportQuantumPixels(Image *image,CacheView *image_view, +% size_t ImportQuantumPixels(const Image *image,CacheView *image_view, % QuantumInfo *quantum_info,const QuantumType quantum_type, % const unsigned char *pixels,ExceptionInfo *exception) % @@ -3411,9 +3411,10 @@ static void ImportRGBAQuantum(const Image *image,QuantumInfo *quantum_info, } } -MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, - QuantumInfo *quantum_info,const QuantumType quantum_type, - const unsigned char *pixels,ExceptionInfo *exception) +MagickExport size_t ImportQuantumPixels(const Image *image, + CacheView *image_view,QuantumInfo *quantum_info, + const QuantumType quantum_type,const unsigned char *pixels, + ExceptionInfo *exception) { MagickSizeType number_pixels; diff --git a/MagickCore/quantum.h b/MagickCore/quantum.h index 0ac3f652a..09be107a7 100644 --- a/MagickCore/quantum.h +++ b/MagickCore/quantum.h @@ -166,10 +166,10 @@ extern MagickExport QuantumType GetQuantumType(Image *,ExceptionInfo *); extern MagickExport size_t - ExportQuantumPixels(Image *,CacheView *,QuantumInfo *,const QuantumType, + ExportQuantumPixels(const Image *,CacheView *,QuantumInfo *,const QuantumType, unsigned char *,ExceptionInfo *), GetQuantumExtent(const Image *,const QuantumInfo *,const QuantumType), - ImportQuantumPixels(Image *,CacheView *,QuantumInfo *,const QuantumType, + ImportQuantumPixels(const Image *,CacheView *,QuantumInfo *,const QuantumType, const unsigned char *,ExceptionInfo *); extern MagickExport unsigned char diff --git a/MagickCore/version.h b/MagickCore/version.h index eff2b7243..fc32b0f4e 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC" -#define MagickSVNRevision "exported" +#define MagickSVNRevision "6363" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 diff --git a/config/configure.xml b/config/configure.xml index 07b50070f..8e90f386c 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -11,7 +11,7 @@ - +