Browse Source

* PChar -> PAnsichar

Michaël Van Canneyt 2 years ago
parent
commit
e0b3bd26ba

+ 1 - 1
packages/imagemagick/examples/screenshot.lpr

@@ -91,7 +91,7 @@ end;
 var
   status: MagickBooleanType;
   wand: PMagickWand;
-  TempDir, shellStr: string;
+  TempDir, shellStr: ansistring;
   Antes: TTimeStamp;
   Command: TCommand;
 begin

+ 1 - 1
packages/imagemagick/examples/wandpixelaccess.pas

@@ -14,7 +14,7 @@ uses SysUtils, magick_wand, ImageMagick, ctypes;
 
 procedure ThrowWandException(wand: PMagickWand);
 var
-  description: PChar;
+  description: PAnsiChar;
   severity: ExceptionType;
 begin
   description := MagickGetException(wand, @severity);

+ 1 - 1
packages/imagemagick/src/cache.inc

@@ -42,7 +42,7 @@ extern MagickExport MagickBooleanType
   GetOneAuthenticPixel(Image *,const long,const long,PixelPacket *,
     ExceptionInfo *),
   InstantiateCacheComponent(void),
-  PersistPixelCache(Image *,const char *,const MagickBooleanType,
+  PersistPixelCache(Image *,const AnsiChar *,const MagickBooleanType,
     MagickOffsetType *,ExceptionInfo *),
   SyncAuthenticPixels(Image *,ExceptionInfo *);
 

+ 1 - 1
packages/imagemagick/src/compare.inc

@@ -35,7 +35,7 @@ type
     ExceptionInfo *);
 
 extern MagickExport MagickBooleanType
-  CompareImageCommand(ImageInfo *,int,char **,char **,ExceptionInfo *),
+  CompareImageCommand(ImageInfo *,int,AnsiChar **,AnsiChar **,ExceptionInfo *),
   GetImageChannelDistortion(Image *,const Image *,const ChannelType,
     const MetricType,double *,ExceptionInfo *),
   GetImageDistortion(Image *,const Image *,const MetricType,double *,

+ 3 - 3
packages/imagemagick/src/constitute.inc

@@ -29,15 +29,15 @@ type
  );
 
 {extern MagickExport Image
-  *ConstituteImage(const unsigned long,const unsigned long,const char *,
+  *ConstituteImage(const unsigned long,const unsigned long,const AnsiChar *,
     const StorageType,const void *,ExceptionInfo *),
   *PingImage(const ImageInfo *,ExceptionInfo *),
   *ReadImage(const ImageInfo *,ExceptionInfo *),
-  *ReadInlineImage(const ImageInfo *,const char *,ExceptionInfo *);
+  *ReadInlineImage(const ImageInfo *,const AnsiChar *,ExceptionInfo *);
 
 extern MagickExport MagickBooleanType
   WriteImage(const ImageInfo *,Image *),
-  WriteImages(const ImageInfo *,Image *,const char *,ExceptionInfo *);
+  WriteImages(const ImageInfo *,Image *,const AnsiChar *,ExceptionInfo *);
 
 extern MagickExport void
   DestroyConstitute(void);}

+ 11 - 11
packages/imagemagick/src/draw.inc

@@ -142,7 +142,7 @@ type
 
 type
   ElementReference = record
-    id: PChar;
+    id: PAnsiChar;
 
     type_: ReferenceType;
 
@@ -159,7 +159,7 @@ type
 type
   DrawInfo = record
     primitive,
-    geometry: PChar;
+    geometry: PAnsiChar;
 
     viewbox: RectangleInfo;
 
@@ -195,13 +195,13 @@ type
 
     compose: CompositeOperator;
 
-    text: PChar;
+    text: PAnsiChar;
 
     face: culong;
 
     font,
     metrics,
-    family: PChar;
+    family: PAnsiChar;
 
     style: StyleType;
 
@@ -209,22 +209,22 @@ type
 
     weight: culong;
     
-    encoding: PChar;
+    encoding: PAnsiChar;
 
     pointsize: double;
 
-    density: PChar;
+    density: PAnsiChar;
 
     align: AlignType;
 
     undercolor,
     border_color: PixelPacket;
 
-    server_name: PChar;
+    server_name: PAnsiChar;
 
     dash_pattern: Pdouble;
 
-    clip_path: PChar;
+    clip_path: PAnsiChar;
 
     bounds: SegmentInfo;
 
@@ -262,7 +262,7 @@ type
 
     method: PaintMethod;
 
-    text: PChar;
+    text: PAnsiChar;
   end;
 
 type
@@ -286,9 +286,9 @@ type
 
 extern MagickExport MagickBooleanType
   DrawAffineImage(Image *,const Image *,const AffineMatrix *),
-  DrawClipPath(Image *,const DrawInfo *,const char *),
+  DrawClipPath(Image *,const DrawInfo *,const AnsiChar *),
   DrawImage(Image *,const DrawInfo *),
-  DrawPatternPath(Image *,const DrawInfo *,const char *,Image **),
+  DrawPatternPath(Image *,const DrawInfo *,const AnsiChar *,Image **),
   DrawPrimitive(Image *,const DrawInfo *,const PrimitiveInfo *);
 
 extern MagickExport void

+ 20 - 20
packages/imagemagick/src/drawing_wand.inc

@@ -44,7 +44,7 @@ type
   DrawingWand = record
     id: culong;
 
-    name: array[0..MaxTextExtent] of Char;
+    name: array[0..MaxTextExtent] of AnsiChar;
 
     { Support structures }
   
@@ -54,7 +54,7 @@ type
 
     { MVG output string and housekeeping }
   
-    mvg: PChar;               // MVG data
+    mvg: PAnsiChar;               // MVG data
 
     mvg_alloc,                // total allocated memory
 //    mvg_length: size_t;       // total MVG length
@@ -63,7 +63,7 @@ type
 
     { Pattern support }
     
-    pattern_id: PChar;
+    pattern_id: PAnsiChar;
 
     pattern_bounds: RectangleInfo;
 
@@ -99,12 +99,12 @@ const x = 9;
 
 function DrawGetTextAlignment(const wand: PDrawingWand): AlignType; cdecl; external WandExport;
 
-function DrawGetClipPath(const wand: PDrawingWand): PChar; cdecl; external WandExport;
-function DrawGetException(const wand: PDrawingWand; severity: PExceptionType): PChar; cdecl; external WandExport;
-function DrawGetFont(const wand: PDrawingWand): PChar; cdecl; external WandExport;
-function DrawGetFontFamily(const wand: PDrawingWand): PChar; cdecl; external WandExport;
-function DrawGetTextEncoding(const wand: PDrawingWand): PChar; cdecl; external WandExport;
-function DrawGetVectorGraphics(const wand: PDrawingWand): PChar; cdecl; external WandExport;
+function DrawGetClipPath(const wand: PDrawingWand): PAnsiChar; cdecl; external WandExport;
+function DrawGetException(const wand: PDrawingWand; severity: PExceptionType): PAnsiChar; cdecl; external WandExport;
+function DrawGetFont(const wand: PDrawingWand): PAnsiChar; cdecl; external WandExport;
+function DrawGetFontFamily(const wand: PDrawingWand): PAnsiChar; cdecl; external WandExport;
+function DrawGetTextEncoding(const wand: PDrawingWand): PAnsiChar; cdecl; external WandExport;
+function DrawGetVectorGraphics(const wand: PDrawingWand): PAnsiChar; cdecl; external WandExport;
 
 function DrawGetClipUnits(const wand: PDrawingWand): ClipPathUnits; cdecl; external WandExport;
 
@@ -141,17 +141,17 @@ function DrawComposite(wand: PDrawingWand; const compose: CompositeOperator;
 function DrawGetStrokeAntialias(const wand: PDrawingWand): MagickBooleanType; cdecl; external WandExport;
 function DrawGetTextAntialias(const wand: PDrawingWand): MagickBooleanType; cdecl; external WandExport;
 function DrawPopPattern(wand: PDrawingWand): MagickBooleanType; cdecl; external WandExport;
-function DrawPushPattern(wand: PDrawingWand; const pattern_id: PChar;
+function DrawPushPattern(wand: PDrawingWand; const pattern_id: PAnsiChar;
  const x, y, width, height: double): MagickBooleanType; cdecl; external WandExport;
 function DrawRender(wand: PDrawingWand): MagickBooleanType; cdecl; external WandExport;
-function DrawSetClipPath(wand: PDrawingWand; const clip_path: PChar): MagickBooleanType; cdecl; external WandExport;
-function DrawSetFillPatternURL(wand: PDrawingWand; const fill_url: PChar): MagickBooleanType; cdecl; external WandExport;
-function DrawSetFont(wand: PDrawingWand; const font_name: PChar): MagickBooleanType; cdecl; external WandExport;
-function DrawSetFontFamily(wand: PDrawingWand; const font_family: PChar): MagickBooleanType; cdecl; external WandExport;
+function DrawSetClipPath(wand: PDrawingWand; const clip_path: PAnsiChar): MagickBooleanType; cdecl; external WandExport;
+function DrawSetFillPatternURL(wand: PDrawingWand; const fill_url: PAnsiChar): MagickBooleanType; cdecl; external WandExport;
+function DrawSetFont(wand: PDrawingWand; const font_name: PAnsiChar): MagickBooleanType; cdecl; external WandExport;
+function DrawSetFontFamily(wand: PDrawingWand; const font_family: PAnsiChar): MagickBooleanType; cdecl; external WandExport;
 function DrawSetStrokeDashArray(wand: PDrawingWand; const number_elements: culong;
  const dash_array: Pdouble): MagickBooleanType; cdecl; external WandExport;
-function DrawSetStrokePatternURL(wand: PDrawingWand; const stroke_url: PChar): MagickBooleanType; cdecl; external WandExport;
-function DrawSetVectorGraphics(wand: PDrawingWand; const xml: PChar): MagickBooleanType; cdecl; external WandExport;
+function DrawSetStrokePatternURL(wand: PDrawingWand; const stroke_url: PAnsiChar): MagickBooleanType; cdecl; external WandExport;
+function DrawSetVectorGraphics(wand: PDrawingWand; const xml: PAnsiChar): MagickBooleanType; cdecl; external WandExport;
 function IsDrawingWand(const wand: PDrawingWand): MagickBooleanType; cdecl; external WandExport;
 function PopDrawingWand(wand: PDrawingWand): MagickBooleanType; cdecl; external WandExport;
 function PushDrawingWand(wand: PDrawingWand): MagickBooleanType; cdecl; external WandExport;
@@ -166,14 +166,14 @@ function DrawGetStrokeMiterLimit(const wand: PDrawingWand): culong; cdecl; exter
 procedure ClearDrawingWand(wand: PDrawingWand); cdecl; external WandExport;
 procedure DrawAffine(wand: PDrawingWand; const affine: PAffineMatrix); cdecl; external WandExport;
 procedure DrawAnnotation(wand: PDrawingWand; const  x, y: double;
- const text: PChar); cdecl; external WandExport;
+ const text: PAnsiChar); cdecl; external WandExport;
 procedure DrawArc(wand: PDrawingWand; const sx, sy, ex, ey, sd, ed: double); cdecl; external WandExport;
 procedure DrawBezier(wand: PDrawingWand; const number_coordinates: culong;
  const coordinates: PPointInfo); cdecl; external WandExport;
 procedure DrawCircle(wand: PDrawingWand; const ox, oy, px, py: double); cdecl; external WandExport;
 procedure DrawColor(wand: PDrawingWand; const x, y: double;
  const paint_method: PaintMethod); cdecl; external WandExport;
-procedure DrawComment(wand: PDrawingWand; const comment: PChar); cdecl; external WandExport;
+procedure DrawComment(wand: PDrawingWand; const comment: PAnsiChar); cdecl; external WandExport;
 procedure DrawEllipse(wand: PDrawingWand; const ox, oy, rx, ry, start, end_: double); cdecl; external WandExport;
 procedure DrawGetFillColor(const wand: PDrawingWand; fill_color: PPixelWand); cdecl; external WandExport;
 procedure DrawGetStrokeColor(const wand: PDrawingWand; stroke_color: PPixelWand); cdecl; external WandExport;
@@ -227,7 +227,7 @@ procedure DrawPolyline(wand: PDrawingWand; const number_coordinates: culong; con
  ); cdecl; external WandExport;
 procedure DrawPopClipPath(wand: PDrawingWand); cdecl; external WandExport;
 procedure DrawPopDefs(wand: PDrawingWand); cdecl; external WandExport;
-procedure DrawPushClipPath(wand: PDrawingWand; clip_path_id: PChar); cdecl; external WandExport;
+procedure DrawPushClipPath(wand: PDrawingWand; clip_path_id: PAnsiChar); cdecl; external WandExport;
 procedure DrawPushDefs(wand: PDrawingWand); cdecl; external WandExport;
 procedure DrawRectangle(wand: PDrawingWand; const x1, y1, x2, y2: double); cdecl; external WandExport;
 procedure DrawRotate(wand: PDrawingWand; const degrees: double); cdecl; external WandExport;
@@ -258,7 +258,7 @@ procedure DrawSetTextAlignment(wand: PDrawingWand; const alignment: AlignType);
 procedure DrawSetTextAntialias(wand: PDrawingWand; const text_antialias: MagickBooleanType
  ); cdecl; external WandExport;
 procedure DrawSetTextDecoration(wand: PDrawingWand; const decoration: DecorationType); cdecl; external WandExport;
-procedure DrawSetTextEncoding(wand: PDrawingWand; const encoding: PChar); cdecl; external WandExport;
+procedure DrawSetTextEncoding(wand: PDrawingWand; const encoding: PAnsiChar); cdecl; external WandExport;
 procedure DrawSetTextUnderColor(wand: PDrawingWand; const under_wand: PPixelWand); cdecl; external WandExport;
 procedure DrawSetViewbox(wand: PDrawingWand; x1, y1, x2, y2: culong); cdecl; external WandExport;
 procedure DrawTranslate(wand: PDrawingWand; const x, y: double); cdecl; external WandExport;

+ 4 - 4
packages/imagemagick/src/effect.inc

@@ -61,11 +61,11 @@ type
     const double,const double,const double,ExceptionInfo *);
 
 extern MagickExport MagickBooleanType
-  BlackThresholdImage(Image *,const char *),
+  BlackThresholdImage(Image *,const AnsiChar *),
   BilevelImage(Image *,const double),
   BilevelImageChannel(Image *,const ChannelType,const double),
-  RandomThresholdImage(Image *,const char *,ExceptionInfo *),
-  RandomThresholdImageChannel(Image *,const ChannelType,const char *,
+  RandomThresholdImage(Image *,const AnsiChar *,ExceptionInfo *),
+  RandomThresholdImageChannel(Image *,const ChannelType,const AnsiChar *,
     ExceptionInfo *),
-  WhiteThresholdImage(Image *,const char *);}
+  WhiteThresholdImage(Image *,const AnsiChar *);}
 

+ 4 - 4
packages/imagemagick/src/fx.inc

@@ -35,13 +35,13 @@ type
 
 {extern MagickExport Image
   *CharcoalImage(const Image *,const double,const double,ExceptionInfo *),
-  *ColorizeImage(const Image *,const char *,const PixelPacket,ExceptionInfo *),
+  *ColorizeImage(const Image *,const AnsiChar *,const PixelPacket,ExceptionInfo *),
   *ConvolveImage(const Image *,const unsigned long,const double *,
     ExceptionInfo *),
   *ConvolveImageChannel(const Image *,const ChannelType,const unsigned long,
     const double *,ExceptionInfo *),
-  *FxImage(const Image *,const char *,ExceptionInfo *),
-  *FxImageChannel(const Image *,const ChannelType,const char *,ExceptionInfo *),
+  *FxImage(const Image *,const AnsiChar *,ExceptionInfo *),
+  *FxImageChannel(const Image *,const ChannelType,const AnsiChar *,ExceptionInfo *),
   *ImplodeImage(const Image *,const double,ExceptionInfo *),
   *MorphImages(const Image *,const unsigned long,ExceptionInfo *),
   *OilPaintImage(const Image *,const double,ExceptionInfo *),
@@ -51,7 +51,7 @@ type
   *SteganoImage(const Image *,const Image *,ExceptionInfo *),
   *StereoImage(const Image *,const Image *,ExceptionInfo *),
   *SwirlImage(const Image *,double,ExceptionInfo *),
-  *TintImage(const Image *,const char *,const PixelPacket,ExceptionInfo *),
+  *TintImage(const Image *,const AnsiChar *,const PixelPacket,ExceptionInfo *),
   *WaveImage(const Image *,const double,const double,ExceptionInfo *);
 
 extern MagickExport MagickBooleanType

+ 22 - 22
packages/imagemagick/src/magick_attribute.inc

@@ -17,34 +17,34 @@
 }
 
 function MagickGetException(wand: PMagickWand;
- severity: PExceptionType): PChar; cdecl; external WandExport;
-function MagickGetFilename(const wand: PMagickWand): PChar; cdecl; external WandExport;
-function MagickGetFormat(wand: PMagickWand): PChar; cdecl; external WandExport;
-function MagickGetHomeURL: PChar; cdecl; external WandExport;
+ severity: PExceptionType): PAnsiChar; cdecl; external WandExport;
+function MagickGetFilename(const wand: PMagickWand): PAnsiChar; cdecl; external WandExport;
+function MagickGetFormat(wand: PMagickWand): PAnsiChar; cdecl; external WandExport;
+function MagickGetHomeURL: PAnsiChar; cdecl; external WandExport;
 function MagickGetOption(wand: PMagickWand;
- const key: PChar): PChar; cdecl; external WandExport;
+ const key: PAnsiChar): PAnsiChar; cdecl; external WandExport;
 {sem documenta
-extern WandExport char
-  *MagickQueryConfigureOption(const char *),
-  **MagickQueryConfigureOptions(const char *,unsigned long *),
-  **MagickQueryFonts(const char *,unsigned long *),
-  **MagickQueryFormats(const char *,unsigned long *);}
+extern WandExport AnsiChar
+  *MagickQueryConfigureOption(const AnsiChar *),
+  **MagickQueryConfigureOptions(const AnsiChar *,unsigned long *),
+  **MagickQueryFonts(const AnsiChar *,unsigned long *),
+  **MagickQueryFormats(const AnsiChar *,unsigned long *);}
 
 function MagickGetCompression(wand: PMagickWand): CompressionType; cdecl; external WandExport;
 
-function MagickGetCopyright: PChar; cdecl; external WandExport;
-function MagickGetPackageName: PChar; cdecl; external WandExport;
-function MagickGetQuantumDepth(depth: Pculong): PChar; cdecl; external WandExport;
-function MagickGetQuantumRange(range: Pculong): PChar; cdecl; external WandExport;
-function MagickGetReleaseDate: PChar; cdecl; external WandExport;
-function MagickGetVersion(version: Pculong): PChar; cdecl; external WandExport;
+function MagickGetCopyright: PAnsiChar; cdecl; external WandExport;
+function MagickGetPackageName: PAnsiChar; cdecl; external WandExport;
+function MagickGetQuantumDepth(depth: Pculong): PAnsiChar; cdecl; external WandExport;
+function MagickGetQuantumRange(range: Pculong): PAnsiChar; cdecl; external WandExport;
+function MagickGetReleaseDate: PAnsiChar; cdecl; external WandExport;
+function MagickGetVersion(version: Pculong): PAnsiChar; cdecl; external WandExport;
 
 function MagickGetSamplingFactors(wand: PMagickWand;
  number_factors: Pculong): Pdouble; cdecl; external WandExport;
 {function (wand: PMagickWand): Pdouble; cdecl; external WandExport;
-  *MagickQueryFontMetrics(MagickWand *,const DrawingWand *,const char *),
+  *MagickQueryFontMetrics(MagickWand *,const DrawingWand *,const AnsiChar *),
   *MagickQueryMultilineFontMetrics(MagickWand *,const DrawingWand *,
-    const char *);}
+    const AnsiChar *);}
 
 function MagickGetInterlaceScheme(wand: PMagickWand): InterlaceType; cdecl; external WandExport;
 
@@ -55,13 +55,13 @@ extern WandExport MagickBooleanType
   MagickSetBackgroundColor(MagickWand *,const PixelWand *),
   MagickSetCompression(MagickWand *,const CompressionType),
   MagickSetCompressionQuality(MagickWand *,const unsigned long),
-  MagickSetFilename(MagickWand *,const char *),
-  MagickSetFormat(MagickWand *,const char *),
+  MagickSetFilename(MagickWand *,const AnsiChar *),
+  MagickSetFormat(MagickWand *,const AnsiChar *),
   MagickSetInterlaceScheme(MagickWand *,const InterlaceType),
-  MagickSetOption(MagickWand *,const char *,const char *),
+  MagickSetOption(MagickWand *,const AnsiChar *,const AnsiChar *),
   MagickSetPage(MagickWand *,const unsigned long,const unsigned long,
     const long,const long),
-  MagickSetPassphrase(MagickWand *,const char *),
+  MagickSetPassphrase(MagickWand *,const AnsiChar *),
 }
 
 function MagickSetResolution(wand: PMagickWand; const x_resolution, y_resolution:double):MagickBooleanType; cdecl; external WandExport;

+ 35 - 35
packages/imagemagick/src/magick_image.inc

@@ -27,11 +27,11 @@
 
 function MagickGetImageChannelStatistics(wand: PMagickWand): PChannelStatistics; cdecl; external WandExport;
 
-function MagickGetImageAttribute(wand: PMagickWand): PChar; cdecl; external WandExport;
-function MagickGetImageFilename(wand: PMagickWand): PChar; cdecl; external WandExport;
-function MagickGetImageFormat(wand: PMagickWand): PChar; cdecl; external WandExport;
-function MagickGetImageSignature(wand: PMagickWand): PChar; cdecl; external WandExport;
-function MagickIdentifyImage(wand: PMagickWand): PChar; cdecl; external WandExport;
+function MagickGetImageAttribute(wand: PMagickWand): PAnsiChar; cdecl; external WandExport;
+function MagickGetImageFilename(wand: PMagickWand): PAnsiChar; cdecl; external WandExport;
+function MagickGetImageFormat(wand: PMagickWand): PAnsiChar; cdecl; external WandExport;
+function MagickGetImageSignature(wand: PMagickWand): PAnsiChar; cdecl; external WandExport;
+function MagickIdentifyImage(wand: PMagickWand): PAnsiChar; cdecl; external WandExport;
 
 function MagickGetImageCompose(wand: PMagickWand): CompositeOperator; cdecl; external WandExport;
 
@@ -60,9 +60,9 @@ function MagickAffineTransformImage(wand: PMagickWand;
  const drawing_wand: PDrawingWand): MagickBooleanType; cdecl; external WandExport;
 function MagickAnnotateImage(wand: PMagickWand;
  const drawing_wand: PDrawingWand; const x, y, angle: double;
- const text: PChar): MagickBooleanType; cdecl; external WandExport;
+ const text: PAnsiChar): MagickBooleanType; cdecl; external WandExport;
 function MagickAnimateImages(wand: PMagickWand;
- const server_name: PChar): MagickBooleanType; cdecl; external WandExport;
+ const server_name: PAnsiChar): MagickBooleanType; cdecl; external WandExport;
 function MagickBlackThresholdImage(wand: PMagickWand;
  const threshold: PPixelWand): MagickBooleanType; cdecl; external WandExport;
 function MagickBlurImage(wand: PMagickWand;
@@ -77,19 +77,19 @@ function MagickChopImage(wand: PMagickWand;
  const width, height: culong; const x, y: clong): MagickBooleanType; cdecl; external WandExport;
 function MagickClipImage(wand: PMagickWand): MagickBooleanType; cdecl; external WandExport;
 function MagickClipPathImage(wand: PMagickWand;
- const pathname: PChar; const inside: MagickBooleanType): MagickBooleanType; cdecl; external WandExport;
+ const pathname: PAnsiChar; const inside: MagickBooleanType): MagickBooleanType; cdecl; external WandExport;
 function MagickColorFloodfillImage(wand: PMagickWand;
  const fill: PPixelWand; const fuzz: double; const bordercolor: PPixelWand;
  const x, y: clong): MagickBooleanType; cdecl; external WandExport;
 function MagickColorizeImage(wand: PMagickWand;
  const colorize, opacity: PPixelWand): MagickBooleanType; cdecl; external WandExport;
 function MagickCommentImage(wand: PMagickWand;
- const comment: PChar): MagickBooleanType; cdecl; external WandExport;
+ const comment: PAnsiChar): MagickBooleanType; cdecl; external WandExport;
 function MagickCompositeImage(wand: PMagickWand;
  const composite_wand: PMagickWand; const compose: CompositeOperator;
  const x, y: clong): MagickBooleanType; cdecl; external WandExport;
 function MagickConstituteImage(wand: PMagickWand;
- const columns, rows: culong; const map: PChar;
+ const columns, rows: culong; const map: PAnsiChar;
  const storage: StorageType; pixels: Pointer): MagickBooleanType; cdecl; external WandExport;
 function MagickContrastImage(wand: PMagickWand;
  const sharpen: MagickBooleanType): MagickBooleanType; cdecl; external WandExport;
@@ -104,9 +104,9 @@ function MagickCycleColormapImage(wand: PMagickWand;
  const displace: clong): MagickBooleanType; cdecl; external WandExport;
 function MagickDespeckleImage(wand: PMagickWand): MagickBooleanType; cdecl; external WandExport;
 function MagickDisplayImage(wand: PMagickWand;
- const server_name: PChar): MagickBooleanType; cdecl; external WandExport;
+ const server_name: PAnsiChar): MagickBooleanType; cdecl; external WandExport;
 function MagickDisplayImages(wand: PMagickWand;
- const server_name: PChar): MagickBooleanType; cdecl; external WandExport;
+ const server_name: PAnsiChar): MagickBooleanType; cdecl; external WandExport;
 function MagickDrawImage(wand: PMagickWand;
  const drawing_wand: PDrawingWand): MagickBooleanType; cdecl; external WandExport;
 function MagickEdgeImage(wand: PMagickWand;
@@ -159,14 +159,14 @@ function MagickGetImagePixelColor(wand: PMagickWand;
  const x, y: clong; color: PPixelWand): MagickBooleanType; cdecl; external WandExport;
 function MagickGetImagePixels(wand: PMagickWand;
  const x, y: clong; const columns, rows: culong;
- const map: PChar; const storage: StorageType; pixels: Pointer): MagickBooleanType; cdecl; external WandExport;
+ const map: PAnsiChar; const storage: StorageType; pixels: Pointer): MagickBooleanType; cdecl; external WandExport;
 function MagickGetImageRedPrimary(wand: PMagickWand; x, y: Pdouble): MagickBooleanType; cdecl; external WandExport;
 function MagickGetImageResolution(wand: PMagickWand; x, y: Pdouble): MagickBooleanType; cdecl; external WandExport;
 function MagickGetImageWhitePoint(wand: PMagickWand; x, y: Pdouble): MagickBooleanType; cdecl; external WandExport;
 function MagickHasNextImage(wand: PMagickWand): MagickBooleanType; cdecl; external WandExport;
 function MagickHasPreviousImage(wand: PMagickWand): MagickBooleanType; cdecl; external WandExport;
 function MagickImplodeImage(wand: PMagickWand; const radius: double): MagickBooleanType; cdecl; external WandExport;
-function MagickLabelImage(wand: PMagickWand; const _label: PChar): MagickBooleanType; cdecl; external WandExport;
+function MagickLabelImage(wand: PMagickWand; const _label: PAnsiChar): MagickBooleanType; cdecl; external WandExport;
 function MagickLevelImage(wand: PMagickWand;
  const black_point, gamma, white_point: double): MagickBooleanType; cdecl; external WandExport;
 function MagickLevelImageChannel(wand: PMagickWand;
@@ -201,15 +201,15 @@ function MagickPaintOpaqueImage(wand: PMagickWand;
 function MagickPaintTransparentImage(wand: PMagickWand;
  const target: PPixelWand; const opacity: Quantum; const fuzz: double): MagickBooleanType; cdecl; external WandExport;
 function MagickPingImage(wand: PMagickWand;
- const filename: PChar): MagickBooleanType; cdecl; external WandExport;
+ const filename: PAnsiChar): MagickBooleanType; cdecl; external WandExport;
 {
 function MagickPosterizeImage(wand: PMagickWand;
  const levels: Word; const dither: MagickBooleanType): MagickBooleanType; cdecl; external WandExport;
 ??
 }
 function MagickPreviousImage(wand: PMagickWand): MagickBooleanType; cdecl; external WandExport;
-function MagickProfileImage(wand: PMagickWand; const name: PChar;
- const profile: PChar; const length: culong): MagickBooleanType; cdecl; external WandExport;
+function MagickProfileImage(wand: PMagickWand; const name: PAnsiChar;
+ const profile: PAnsiChar; const length: culong): MagickBooleanType; cdecl; external WandExport;
 function MagickQuantizeImage(wand: PMagickWand;
  const number_colors: culong; const colorspace: ColorspaceType;
  const treedepth: culong; const dither, measure_error): MagickBooleanType; cdecl; external WandExport;
@@ -223,7 +223,7 @@ function MagickRadialBlurImageChannel(wand: PMagickWand;
 function MagickRaiseImage(wand: PMagickWand;
  const width, height: culong; const x, y: clong;
  const raise_: MagickBooleanType): MagickBooleanType; cdecl; external WandExport;
-function MagickReadImage(wand: PMagickWand; const filename: PChar
+function MagickReadImage(wand: PMagickWand; const filename: PAnsiChar
 ): MagickBooleanType; cdecl; external WandExport;
 function MagickReadImageBlob(wand: PMagickWand;
  const blob: Pointer; const length: clong): MagickBooleanType; cdecl; external WandExport;
@@ -248,7 +248,7 @@ function MagickSeparateImageChannel(wand: PMagickWand; const channel: ChannelTyp
 // MagickSepiaToneImage(MagickWand *,const double),
 
 function MagickSetImage(wand: PMagickWand; const set_wand: PMagickWand): MagickBooleanType; cdecl; external WandExport;
-function MagickSetImageAttribute(wand: PMagickWand; const key, attribute: PChar): MagickBooleanType; cdecl; external WandExport;
+function MagickSetImageAttribute(wand: PMagickWand; const key, attribute: PAnsiChar): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageBackgroundColor(wand: PMagickWand; const background: PPixelWand): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageBias(wand: PMagickWand; const bias: double): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageBluePrimary(wand: PMagickWand; const x, y: double): MagickBooleanType; cdecl; external WandExport;
@@ -263,8 +263,8 @@ function MagickSetImageDelay(wand: PMagickWand; const delay: culong): MagickBool
 function MagickSetImageDepth(wand: PMagickWand; const depth: culong): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageDispose(wand: PMagickWand; const dispose: DisposeType): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageExtent(wand: PMagickWand; const columns, rows: culong): MagickBooleanType; cdecl; external WandExport;
-function MagickSetImageFilename(wand: PMagickWand; const filename: PChar): MagickBooleanType; cdecl; external WandExport;
-function MagickSetImageFormat(wand: PMagickWand; const format: PChar): MagickBooleanType; cdecl; external WandExport;
+function MagickSetImageFilename(wand: PMagickWand; const filename: PAnsiChar): MagickBooleanType; cdecl; external WandExport;
+function MagickSetImageFormat(wand: PMagickWand; const format: PAnsiChar): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageGamma(wand: PMagickWand; const gamma: Double): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageGreenPrimary(wand: PMagickWand; const x, y: Double): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageIndex(wand: PMagickWand; const index: clong): MagickBooleanType; cdecl; external WandExport;
@@ -273,8 +273,8 @@ function MagickSetImageIterations(wand: PMagickWand; const iterations: culong):
 function MagickSetImageMatteColor(wand: PMagickWand; const matte: PPixelWand): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImagePage(wand: PMagickWand; const width, height: culong; const x, y: clong): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImagePixels(wand: PMagickWand; const x, y: clong; const columns, rows: culong;
- const map: PChar; const storage: StorageType; const pixels: Pointer): MagickBooleanType; cdecl; external WandExport;
-function MagickSetImageProfile(wand: PMagickWand; const name: PChar; const profile: Pointer;
+ const map: PAnsiChar; const storage: StorageType; const pixels: Pointer): MagickBooleanType; cdecl; external WandExport;
+function MagickSetImageProfile(wand: PMagickWand; const name: PAnsiChar; const profile: Pointer;
  const length: culong): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageRedPrimary(wand: PMagickWand; const x, y: Double): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageRenderingIntent(wand: PMagickWand; const rendering_intent: RenderingIntent
@@ -328,10 +328,10 @@ function MagickWaveImage(wand: PMagickWand; const amplitude, wave_length: double
  ): MagickBooleanType; cdecl; external WandExport;
 function MagickWhiteThresholdImage(wand: PMagickWand; const threshold: PPixelWand): MagickBooleanType; cdecl; external WandExport;
 function MagickWriteImage(wand: PMagickWand;
- const filename: PChar): MagickBooleanType; cdecl; external WandExport;
+ const filename: PAnsiChar): MagickBooleanType; cdecl; external WandExport;
 //  MagickWriteImageFile(MagickWand *,FILE *),
 function MagickWriteImages(wand: PMagickWand;
- const filename: PChar; const adjoin: MagickBooleanType
+ const filename: PAnsiChar; const adjoin: MagickBooleanType
  ): MagickBooleanType; cdecl; external WandExport;
 //  MagickWriteImagesFile(MagickWand *,FILE *);
 
@@ -353,8 +353,8 @@ function MagickCompareImages(wand: PMagickWand;
  ): PMagickWand; cdecl; external WandExport;
 function MagickDeconstructImages(wand: PMagickWand): PMagickWand; cdecl; external WandExport;
 function MagickFlattenImages(wand: PMagickWand): PMagickWand; cdecl; external WandExport;
-function MagickFxImage(wand: PMagickWand; const expression: PChar): PMagickWand; cdecl; external WandExport;
-function MagickFxImageChannel(wand: PMagickWand; const channel: ChannelType; const expression: PChar
+function MagickFxImage(wand: PMagickWand; const expression: PAnsiChar): PMagickWand; cdecl; external WandExport;
+function MagickFxImageChannel(wand: PMagickWand; const channel: ChannelType; const expression: PAnsiChar
  ): PMagickWand; cdecl; external WandExport;
 function MagickGetImage(wand: PMagickWand): PMagickWand; cdecl; external WandExport;
 function MagickGetImageRegion(wand: PMagickWand;
@@ -363,15 +363,15 @@ function MagickGetImageRegion(wand: PMagickWand;
 function MagickMorphImages(wand: PMagickWand; const number_frames: culong): PMagickWand; cdecl; external WandExport;
 function MagickMosaicImages(wand: PMagickWand): PMagickWand; cdecl; external WandExport;
 //function MagickMontageImage(wand: PMagickWand;
-// const drawing_wand: DrawingWand; const tile_geometry: PChar;
-// const thumbnail_geometry: PChar; const mode: MontageMode; const frame: PChar
+// const drawing_wand: DrawingWand; const tile_geometry: PAnsiChar;
+// const thumbnail_geometry: PAnsiChar; const mode: MontageMode; const frame: PAnsiChar
 // ): PMagickWand; cdecl; external WandExport;
 function MagickPreviewImages(wand: PMagickWand; const preview: PreviewType): PMagickWand; cdecl; external WandExport;
 function MagickSteganoImage(wand: PMagickWand; const watermark_wand: PMagickWand;
  const offset: clong): PMagickWand; cdecl; external WandExport;
 function MagickStereoImage(wand: PMagickWand; const offset_wand: PMagickWand): PMagickWand; cdecl; external WandExport;
 function MagickTextureImage(wand: PMagickWand; const texture_wand: PMagickWand): PMagickWand; cdecl; external WandExport;
-function MagickTransformImage(wand: PMagickWand; const crop, geometry: PChar): PMagickWand; cdecl; external WandExport;
+function MagickTransformImage(wand: PMagickWand; const crop, geometry: PAnsiChar): PMagickWand; cdecl; external WandExport;
 function NewMagickWandFromImage(para1: PImage): PMagickWand; cdecl; external WandExport;
 
 function MagickGetImageHistogram(wand: PMagickWand; number_colors: Pculong): PPPixelWand; cdecl; external  WandExport;
@@ -382,8 +382,8 @@ function MagickGetImageUnits(wand: PMagickWand): ResolutionType; cdecl; external
 
 function MagickGetImageBlob(wand: PMagickWand; length: Pcsize_t): PByte; cdecl; external WandExport;
 function MagickGetImagesBlob(wand: PMagickWand; length: Pcsize_t): PByte; cdecl; external WandExport;
-function MagickGetImageProfile(wand: PMagickWand; name: PChar; length: Pcsize_t): PByte; cdecl; external WandExport;
-function MagickRemoveImageProfile(wand: PMagickWand; name: PChar; length: Pcsize_t): PByte; cdecl; external WandExport;
+function MagickGetImageProfile(wand: PMagickWand; name: PAnsiChar; length: Pcsize_t): PByte; cdecl; external WandExport;
+function MagickRemoveImageProfile(wand: PMagickWand; name: PAnsiChar; length: Pcsize_t): PByte; cdecl; external WandExport;
 
 function MagickGetImageColors(wand: PMagickWand): culong; cdecl; external WandExport;
 function MagickGetImageCompressionQuality(wand: PMagickWand): culong; cdecl; external WandExport;
@@ -401,13 +401,13 @@ function MagickGetNumberImages(wand: PMagickWand): culong; cdecl; external WandE
 {
   Deprecated methods.
 }
-{extern WandExport char
+{extern WandExport AnsiChar
   *MagickDescribeImage(MagickWand *);
 
 extern WandExport MagickBooleanType
   MagickOpaqueImage(MagickWand *,const PixelWand *,const PixelWand *,
     const double),
-  MagickSetImageOption(MagickWand *,const char *,const char *,const char *),
+  MagickSetImageOption(MagickWand *,const AnsiChar *,const AnsiChar *,const AnsiChar *),
   MagickTransparentImage(MagickWand *,const PixelWand *,const Quantum,
     const double);
 
@@ -415,6 +415,6 @@ extern WandExport MagickWand
   *MagickRegionOfInterestImage(MagickWand *,const unsigned long,
 	  const unsigned long,const long,const long);
 
-extern WandExport unsigned char
+extern WandExport unsigned AnsiChar
   *MagickWriteImageBlob(MagickWand *,size_t *);
 }

+ 11 - 11
packages/imagemagick/src/magick_type.inc

@@ -480,9 +480,9 @@ type
 
 type 
   ProfileInfo = record
-   name: PChar;
+   name: PAnsiChar;
    length: cint;
-   info: PChar;
+   info: PAnsiChar;
    signature: culong;
   end;
   
@@ -526,7 +526,7 @@ type
    //error_number: Shortint;
    severity: culong;
    error_number: culong;
-   reason, description: PChar;
+   reason, description: PAnsiChar;
 	 exceptions: Pointer;
 	 relinquish: MagickBooleanType;
    semaphore: Pointer; //PSemaphoreInfo;
@@ -540,7 +540,7 @@ type
 //typedef struct _BlobInfo _BlobInfo_;
 
 type
-  MagickProgressMonitor = function (const str: PChar; const para: MagickOffsetType;
+  MagickProgressMonitor = function (const str: PAnsiChar; const para: MagickOffsetType;
    const sizetype: MagickSizeType; param: Pointer): PMagickBooleanType;
 
 type
@@ -559,7 +559,7 @@ type
    rendering_intent: RenderingIntent;
    profiles: Pointer;
    units: ResolutionType;
-   montage, directory, geometry: PChar;
+   montage, directory, geometry: PAnsiChar;
    offset: cint;
    x_resolution, y_resolution: double;
    page, extract_info, tile_info: RectangleInfo;  // deprecated
@@ -581,7 +581,7 @@ type
    attributes: Pointer;
    ascii85: Pointer; //_Ascii85Info_
    blob: Pointer; // _BlobInfo_
-   filename, magick_filename, magick: array[1..MaxTextExtent] of char;
+   filename, magick_filename, magick: array[1..MaxTextExtent] of AnsiChar;
    magick_columns, magick_rows: culong;
    exception: ExceptionInfo;
    debug: MagickBooleanType;
@@ -609,13 +609,13 @@ type
    compression: CompressionType;
    orientation: OrientationType;
    temporary, adjoin, affirm, antialias: MagickBooleanType;
-   size, extract, page, scenes: PChar;
+   size, extract, page, scenes: PAnsiChar;
    scene, number_scenes, depth: culong;
    interlace: InterlaceType;
    endian: EndianType;
    units: ResolutionType;
    quality: culong;
-   sampling_factor, server_name, font, texture, density: PChar;
+   sampling_factor, server_name, font, texture, density: PAnsiChar;
    pointsize, fuzz: double;
    background_color, border_color, matte_color: PixelPacket;
    dither, monochrome: MagickBooleanType;
@@ -625,7 +625,7 @@ type
    preview_type: PreviewType;
    group: Longint;
    ping, verbose: MagickBooleanType;
-   view, authenticate: PChar;
+   view, authenticate: PAnsiChar;
    channel: ChannelType;
    attributes: PImage;
    options: Pointer;
@@ -635,13 +635,13 @@ type
    file_: Pointer; // *file
    blob: Pointer;
    length: cint;
-   magick, unique, zero, filename: array[1..MaxTextExtent] of char;
+   magick, unique, zero, filename: array[1..MaxTextExtent] of AnsiChar;
    debug: MagickBooleanType;
 
   {
     Deprecated.
   }
-   tile: PChar;
+   tile: PAnsiChar;
    subimage, subrange: culong;
    pen: PixelPacket;
    signature: culong;

+ 1 - 1
packages/imagemagick/src/magick_wand.pas

@@ -41,7 +41,7 @@ uses ImageMagick, ctypes;
 type
   MagickWand = record
     id: culong;
-    name: array[1..MaxTextExtent] of Char;
+    name: array[1..MaxTextExtent] of AnsiChar;
     exception: ExceptionInfo;
     image_info: PImageInfo;
     quantize_info: PQuantizeInfo;

+ 4 - 4
packages/imagemagick/src/pixel.inc

@@ -75,10 +75,10 @@ type
 
 {extern MagickExport MagickBooleanType
   ExportImagePixels(const Image *,const long,const long,const unsigned long,
-    const unsigned long,const char *,const StorageType,void *,ExceptionInfo *),
+    const unsigned long,const AnsiChar *,const StorageType,void *,ExceptionInfo *),
   ExportQuantumPixels(Image *,const QuantumType,const size_t,
-    const unsigned char *),
+    const unsigned AnsiChar *),
   ImportImagePixels(Image *,const long,const long,const unsigned long,
-    const unsigned long,const char *,const StorageType,const void *),
-  ImportQuantumPixels(Image *,const QuantumType,const size_t,unsigned char *);}
+    const unsigned long,const AnsiChar *,const StorageType,const void *),
+  ImportQuantumPixels(Image *,const QuantumType,const size_t,unsigned AnsiChar *);}
 

+ 3 - 3
packages/imagemagick/src/pixel_iterator.inc

@@ -20,7 +20,7 @@ type
   PixelIterator = record
     id: culong;
 
-    name: array[0..MaxTextExtent] of char;
+    name: array[0..MaxTextExtent] of AnsiChar;
 
     exception: ExceptionInfo;
 
@@ -41,7 +41,7 @@ type
 
 
 function PixelGetIteratorException(const iterator: PPixeliterator;
- severity: PExceptionType): PChar; cdecl; external WandExport;
+ severity: PExceptionType): PAnsiChar; cdecl; external WandExport;
 
 function IsPixelIterator(const iterator: PPixeliterator): MagickBooleanType; cdecl; external WandExport;
 function PixelClearIteratorException(iterator: PPixeliterator): MagickBooleanType; cdecl; external WandExport;
@@ -66,7 +66,7 @@ procedure PixelSetLastIteratorRow(iterator: PPixeliterator); cdecl; external Wan
 {
   Deprecated.
 }
-{extern WandExport char
+{extern WandExport AnsiChar
   *PixelIteratorGetException(const PixelIterator *,ExceptionType *);
 
 extern WandExport PixelWand

+ 4 - 4
packages/imagemagick/src/pixel_wand.inc

@@ -24,7 +24,7 @@ type
   PixelWand = record
     id: culong;
 
-    name: array[1..MaxTextExtent] of char;
+    name: array[1..MaxTextExtent] of AnsiChar;
 
     exception: ExceptionInfo;
 
@@ -42,8 +42,8 @@ type
   PPPixelWand = ^PPixelWand;
   
 
-function PixelGetException(const wand: PPixelWand; severity: PExceptionType): PChar; cdecl; external WandExport;
-function PixelGetColorAsString(const wand: PPixelWand): PChar; cdecl; external WandExport;
+function PixelGetException(const wand: PPixelWand; severity: PExceptionType): PAnsiChar; cdecl; external WandExport;
+function PixelGetColorAsString(const wand: PPixelWand): PAnsiChar; cdecl; external WandExport;
 
 function PixelGetAlpha(const wand: PPixelWand): Double; cdecl; external WandExport;
 function PixelGetBlack(const wand: PPixelWand): Double; cdecl; external WandExport;
@@ -61,7 +61,7 @@ function IsPixelWand(const wand: PPixelWand): MagickBooleanType; cdecl; external
 function IsPixelWandSimilar(p: PPixelWand; q: PPixelWand;
  const fuzz: double): MagickBooleanType; cdecl; external WandExport;
 function PixelClearException(wand: PPixelWand): MagickBooleanType; cdecl; external WandExport;
-function PixelSetColor(wand: PPixelWand; const color: PChar): MagickBooleanType; cdecl; external WandExport;
+function PixelSetColor(wand: PPixelWand; const color: PAnsiChar): MagickBooleanType; cdecl; external WandExport;
 
 function DestroyPixelWand(wand: PPixelWand): PPixelWand; cdecl; external WandExport;
 function DestroyPixelWands(wand: PPPixelWand;

+ 6 - 6
packages/imagemagick/src/type.inc

@@ -47,7 +47,7 @@ type
     path,
     name,
     description,
-    family: PChar;
+    family: PAnsiChar;
 
     style: StyleType;
 
@@ -59,7 +59,7 @@ type
     foundry,
     format,
     metrics,
-    glyphs: PChar;
+    glyphs: PAnsiChar;
 
     stealth: MagickBooleanType;
 
@@ -71,16 +71,16 @@ type
     signature: culong;
   end;
 
-{function GetTypeList(const char *,unsigned long *,ExceptionInfo *): PPChar; external MagickExport;
+{function GetTypeList(const AnsiChar *,unsigned long *,ExceptionInfo *): PPAnsiChar; external MagickExport;
 
 extern MagickExport MagickBooleanType
   ListTypeInfo(FILE *,ExceptionInfo *);
 
 extern MagickExport const TypeInfo
-  *GetTypeInfo(const char *,ExceptionInfo *),
-  *GetTypeInfoByFamily(const char *,const StyleType,const StretchType,
+  *GetTypeInfo(const AnsiChar *,ExceptionInfo *),
+  *GetTypeInfoByFamily(const AnsiChar *,const StyleType,const StretchType,
     const unsigned long,ExceptionInfo *),
-  **GetTypeInfoList(const char *,unsigned long *,ExceptionInfo *);
+  **GetTypeInfoList(const AnsiChar *,unsigned long *,ExceptionInfo *);
 
 MagickExport void
   DestroyTypeList(void);}