mirror of
https://github.com/ImageMagick/ImageMagick.git
synced 2026-05-25 11:24:54 +02:00
This commit is contained in:
cristy
@@ -30,7 +30,7 @@ Magick::BlobRef::BlobRef ( const void* data_,
|
||||
if( data_ )
|
||||
{
|
||||
_data = new unsigned char[length_];
|
||||
memcpy( _data, data_, length_ );
|
||||
MagickCore::memcpy( _data, data_, length_ );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ Magick::MutexLock::MutexLock(void)
|
||||
return;
|
||||
}
|
||||
throwExceptionExplicit( OptionError, "mutex initialization failed",
|
||||
strerror(sysError) );
|
||||
MagickCore::strerror(sysError) );
|
||||
}
|
||||
#else
|
||||
#if defined(_VISUALC_) && defined(_MT)
|
||||
@@ -63,7 +63,7 @@ Magick::MutexLock::~MutexLock(void)
|
||||
if ( (sysError = ::pthread_mutex_destroy( &_mutex )) == 0 )
|
||||
return;
|
||||
throwExceptionExplicit( OptionError, "mutex destruction failed",
|
||||
strerror(sysError) );
|
||||
MagickCore::strerror(sysError) );
|
||||
#endif
|
||||
#if defined(_MT) && defined(_VISUALC_)
|
||||
if ( ::CloseHandle(_mutex.id) != 0 )
|
||||
@@ -80,7 +80,7 @@ void Magick::MutexLock::lock(void)
|
||||
if ( (sysError = ::pthread_mutex_lock( &_mutex )) == 0)
|
||||
return;
|
||||
throwExceptionExplicit( OptionError, "mutex lock failed",
|
||||
strerror(sysError));
|
||||
MagickCore::strerror(sysError));
|
||||
#endif
|
||||
#if defined(_MT) && defined(_VISUALC_)
|
||||
if (WaitForSingleObject(_mutex.id,INFINITE) != WAIT_FAILED)
|
||||
@@ -97,7 +97,7 @@ void Magick::MutexLock::unlock(void)
|
||||
if ( (sysError = ::pthread_mutex_unlock( &_mutex )) == 0)
|
||||
return;
|
||||
throwExceptionExplicit( OptionError, "mutex unlock failed",
|
||||
strerror(sysError) );
|
||||
MagickCore::strerror(sysError) );
|
||||
#endif
|
||||
#if defined(_MT) && defined(_VISUALC_)
|
||||
if ( ReleaseSemaphore(_mutex.id, 1, NULL) == TRUE )
|
||||
|
||||
@@ -140,6 +140,7 @@ extern "C" {
|
||||
# include "MagickCore/methods.h"
|
||||
#endif
|
||||
#include "MagickCore/magick-type.h"
|
||||
#include "MagickCore/xwindow.h"
|
||||
#include "MagickCore/accelerate.h"
|
||||
#include "MagickCore/animate.h"
|
||||
#include "MagickCore/annotate.h"
|
||||
@@ -220,7 +221,6 @@ extern "C" {
|
||||
#include "MagickCore/utility.h"
|
||||
#include "MagickCore/version.h"
|
||||
#include "MagickCore/xml-tree.h"
|
||||
#include "MagickCore/xwindow.h"
|
||||
|
||||
#if defined(__cplusplus) || defined(c_plusplus)
|
||||
}
|
||||
|
||||
@@ -256,6 +256,7 @@ MAGICKCORE_BASE_SRCS = \
|
||||
MagickCore/vms.h \
|
||||
MagickCore/widget.c \
|
||||
MagickCore/widget.h \
|
||||
MagickCore/widget-private.h \
|
||||
MagickCore/xml-tree.c \
|
||||
MagickCore/xml-tree.h \
|
||||
MagickCore/xwindow.c \
|
||||
@@ -424,6 +425,7 @@ MAGICKCORE_NOINST_HDRS = \
|
||||
MagickCore/token-private.h \
|
||||
MagickCore/type-private.h \
|
||||
MagickCore/vms.h \
|
||||
MagickCore/widget-private.h \
|
||||
MagickCore/xwindow-private.h
|
||||
|
||||
MAGICKCORE_EXTRA_DIST = \
|
||||
|
||||
@@ -69,6 +69,8 @@
|
||||
#include "MagickCore/utility.h"
|
||||
#include "MagickCore/version.h"
|
||||
#include "MagickCore/widget.h"
|
||||
#include "MagickCore/widget-private.h"
|
||||
#include "MagickCore/xwindow.h"
|
||||
#include "MagickCore/xwindow-private.h"
|
||||
|
||||
#if defined(MAGICKCORE_X11_DELEGATE)
|
||||
|
||||
@@ -73,6 +73,7 @@
|
||||
#include "MagickCore/transform.h"
|
||||
#include "MagickCore/type.h"
|
||||
#include "MagickCore/utility.h"
|
||||
#include "MagickCore/xwindow.h"
|
||||
#include "MagickCore/xwindow-private.h"
|
||||
#if defined(MAGICKCORE_FREETYPE_DELEGATE)
|
||||
#if defined(__MINGW32__)
|
||||
|
||||
@@ -87,6 +87,8 @@
|
||||
#include "MagickCore/utility.h"
|
||||
#include "MagickCore/version.h"
|
||||
#include "MagickCore/widget.h"
|
||||
#include "MagickCore/widget-private.h"
|
||||
#include "MagickCore/xwindow.h"
|
||||
#include "MagickCore/xwindow-private.h"
|
||||
|
||||
#if defined(MAGICKCORE_X11_DELEGATE)
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
/*
|
||||
Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
|
||||
dedicated to making software imaging solutions freely available.
|
||||
|
||||
You may not use this file except in compliance with the License.
|
||||
obtain a copy of the License at
|
||||
|
||||
http://www.imagemagick.org/script/license.php
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
MagickCore private X11 widget methods.
|
||||
*/
|
||||
#ifndef _MAGICKCORE_WIDGET_PRIVATE_H
|
||||
#define _MAGICKCORE_WIDGET_PRIVATE_H
|
||||
|
||||
#if defined(__cplusplus) || defined(c_plusplus)
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#if defined(MAGICKCORE_X11_DELEGATE)
|
||||
|
||||
#include "MagickCore/xwindow-private.h"
|
||||
|
||||
extern MagickPrivate int
|
||||
XCommandWidget(Display *,XWindows *,const char **,XEvent *),
|
||||
XConfirmWidget(Display *,XWindows *,const char *,const char *),
|
||||
XDialogWidget(Display *,XWindows *,const char *,const char *,char *),
|
||||
XMenuWidget(Display *,XWindows *,const char *,const char **,char *);
|
||||
|
||||
extern MagickPrivate MagickBooleanType
|
||||
XPreferencesWidget(Display *,XResourceInfo *,XWindows *);
|
||||
|
||||
extern MagickPrivate void
|
||||
DestroyXWidget(void),
|
||||
XColorBrowserWidget(Display *,XWindows *,const char *,char *),
|
||||
XFileBrowserWidget(Display *,XWindows *,const char *,char *),
|
||||
XFontBrowserWidget(Display *,XWindows *,const char *,char *),
|
||||
XInfoWidget(Display *,XWindows *,const char *),
|
||||
XListBrowserWidget(Display *,XWindows *,XWindowInfo *,const char **,
|
||||
const char *,const char *,char *),
|
||||
XNoticeWidget(Display *,XWindows *,const char *,const char *),
|
||||
XProgressMonitorWidget(Display *,XWindows *,const char *,
|
||||
const MagickOffsetType,const MagickSizeType),
|
||||
XTextViewWidget(Display *,const XResourceInfo *,XWindows *,
|
||||
const MagickBooleanType,const char *,const char **);
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(__cplusplus) || defined(c_plusplus)
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
+15
-14
@@ -54,6 +54,7 @@
|
||||
#include "MagickCore/utility.h"
|
||||
#include "MagickCore/xwindow-private.h"
|
||||
#include "MagickCore/widget.h"
|
||||
#include "MagickCore/widget-private.h"
|
||||
|
||||
#if defined(MAGICKCORE_X11_DELEGATE)
|
||||
|
||||
@@ -184,7 +185,7 @@ static void
|
||||
% A description of each parameter follows:
|
||||
%
|
||||
*/
|
||||
MagickExport void DestroyXWidget(void)
|
||||
MagickPrivate void DestroyXWidget(void)
|
||||
{
|
||||
if (selection_info != (XWidgetInfo *) NULL)
|
||||
selection_info=(XWidgetInfo *) RelinquishMagickMemory(selection_info);
|
||||
@@ -1615,7 +1616,7 @@ static void XSetTextColor(Display *display,const XWindowInfo *window_info,
|
||||
% o reply: the response from the user is returned in this parameter.
|
||||
%
|
||||
*/
|
||||
MagickExport void XColorBrowserWidget(Display *display,XWindows *windows,
|
||||
MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows,
|
||||
const char *action,char *reply)
|
||||
{
|
||||
#define CancelButtonText "Cancel"
|
||||
@@ -2806,7 +2807,7 @@ MagickExport void XColorBrowserWidget(Display *display,XWindows *windows,
|
||||
% o event: Specifies a pointer to a X11 XEvent structure.
|
||||
%
|
||||
*/
|
||||
MagickExport int XCommandWidget(Display *display,XWindows *windows,
|
||||
MagickPrivate int XCommandWidget(Display *display,XWindows *windows,
|
||||
const char **selections,XEvent *event)
|
||||
{
|
||||
#define tile_width 112
|
||||
@@ -3232,7 +3233,7 @@ MagickExport int XCommandWidget(Display *display,XWindows *windows,
|
||||
% o description: Specifies any description to the message.
|
||||
%
|
||||
*/
|
||||
MagickExport int XConfirmWidget(Display *display,XWindows *windows,
|
||||
MagickPrivate int XConfirmWidget(Display *display,XWindows *windows,
|
||||
const char *reason,const char *description)
|
||||
{
|
||||
#define CancelButtonText "Cancel"
|
||||
@@ -3640,7 +3641,7 @@ MagickExport int XConfirmWidget(Display *display,XWindows *windows,
|
||||
% o reply: the response from the user is returned in this parameter.
|
||||
%
|
||||
*/
|
||||
MagickExport int XDialogWidget(Display *display,XWindows *windows,
|
||||
MagickPrivate int XDialogWidget(Display *display,XWindows *windows,
|
||||
const char *action,const char *query,char *reply)
|
||||
{
|
||||
#define CancelButtonText "Cancel"
|
||||
@@ -4215,7 +4216,7 @@ MagickExport int XDialogWidget(Display *display,XWindows *windows,
|
||||
% o reply: the response from the user is returned in this parameter.
|
||||
%
|
||||
*/
|
||||
MagickExport void XFileBrowserWidget(Display *display,XWindows *windows,
|
||||
MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows,
|
||||
const char *action,char *reply)
|
||||
{
|
||||
#define CancelButtonText "Cancel"
|
||||
@@ -5474,7 +5475,7 @@ static int FontCompare(const void *x,const void *y)
|
||||
}
|
||||
#endif
|
||||
|
||||
MagickExport void XFontBrowserWidget(Display *display,XWindows *windows,
|
||||
MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows,
|
||||
const char *action,char *reply)
|
||||
{
|
||||
#define BackButtonText "Back"
|
||||
@@ -6651,7 +6652,7 @@ MagickExport void XFontBrowserWidget(Display *display,XWindows *windows,
|
||||
% displayed in the Info widget.
|
||||
%
|
||||
*/
|
||||
MagickExport void XInfoWidget(Display *display,XWindows *windows,
|
||||
MagickPrivate void XInfoWidget(Display *display,XWindows *windows,
|
||||
const char *activity)
|
||||
{
|
||||
unsigned int
|
||||
@@ -6752,7 +6753,7 @@ MagickExport void XInfoWidget(Display *display,XWindows *windows,
|
||||
% o reply: the response from the user is returned in this parameter.
|
||||
%
|
||||
*/
|
||||
MagickExport void XListBrowserWidget(Display *display,XWindows *windows,
|
||||
MagickPrivate void XListBrowserWidget(Display *display,XWindows *windows,
|
||||
XWindowInfo *window_info,const char **list,const char *action,
|
||||
const char *query,char *reply)
|
||||
{
|
||||
@@ -7663,7 +7664,7 @@ MagickExport void XListBrowserWidget(Display *display,XWindows *windows,
|
||||
% is returned here.
|
||||
%
|
||||
*/
|
||||
MagickExport int XMenuWidget(Display *display,XWindows *windows,
|
||||
MagickPrivate int XMenuWidget(Display *display,XWindows *windows,
|
||||
const char *title,const char **selections,char *item)
|
||||
{
|
||||
Cursor
|
||||
@@ -8093,7 +8094,7 @@ MagickExport int XMenuWidget(Display *display,XWindows *windows,
|
||||
% o description: Specifies any description to the message.
|
||||
%
|
||||
*/
|
||||
MagickExport void XNoticeWidget(Display *display,XWindows *windows,
|
||||
MagickPrivate void XNoticeWidget(Display *display,XWindows *windows,
|
||||
const char *reason,const char *description)
|
||||
{
|
||||
#define DismissButtonText "Dismiss"
|
||||
@@ -8422,7 +8423,7 @@ MagickExport void XNoticeWidget(Display *display,XWindows *windows,
|
||||
% o window: Specifies a pointer to a XWindows structure.
|
||||
%
|
||||
*/
|
||||
MagickExport MagickBooleanType XPreferencesWidget(Display *display,
|
||||
MagickPrivate MagickBooleanType XPreferencesWidget(Display *display,
|
||||
XResourceInfo *resource_info,XWindows *windows)
|
||||
{
|
||||
#define ApplyButtonText "Apply"
|
||||
@@ -8880,7 +8881,7 @@ MagickExport MagickBooleanType XPreferencesWidget(Display *display,
|
||||
% o span: Specifies the span relative to completing a task.
|
||||
%
|
||||
*/
|
||||
MagickExport void XProgressMonitorWidget(Display *display,XWindows *windows,
|
||||
MagickPrivate void XProgressMonitorWidget(Display *display,XWindows *windows,
|
||||
const char *task,const MagickOffsetType offset,const MagickSizeType span)
|
||||
{
|
||||
unsigned int
|
||||
@@ -8959,7 +8960,7 @@ MagickExport void XProgressMonitorWidget(Display *display,XWindows *windows,
|
||||
% o textlist: This string list is displayed within the Text View widget.
|
||||
%
|
||||
*/
|
||||
MagickExport void XTextViewWidget(Display *display,
|
||||
MagickPrivate void XTextViewWidget(Display *display,
|
||||
const XResourceInfo *resource_info,XWindows *windows,
|
||||
const MagickBooleanType mono,const char *title,const char **textlist)
|
||||
{
|
||||
|
||||
@@ -22,35 +22,6 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#if defined(MAGICKCORE_X11_DELEGATE)
|
||||
|
||||
#include "MagickCore/xwindow-private.h"
|
||||
|
||||
extern MagickExport int
|
||||
XCommandWidget(Display *,XWindows *,const char **,XEvent *),
|
||||
XConfirmWidget(Display *,XWindows *,const char *,const char *),
|
||||
XDialogWidget(Display *,XWindows *,const char *,const char *,char *),
|
||||
XMenuWidget(Display *,XWindows *,const char *,const char **,char *);
|
||||
|
||||
extern MagickExport MagickBooleanType
|
||||
XPreferencesWidget(Display *,XResourceInfo *,XWindows *);
|
||||
|
||||
extern MagickExport void
|
||||
DestroyXWidget(void),
|
||||
XColorBrowserWidget(Display *,XWindows *,const char *,char *),
|
||||
XFileBrowserWidget(Display *,XWindows *,const char *,char *),
|
||||
XFontBrowserWidget(Display *,XWindows *,const char *,char *),
|
||||
XInfoWidget(Display *,XWindows *,const char *),
|
||||
XListBrowserWidget(Display *,XWindows *,XWindowInfo *,const char **,
|
||||
const char *,const char *,char *),
|
||||
XNoticeWidget(Display *,XWindows *,const char *,const char *),
|
||||
XProgressMonitorWidget(Display *,XWindows *,const char *,
|
||||
const MagickOffsetType,const MagickSizeType),
|
||||
XTextViewWidget(Display *,const XResourceInfo *,XWindows *,
|
||||
const MagickBooleanType,const char *,const char **);
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(__cplusplus) || defined(c_plusplus)
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -161,6 +161,16 @@ typedef struct _XDrawInfo
|
||||
geometry[MaxTextExtent];
|
||||
} XDrawInfo;
|
||||
|
||||
typedef struct _XImportInfo
|
||||
{
|
||||
MagickBooleanType
|
||||
frame,
|
||||
borders,
|
||||
screen,
|
||||
descend,
|
||||
silent;
|
||||
} XImportInfo;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
DefaultState = 0x0000,
|
||||
@@ -505,43 +515,33 @@ typedef struct _XWindows
|
||||
dnd_protocols;
|
||||
} XWindows;
|
||||
|
||||
extern MagickExport char
|
||||
*XGetResourceClass(XrmDatabase,const char *,const char *,char *),
|
||||
*XGetResourceInstance(XrmDatabase,const char *,const char *,const char *),
|
||||
*XGetScreenDensity(Display *);
|
||||
|
||||
extern MagickExport Cursor
|
||||
extern MagickPrivate Cursor
|
||||
XMakeCursor(Display *,Window,Colormap,char *,char *);
|
||||
|
||||
extern MagickExport int
|
||||
XCheckDefineCursor(Display *,Window,Cursor),
|
||||
XError(Display *,XErrorEvent *);
|
||||
extern MagickPrivate int
|
||||
XCheckDefineCursor(Display *,Window,Cursor);
|
||||
|
||||
extern MagickExport MagickBooleanType
|
||||
extern MagickPrivate MagickBooleanType
|
||||
XAnnotateImage(Display *,const XPixelInfo *,XAnnotateInfo *,Image *),
|
||||
XComponentGenesis(void),
|
||||
XDrawImage(Display *,const XPixelInfo *,XDrawInfo *,Image *),
|
||||
XGetWindowColor(Display *,XWindows *,char *),
|
||||
XMagickProgressMonitor(const char *,const MagickOffsetType,
|
||||
const MagickSizeType,void *),
|
||||
XMakeImage(Display *,const XResourceInfo *,XWindowInfo *,Image *,unsigned int,
|
||||
unsigned int,ExceptionInfo *),
|
||||
XQueryColorDatabase(const char *,XColor *),
|
||||
XRemoteCommand(Display *,const char *,const char *);
|
||||
XQueryColorDatabase(const char *,XColor *);
|
||||
|
||||
extern MagickPrivate MagickBooleanType
|
||||
XComponentGenesis(void);
|
||||
|
||||
extern MagickExport void
|
||||
DestroyXResources(void),
|
||||
extern MagickPrivate void
|
||||
XBestIconSize(Display *,XWindowInfo *,Image *),
|
||||
XBestPixel(Display *,const Colormap,XColor *,unsigned int,XColor *),
|
||||
XCheckRefreshWindows(Display *,XWindows *),
|
||||
XClientMessage(Display *,const Window,const Atom,const Atom,const Time),
|
||||
XComponentTerminus(void),
|
||||
XConfigureImageColormap(Display *,XResourceInfo *,XWindows *,Image *),
|
||||
XConstrainWindowPosition(Display *,XWindowInfo *),
|
||||
XDelay(Display *,const size_t),
|
||||
XDisplayImageInfo(Display *,const XResourceInfo *,XWindows *,Image *,Image *),
|
||||
XDestroyResourceInfo(XResourceInfo *),
|
||||
XDestroyWindowColors(Display *,Window),
|
||||
XFreeResources(Display *,XVisualInfo *,XStandardColormap *,XPixelInfo *,
|
||||
XFontStruct *,XResourceInfo *,XWindowInfo *),
|
||||
@@ -554,7 +554,6 @@ extern MagickExport void
|
||||
XGetPixelInfo(Display *,const XVisualInfo *,const XStandardColormap *,
|
||||
const XResourceInfo *,Image *,XPixelInfo *),
|
||||
XGetMapInfo(const XVisualInfo *,const Colormap,XStandardColormap *),
|
||||
XGetResourceInfo(const ImageInfo *,XrmDatabase,const char *,XResourceInfo *),
|
||||
XGetWindowInfo(Display *,XVisualInfo *,XStandardColormap *,XPixelInfo *,
|
||||
XFontStruct *,XResourceInfo *,XWindowInfo *),
|
||||
XMakeMagnifyImage(Display *,XWindows *),
|
||||
@@ -564,29 +563,22 @@ extern MagickExport void
|
||||
XWindowInfo *),
|
||||
XQueryPosition(Display *,const Window,int *,int *),
|
||||
XRefreshWindow(Display *,const XWindowInfo *,const XEvent *),
|
||||
XRetainWindowColors(Display *,const Window),
|
||||
XSetCursorState(Display *,XWindows *,const MagickStatusType),
|
||||
XUserPreferences(XResourceInfo *),
|
||||
XWarning(const ExceptionType,const char *,const char *);
|
||||
|
||||
extern MagickPrivate void
|
||||
XComponentTerminus(void);
|
||||
|
||||
extern MagickExport Window
|
||||
extern MagickPrivate Window
|
||||
XWindowByID(Display *,const Window,const size_t),
|
||||
XWindowByName(Display *,const Window,const char *),
|
||||
XWindowByProperty(Display *,const Window,const Atom);
|
||||
|
||||
extern MagickExport XFontStruct
|
||||
extern MagickPrivate XFontStruct
|
||||
*XBestFont(Display *,const XResourceInfo *,const MagickBooleanType);
|
||||
|
||||
extern MagickExport XrmDatabase
|
||||
XGetResourceDatabase(Display *,const char *);
|
||||
|
||||
extern MagickExport XVisualInfo
|
||||
extern MagickPrivate XVisualInfo
|
||||
*XBestVisualInfo(Display *,XStandardColormap *,XResourceInfo *);
|
||||
|
||||
extern MagickExport XWindows
|
||||
extern MagickPrivate XWindows
|
||||
*XInitializeWindows(Display *,XResourceInfo *),
|
||||
*XSetWindows(XWindows *);
|
||||
|
||||
|
||||
+46
-45
@@ -77,6 +77,7 @@
|
||||
#include "MagickCore/transform.h"
|
||||
#include "MagickCore/utility.h"
|
||||
#include "MagickCore/widget.h"
|
||||
#include "MagickCore/widget-private.h"
|
||||
#include "MagickCore/xwindow.h"
|
||||
#include "MagickCore/xwindow-private.h"
|
||||
#include "MagickCore/version.h"
|
||||
@@ -452,7 +453,7 @@ MagickExport void DestroyXResources(void)
|
||||
% o image: the image.
|
||||
%
|
||||
*/
|
||||
MagickExport MagickBooleanType XAnnotateImage(Display *display,
|
||||
MagickPrivate MagickBooleanType XAnnotateImage(Display *display,
|
||||
const XPixelInfo *pixel,XAnnotateInfo *annotate_info,Image *image)
|
||||
{
|
||||
CacheView
|
||||
@@ -781,7 +782,7 @@ static char **FontToList(char *font)
|
||||
return(fontlist);
|
||||
}
|
||||
|
||||
MagickExport XFontStruct *XBestFont(Display *display,
|
||||
MagickPrivate XFontStruct *XBestFont(Display *display,
|
||||
const XResourceInfo *resource_info,const MagickBooleanType text_font)
|
||||
{
|
||||
static const char
|
||||
@@ -889,7 +890,7 @@ MagickExport XFontStruct *XBestFont(Display *display,
|
||||
% o image: the image.
|
||||
%
|
||||
*/
|
||||
MagickExport void XBestIconSize(Display *display,XWindowInfo *window,
|
||||
MagickPrivate void XBestIconSize(Display *display,XWindowInfo *window,
|
||||
Image *image)
|
||||
{
|
||||
int
|
||||
@@ -1017,7 +1018,7 @@ MagickExport void XBestIconSize(Display *display,XWindowInfo *window,
|
||||
% o color: Specifies the desired RGB value to find in the colors array.
|
||||
%
|
||||
*/
|
||||
MagickExport void XBestPixel(Display *display,const Colormap colormap,
|
||||
MagickPrivate void XBestPixel(Display *display,const Colormap colormap,
|
||||
XColor *colors,unsigned int number_colors,XColor *color)
|
||||
{
|
||||
MagickBooleanType
|
||||
@@ -1154,7 +1155,7 @@ static inline size_t MagickMin(const unsigned int x,
|
||||
return(y);
|
||||
}
|
||||
|
||||
MagickExport XVisualInfo *XBestVisualInfo(Display *display,
|
||||
MagickPrivate XVisualInfo *XBestVisualInfo(Display *display,
|
||||
XStandardColormap *map_info,XResourceInfo *resource_info)
|
||||
{
|
||||
#define MaxStandardColormaps 7
|
||||
@@ -1460,7 +1461,7 @@ MagickExport XVisualInfo *XBestVisualInfo(Display *display,
|
||||
% o cursor: the cursor.
|
||||
%
|
||||
*/
|
||||
MagickExport int XCheckDefineCursor(Display *display,Window window,
|
||||
MagickPrivate int XCheckDefineCursor(Display *display,Window window,
|
||||
Cursor cursor)
|
||||
{
|
||||
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
|
||||
@@ -1496,7 +1497,7 @@ MagickExport int XCheckDefineCursor(Display *display,Window window,
|
||||
% o windows: Specifies a pointer to a XWindows structure.
|
||||
%
|
||||
*/
|
||||
MagickExport void XCheckRefreshWindows(Display *display,XWindows *windows)
|
||||
MagickPrivate void XCheckRefreshWindows(Display *display,XWindows *windows)
|
||||
{
|
||||
Window
|
||||
id;
|
||||
@@ -1555,7 +1556,7 @@ MagickExport void XCheckRefreshWindows(Display *display,XWindows *windows)
|
||||
% o timestamp: Specifies a value of type Time.
|
||||
%
|
||||
*/
|
||||
MagickExport void XClientMessage(Display *display,const Window window,
|
||||
MagickPrivate void XClientMessage(Display *display,const Window window,
|
||||
const Atom protocol,const Atom reason,const Time timestamp)
|
||||
{
|
||||
XClientMessageEvent
|
||||
@@ -1693,7 +1694,7 @@ MagickPrivate void XComponentTerminus(void)
|
||||
% o image: the image.
|
||||
%
|
||||
*/
|
||||
MagickExport void XConfigureImageColormap(Display *display,
|
||||
MagickPrivate void XConfigureImageColormap(Display *display,
|
||||
XResourceInfo *resource_info,XWindows *windows,Image *image)
|
||||
{
|
||||
Colormap
|
||||
@@ -1745,7 +1746,7 @@ MagickExport void XConfigureImageColormap(Display *display,
|
||||
% o window_info: Specifies a pointer to a XWindowInfo structure.
|
||||
%
|
||||
*/
|
||||
MagickExport void XConstrainWindowPosition(Display *display,
|
||||
MagickPrivate void XConstrainWindowPosition(Display *display,
|
||||
XWindowInfo *window_info)
|
||||
{
|
||||
int
|
||||
@@ -1795,7 +1796,7 @@ MagickExport void XConstrainWindowPosition(Display *display,
|
||||
% returning.
|
||||
%
|
||||
*/
|
||||
MagickExport void XDelay(Display *display,const size_t milliseconds)
|
||||
MagickPrivate void XDelay(Display *display,const size_t milliseconds)
|
||||
{
|
||||
assert(display != (Display *) NULL);
|
||||
(void) XFlush(display);
|
||||
@@ -1867,7 +1868,7 @@ MagickExport void XDestroyResourceInfo(XResourceInfo *resource_info)
|
||||
% o window: Specifies a pointer to a Window structure.
|
||||
%
|
||||
*/
|
||||
MagickExport void XDestroyWindowColors(Display *display,Window window)
|
||||
MagickPrivate void XDestroyWindowColors(Display *display,Window window)
|
||||
{
|
||||
Atom
|
||||
property,
|
||||
@@ -1944,7 +1945,7 @@ MagickExport void XDestroyWindowColors(Display *display,Window window)
|
||||
% o image: the image.
|
||||
%
|
||||
*/
|
||||
MagickExport void XDisplayImageInfo(Display *display,
|
||||
MagickPrivate void XDisplayImageInfo(Display *display,
|
||||
const XResourceInfo *resource_info,XWindows *windows,Image *undo_image,
|
||||
Image *image)
|
||||
{
|
||||
@@ -2282,7 +2283,7 @@ static void XDitherImage(Image *image,XImage *ximage)
|
||||
% o image: the image.
|
||||
%
|
||||
*/
|
||||
MagickExport MagickBooleanType XDrawImage(Display *display,
|
||||
MagickPrivate MagickBooleanType XDrawImage(Display *display,
|
||||
const XPixelInfo *pixel,XDrawInfo *draw_info,Image *image)
|
||||
{
|
||||
CacheView
|
||||
@@ -2644,12 +2645,12 @@ MagickExport MagickBooleanType XDrawImage(Display *display,
|
||||
%
|
||||
% XError() ignores BadWindow errors for XQueryTree and XGetWindowAttributes,
|
||||
% and ignores BadDrawable errors for XGetGeometry, and ignores BadValue errors
|
||||
% for XQueryColor. It returns MagickFalse in those cases. Otherwise it returns
|
||||
% True.
|
||||
% for XQueryColor. It returns MagickFalse in those cases. Otherwise it
|
||||
% returns True.
|
||||
%
|
||||
% The format of the XError function is:
|
||||
%
|
||||
% XError(display,error)
|
||||
% int XError(display,error)
|
||||
%
|
||||
% A description of each parameter follows:
|
||||
%
|
||||
@@ -2739,7 +2740,7 @@ MagickExport int XError(Display *display,XErrorEvent *error)
|
||||
% o window_info: Specifies a pointer to a X11 XWindowInfo structure.
|
||||
%
|
||||
*/
|
||||
MagickExport void XFreeResources(Display *display,XVisualInfo *visual_info,
|
||||
MagickPrivate void XFreeResources(Display *display,XVisualInfo *visual_info,
|
||||
XStandardColormap *map_info,XPixelInfo *pixel,XFontStruct *font_info,
|
||||
XResourceInfo *resource_info,XWindowInfo *window_info)
|
||||
{
|
||||
@@ -2833,7 +2834,7 @@ MagickExport void XFreeResources(Display *display,XVisualInfo *visual_info,
|
||||
% o pixel: Specifies a pointer to a XPixelInfo structure.
|
||||
%
|
||||
*/
|
||||
MagickExport void XFreeStandardColormap(Display *display,
|
||||
MagickPrivate void XFreeStandardColormap(Display *display,
|
||||
const XVisualInfo *visual_info,XStandardColormap *map_info,XPixelInfo *pixel)
|
||||
{
|
||||
/*
|
||||
@@ -2886,7 +2887,7 @@ MagickExport void XFreeStandardColormap(Display *display,
|
||||
% o annotate_info: Specifies a pointer to a XAnnotateInfo structure.
|
||||
%
|
||||
*/
|
||||
MagickExport void XGetAnnotateInfo(XAnnotateInfo *annotate_info)
|
||||
MagickPrivate void XGetAnnotateInfo(XAnnotateInfo *annotate_info)
|
||||
{
|
||||
/*
|
||||
Initialize annotate structure.
|
||||
@@ -2936,7 +2937,7 @@ MagickExport void XGetAnnotateInfo(XAnnotateInfo *annotate_info)
|
||||
% o map_info: Specifies a pointer to a X11 XStandardColormap structure.
|
||||
%
|
||||
*/
|
||||
MagickExport void XGetMapInfo(const XVisualInfo *visual_info,
|
||||
MagickPrivate void XGetMapInfo(const XVisualInfo *visual_info,
|
||||
const Colormap colormap,XStandardColormap *map_info)
|
||||
{
|
||||
/*
|
||||
@@ -3011,7 +3012,7 @@ MagickExport void XGetMapInfo(const XVisualInfo *visual_info,
|
||||
% o pixel: Specifies a pointer to a XPixelInfo structure.
|
||||
%
|
||||
*/
|
||||
MagickExport void XGetPixelInfo(Display *display,
|
||||
MagickPrivate void XGetPixelInfo(Display *display,
|
||||
const XVisualInfo *visual_info,const XStandardColormap *map_info,
|
||||
const XResourceInfo *resource_info,Image *image,XPixelInfo *pixel)
|
||||
{
|
||||
@@ -3831,7 +3832,7 @@ static Window XGetSubwindow(Display *display,Window window,int x,int y)
|
||||
% returned in this character string.
|
||||
%
|
||||
*/
|
||||
MagickExport MagickBooleanType XGetWindowColor(Display *display,
|
||||
MagickPrivate MagickBooleanType XGetWindowColor(Display *display,
|
||||
XWindows *windows,char *name)
|
||||
{
|
||||
int
|
||||
@@ -4563,7 +4564,7 @@ static Image *XGetWindowImage(Display *display,const Window window,
|
||||
% o resource_info: Specifies a pointer to a X11 XResourceInfo structure.
|
||||
%
|
||||
*/
|
||||
MagickExport void XGetWindowInfo(Display *display,XVisualInfo *visual_info,
|
||||
MagickPrivate void XGetWindowInfo(Display *display,XVisualInfo *visual_info,
|
||||
XStandardColormap *map_info,XPixelInfo *pixel,XFontStruct *font_info,
|
||||
XResourceInfo *resource_info,XWindowInfo *window)
|
||||
{
|
||||
@@ -4713,7 +4714,7 @@ MagickExport void XGetWindowInfo(Display *display,XVisualInfo *visual_info,
|
||||
% contains the extents of any highlighting rectangle.
|
||||
%
|
||||
*/
|
||||
MagickExport void XHighlightEllipse(Display *display,Window window,
|
||||
MagickPrivate void XHighlightEllipse(Display *display,Window window,
|
||||
GC annotate_context,const RectangleInfo *highlight_info)
|
||||
{
|
||||
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
|
||||
@@ -4763,7 +4764,7 @@ MagickExport void XHighlightEllipse(Display *display,Window window,
|
||||
% contains the extents of any highlighting rectangle.
|
||||
%
|
||||
*/
|
||||
MagickExport void XHighlightLine(Display *display,Window window,
|
||||
MagickPrivate void XHighlightLine(Display *display,Window window,
|
||||
GC annotate_context,const XSegment *highlight_info)
|
||||
{
|
||||
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
|
||||
@@ -4807,7 +4808,7 @@ MagickExport void XHighlightLine(Display *display,Window window,
|
||||
% contains the extents of any highlighting rectangle.
|
||||
%
|
||||
*/
|
||||
MagickExport void XHighlightRectangle(Display *display,Window window,
|
||||
MagickPrivate void XHighlightRectangle(Display *display,Window window,
|
||||
GC annotate_context,const RectangleInfo *highlight_info)
|
||||
{
|
||||
assert(display != (Display *) NULL);
|
||||
@@ -5122,7 +5123,7 @@ MagickExport Image *XImportImage(const ImageInfo *image_info,
|
||||
% o resource_info: Specifies a pointer to a X11 XResourceInfo structure.
|
||||
%
|
||||
*/
|
||||
MagickExport XWindows *XInitializeWindows(Display *display,
|
||||
MagickPrivate XWindows *XInitializeWindows(Display *display,
|
||||
XResourceInfo *resource_info)
|
||||
{
|
||||
Window
|
||||
@@ -5319,7 +5320,7 @@ MagickExport XWindows *XInitializeWindows(Display *display,
|
||||
% o foreground_color: Specifies the color to use for the cursor foreground.
|
||||
%
|
||||
*/
|
||||
MagickExport Cursor XMakeCursor(Display *display,Window window,
|
||||
MagickPrivate Cursor XMakeCursor(Display *display,Window window,
|
||||
Colormap colormap,char *background_color,char *foreground_color)
|
||||
{
|
||||
#define scope_height 17
|
||||
@@ -5420,7 +5421,7 @@ MagickExport Cursor XMakeCursor(Display *display,Window window,
|
||||
% o exception: return any errors or warnings in this structure.
|
||||
%
|
||||
*/
|
||||
MagickExport MagickBooleanType XMakeImage(Display *display,
|
||||
MagickPrivate MagickBooleanType XMakeImage(Display *display,
|
||||
const XResourceInfo *resource_info,XWindowInfo *window,Image *image,
|
||||
unsigned int width,unsigned int height,ExceptionInfo *exception)
|
||||
{
|
||||
@@ -7086,7 +7087,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
|
||||
% o windows: Specifies a pointer to a XWindows structure.
|
||||
%
|
||||
*/
|
||||
MagickExport void XMakeMagnifyImage(Display *display,XWindows *windows)
|
||||
MagickPrivate void XMakeMagnifyImage(Display *display,XWindows *windows)
|
||||
{
|
||||
char
|
||||
tuple[MaxTextExtent];
|
||||
@@ -7706,7 +7707,7 @@ static inline Quantum ScaleXToQuantum(const size_t x,
|
||||
return((Quantum) (((MagickRealType) QuantumRange*x)/scale+0.5));
|
||||
}
|
||||
|
||||
MagickExport void XMakeStandardColormap(Display *display,
|
||||
MagickPrivate void XMakeStandardColormap(Display *display,
|
||||
XVisualInfo *visual_info,XResourceInfo *resource_info,Image *image,
|
||||
XStandardColormap *map_info,XPixelInfo *pixel)
|
||||
{
|
||||
@@ -8322,7 +8323,7 @@ MagickExport void XMakeStandardColormap(Display *display,
|
||||
% o window_info: Specifies a pointer to a X11 XWindowInfo structure.
|
||||
%
|
||||
*/
|
||||
MagickExport void XMakeWindow(Display *display,Window parent,char **argv,
|
||||
MagickPrivate void XMakeWindow(Display *display,Window parent,char **argv,
|
||||
int argc,XClassHint *class_hint,XWMHints *manager_hints,
|
||||
XWindowInfo *window_info)
|
||||
{
|
||||
@@ -8599,7 +8600,7 @@ static const char *GetLocaleMonitorMessage(const char *text)
|
||||
return(locale_message);
|
||||
}
|
||||
|
||||
MagickExport MagickBooleanType XMagickProgressMonitor(const char *tag,
|
||||
MagickPrivate MagickBooleanType XMagickProgressMonitor(const char *tag,
|
||||
const MagickOffsetType quantum,const MagickSizeType span,
|
||||
void *magick_unused(client_data))
|
||||
{
|
||||
@@ -8641,7 +8642,7 @@ MagickExport MagickBooleanType XMagickProgressMonitor(const char *tag,
|
||||
% color is returned as this value.
|
||||
%
|
||||
*/
|
||||
MagickExport MagickBooleanType XQueryColorDatabase(const char *target,
|
||||
MagickPrivate MagickBooleanType XQueryColorDatabase(const char *target,
|
||||
XColor *color)
|
||||
{
|
||||
Colormap
|
||||
@@ -8721,7 +8722,7 @@ MagickExport MagickBooleanType XQueryColorDatabase(const char *target,
|
||||
% window.
|
||||
%
|
||||
*/
|
||||
MagickExport void XQueryPosition(Display *display,const Window window,int *x,int *y)
|
||||
MagickPrivate void XQueryPosition(Display *display,const Window window,int *x,int *y)
|
||||
{
|
||||
int
|
||||
x_root,
|
||||
@@ -8771,7 +8772,7 @@ MagickExport void XQueryPosition(Display *display,const Window window,int *x,int
|
||||
% the entire image is refreshed.
|
||||
%
|
||||
*/
|
||||
MagickExport void XRefreshWindow(Display *display,const XWindowInfo *window,
|
||||
MagickPrivate void XRefreshWindow(Display *display,const XWindowInfo *window,
|
||||
const XEvent *event)
|
||||
{
|
||||
int
|
||||
@@ -9202,7 +9203,7 @@ static Window XSelectWindow(Display *display,RectangleInfo *crop_info)
|
||||
% to busy, otherwise the cursor are reset to their default.
|
||||
%
|
||||
*/
|
||||
MagickExport void XSetCursorState(Display *display,XWindows *windows,
|
||||
MagickPrivate void XSetCursorState(Display *display,XWindows *windows,
|
||||
const MagickStatusType state)
|
||||
{
|
||||
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
|
||||
@@ -9258,7 +9259,7 @@ MagickExport void XSetCursorState(Display *display,XWindows *windows,
|
||||
% o windows_info: Initialize the Windows structure with this information.
|
||||
%
|
||||
*/
|
||||
MagickExport XWindows *XSetWindows(XWindows *windows_info)
|
||||
MagickPrivate XWindows *XSetWindows(XWindows *windows_info)
|
||||
{
|
||||
static XWindows
|
||||
*windows = (XWindows *) NULL;
|
||||
@@ -9293,7 +9294,7 @@ MagickExport XWindows *XSetWindows(XWindows *windows_info)
|
||||
% o resource_info: Specifies a pointer to a X11 XResourceInfo structure.
|
||||
%
|
||||
*/
|
||||
MagickExport void XUserPreferences(XResourceInfo *resource_info)
|
||||
MagickPrivate void XUserPreferences(XResourceInfo *resource_info)
|
||||
{
|
||||
#if defined(X11_PREFERENCES_PATH)
|
||||
char
|
||||
@@ -9420,7 +9421,7 @@ static const char *XVisualClassName(const int visual_class)
|
||||
% o description: Specifies any description to the reason.
|
||||
%
|
||||
*/
|
||||
MagickExport void XWarning(const ExceptionType magick_unused(warning),
|
||||
MagickPrivate void XWarning(const ExceptionType magick_unused(warning),
|
||||
const char *reason,const char *description)
|
||||
{
|
||||
char
|
||||
@@ -9467,7 +9468,7 @@ MagickExport void XWarning(const ExceptionType magick_unused(warning),
|
||||
% o id: Specifies the id of the window to locate.
|
||||
%
|
||||
*/
|
||||
MagickExport Window XWindowByID(Display *display,const Window root_window,
|
||||
MagickPrivate Window XWindowByID(Display *display,const Window root_window,
|
||||
const size_t id)
|
||||
{
|
||||
RectangleInfo
|
||||
@@ -9545,7 +9546,7 @@ MagickExport Window XWindowByID(Display *display,const Window root_window,
|
||||
% o name: Specifies the name of the window to locate.
|
||||
%
|
||||
*/
|
||||
MagickExport Window XWindowByName(Display *display,const Window root_window,
|
||||
MagickPrivate Window XWindowByName(Display *display,const Window root_window,
|
||||
const char *name)
|
||||
{
|
||||
register int
|
||||
@@ -9622,7 +9623,7 @@ MagickExport Window XWindowByName(Display *display,const Window root_window,
|
||||
% o property: Specifies the property of the window to locate.
|
||||
%
|
||||
*/
|
||||
MagickExport Window XWindowByProperty(Display *display,const Window window,
|
||||
MagickPrivate Window XWindowByProperty(Display *display,const Window window,
|
||||
const Atom property)
|
||||
{
|
||||
Atom
|
||||
@@ -9701,7 +9702,7 @@ MagickExport Window XWindowByProperty(Display *display,const Window window,
|
||||
% o ximage_info: Specifies a pointer to an XImportInfo structure.
|
||||
%
|
||||
*/
|
||||
MagickExport Image *XImportImage(const ImageInfo *image_info,
|
||||
MagickPrivate Image *XImportImage(const ImageInfo *image_info,
|
||||
XImportInfo *ximage_info)
|
||||
{
|
||||
assert(image_info != (const ImageInfo *) NULL);
|
||||
|
||||
+30
-8
@@ -22,20 +22,42 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#if defined(MAGICKCORE_X11_DELEGATE)
|
||||
#include <X11/Xos.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xresource.h>
|
||||
|
||||
typedef struct _XImportInfo
|
||||
{
|
||||
MagickBooleanType
|
||||
frame,
|
||||
borders,
|
||||
screen,
|
||||
descend,
|
||||
silent;
|
||||
} XImportInfo;
|
||||
XImportInfo;
|
||||
|
||||
typedef struct _XResourceInfo
|
||||
XResourceInfo;
|
||||
|
||||
extern MagickExport char
|
||||
*XGetResourceClass(XrmDatabase,const char *,const char *,char *),
|
||||
*XGetResourceInstance(XrmDatabase,const char *,const char *,const char *),
|
||||
*XGetScreenDensity(Display *);
|
||||
|
||||
extern MagickExport int
|
||||
XError(Display *,XErrorEvent *);
|
||||
|
||||
extern MagickExport XrmDatabase
|
||||
XGetResourceDatabase(Display *,const char *);
|
||||
|
||||
extern MagickExport void
|
||||
XGetResourceInfo(const ImageInfo *,XrmDatabase,const char *,XResourceInfo *),
|
||||
XRetainWindowColors(Display *,const Window);
|
||||
#endif
|
||||
|
||||
extern MagickExport Image
|
||||
*XImportImage(const ImageInfo *,XImportInfo *);
|
||||
|
||||
extern MagickExport MagickBooleanType
|
||||
XRemoteCommand(Display *,const char *,const char *);
|
||||
|
||||
extern MagickExport void
|
||||
DestroyXResources(void),
|
||||
XDestroyResourceInfo(XResourceInfo *),
|
||||
XGetImportInfo(XImportInfo *);
|
||||
|
||||
#if defined(__cplusplus) || defined(c_plusplus)
|
||||
|
||||
+37
-33
@@ -463,39 +463,40 @@ am__MagickCore_libMagickCore_la_SOURCES_DIST = \
|
||||
MagickCore/threshold.h MagickCore/type.c MagickCore/type.h \
|
||||
MagickCore/utility.c MagickCore/utility.h MagickCore/version.c \
|
||||
MagickCore/version.h MagickCore/vms.h MagickCore/widget.c \
|
||||
MagickCore/widget.h MagickCore/xml-tree.c \
|
||||
MagickCore/xml-tree.h MagickCore/xwindow.c \
|
||||
MagickCore/xwindow.h MagickCore/nt-feature.c \
|
||||
MagickCore/nt-base.c coders/aai.c coders/art.c coders/avs.c \
|
||||
coders/bgr.c coders/bmp.c coders/braille.c coders/cals.c \
|
||||
coders/caption.c coders/cin.c coders/cip.c coders/clip.c \
|
||||
coders/cmyk.c coders/cut.c coders/dcm.c coders/dds.c \
|
||||
coders/debug.c coders/dib.c coders/dng.c coders/dot.c \
|
||||
coders/dpx.c coders/fax.c coders/fits.c coders/gif.c \
|
||||
coders/gradient.c coders/gray.c coders/hald.c coders/hdr.c \
|
||||
coders/histogram.c coders/hrz.c coders/html.c coders/icon.c \
|
||||
coders/info.c coders/inline.c coders/ipl.c coders/label.c \
|
||||
coders/mac.c coders/magick.c coders/map.c coders/mat.c \
|
||||
coders/matte.c coders/meta.c coders/miff.c coders/mono.c \
|
||||
coders/mpc.c coders/mpeg.c coders/mpr.c coders/msl.c \
|
||||
coders/mtv.c coders/mvg.c coders/null.c coders/otb.c \
|
||||
coders/palm.c coders/pattern.c coders/pcd.c coders/pcl.c \
|
||||
coders/pcx.c coders/pdb.c coders/pdf.c coders/pes.c \
|
||||
coders/pict.c coders/pix.c coders/plasma.c coders/pnm.c \
|
||||
coders/preview.c coders/ps.c coders/ps2.c coders/ps3.c \
|
||||
coders/psd.c coders/pwp.c coders/raw.c coders/rgb.c \
|
||||
coders/rla.c coders/rle.c coders/scr.c coders/sct.c \
|
||||
coders/sfw.c coders/sgi.c coders/stegano.c coders/sun.c \
|
||||
coders/svg.c coders/tga.c coders/thumbnail.c coders/tile.c \
|
||||
coders/tim.c coders/ttf.c coders/txt.c coders/uil.c \
|
||||
coders/url.c coders/uyvy.c coders/vicar.c coders/vid.c \
|
||||
coders/viff.c coders/wbmp.c coders/wpg.c coders/xbm.c \
|
||||
coders/xc.c coders/xcf.c coders/xpm.c coders/xps.c \
|
||||
coders/ycbcr.c coders/yuv.c coders/dps.c coders/djvu.c \
|
||||
coders/exr.c coders/fpx.c coders/clipboard.c coders/emf.c \
|
||||
coders/jbig.c coders/jpeg.c coders/jp2.c coders/png.c \
|
||||
coders/ept.c coders/tiff.c coders/webp.c coders/wmf.c \
|
||||
coders/x.c coders/xwd.c filters/analyze.c
|
||||
MagickCore/widget.h MagickCore/widget-private.h \
|
||||
MagickCore/xml-tree.c MagickCore/xml-tree.h \
|
||||
MagickCore/xwindow.c MagickCore/xwindow.h \
|
||||
MagickCore/nt-feature.c MagickCore/nt-base.c coders/aai.c \
|
||||
coders/art.c coders/avs.c coders/bgr.c coders/bmp.c \
|
||||
coders/braille.c coders/cals.c coders/caption.c coders/cin.c \
|
||||
coders/cip.c coders/clip.c coders/cmyk.c coders/cut.c \
|
||||
coders/dcm.c coders/dds.c coders/debug.c coders/dib.c \
|
||||
coders/dng.c coders/dot.c coders/dpx.c coders/fax.c \
|
||||
coders/fits.c coders/gif.c coders/gradient.c coders/gray.c \
|
||||
coders/hald.c coders/hdr.c coders/histogram.c coders/hrz.c \
|
||||
coders/html.c coders/icon.c coders/info.c coders/inline.c \
|
||||
coders/ipl.c coders/label.c coders/mac.c coders/magick.c \
|
||||
coders/map.c coders/mat.c coders/matte.c coders/meta.c \
|
||||
coders/miff.c coders/mono.c coders/mpc.c coders/mpeg.c \
|
||||
coders/mpr.c coders/msl.c coders/mtv.c coders/mvg.c \
|
||||
coders/null.c coders/otb.c coders/palm.c coders/pattern.c \
|
||||
coders/pcd.c coders/pcl.c coders/pcx.c coders/pdb.c \
|
||||
coders/pdf.c coders/pes.c coders/pict.c coders/pix.c \
|
||||
coders/plasma.c coders/pnm.c coders/preview.c coders/ps.c \
|
||||
coders/ps2.c coders/ps3.c coders/psd.c coders/pwp.c \
|
||||
coders/raw.c coders/rgb.c coders/rla.c coders/rle.c \
|
||||
coders/scr.c coders/sct.c coders/sfw.c coders/sgi.c \
|
||||
coders/stegano.c coders/sun.c coders/svg.c coders/tga.c \
|
||||
coders/thumbnail.c coders/tile.c coders/tim.c coders/ttf.c \
|
||||
coders/txt.c coders/uil.c coders/url.c coders/uyvy.c \
|
||||
coders/vicar.c coders/vid.c coders/viff.c coders/wbmp.c \
|
||||
coders/wpg.c coders/xbm.c coders/xc.c coders/xcf.c \
|
||||
coders/xpm.c coders/xps.c coders/ycbcr.c coders/yuv.c \
|
||||
coders/dps.c coders/djvu.c coders/exr.c coders/fpx.c \
|
||||
coders/clipboard.c coders/emf.c coders/jbig.c coders/jpeg.c \
|
||||
coders/jp2.c coders/png.c coders/ept.c coders/tiff.c \
|
||||
coders/webp.c coders/wmf.c coders/x.c coders/xwd.c \
|
||||
filters/analyze.c
|
||||
am__objects_1 = MagickCore/MagickCore_libMagickCore_la-accelerate.lo \
|
||||
MagickCore/MagickCore_libMagickCore_la-animate.lo \
|
||||
MagickCore/MagickCore_libMagickCore_la-annotate.lo \
|
||||
@@ -4062,6 +4063,7 @@ MAGICKCORE_BASE_SRCS = \
|
||||
MagickCore/vms.h \
|
||||
MagickCore/widget.c \
|
||||
MagickCore/widget.h \
|
||||
MagickCore/widget-private.h \
|
||||
MagickCore/xml-tree.c \
|
||||
MagickCore/xml-tree.h \
|
||||
MagickCore/xwindow.c \
|
||||
@@ -4124,6 +4126,7 @@ MAGICKCORE_INCLUDE_HDRS = \
|
||||
MagickCore/locale_.h \
|
||||
MagickCore/log.h \
|
||||
MagickCore/magic.h \
|
||||
MagickCore/magic-private.h \
|
||||
MagickCore/magick.h \
|
||||
MagickCore/magick-config.h \
|
||||
MagickCore/magick-type.h \
|
||||
@@ -4224,6 +4227,7 @@ MAGICKCORE_NOINST_HDRS = \
|
||||
MagickCore/token-private.h \
|
||||
MagickCore/type-private.h \
|
||||
MagickCore/vms.h \
|
||||
MagickCore/widget-private.h \
|
||||
MagickCore/xwindow-private.h
|
||||
|
||||
MAGICKCORE_EXTRA_DIST = \
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
<configure name="VERSION" value="7.0.0"/>
|
||||
<configure name="LIB_VERSION" value="0x700"/>
|
||||
<configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
|
||||
<configure name="SVN_REVISION" value="5077" />
|
||||
<configure name="RELEASE_DATE" value="2011-09-02"/>
|
||||
<configure name="SVN_REVISION" value="5150" />
|
||||
<configure name="RELEASE_DATE" value="2011-09-03"/>
|
||||
<configure name="CONFIGURE" value="./configure "/>
|
||||
<configure name="PREFIX" value="/usr/local"/>
|
||||
<configure name="EXEC-PREFIX" value="/usr/local"/>
|
||||
|
||||
Reference in New Issue
Block a user