* fixed amd64 issue (unsigned long was translated to Cardinal). ctypes should be use for newer translations.

git-svn-id: trunk@12589 -

packages/imagemagick/src/cache_view.inc

@@ -20,9 +20,9 @@ type
   ViewInfo = record
     image: PImage;
 
-    id: Cardinal;
+    id: culong;
 
-    signature: Cardinal;
+    signature: culong;
   end;
   
   PViewInfo = ^ViewInfo;

packages/imagemagick/src/draw.inc

@@ -126,13 +126,13 @@ type
 
     stop: SegmentInfo;
 
-    length: Cardinal;
+    length: culong;
 
     spread: SpreadMethod;
 
     debug: MagickBooleanType;
 
-    signature: Cardinal;
+    signature: culong;
 
     previous, next: Pointer;
 {  struct _GradientInfo
@@ -148,7 +148,7 @@ type
 
     gradient: GradientInfo;
 
-    signature: Cardinal;
+    signature: culong;
 
     previous, next: Pointer;
 {  struct _ElementReference
@@ -187,7 +187,7 @@ type
 
     linejoin_: LineJoin;
 
-    miterlimit: Cardinal;
+    miterlimit: culong;
 
     dash_offset: double;
 
@@ -197,7 +197,7 @@ type
 
     text: PChar;
 
-    face: Cardinal;
+    face: culong;
 
     font,
     metrics,
@@ -207,7 +207,7 @@ type
 
     stretch: StretchType;
 
-    weight: Cardinal;
+    weight: culong;
     
     encoding: PChar;
 
@@ -238,7 +238,7 @@ type
 
     debug: MagickBooleanType;
 
-    signature: Cardinal;
+    signature: culong;
   end;
   
   PDrawInfo = ^DrawInfo;
@@ -256,7 +256,7 @@ type
   PrimitiveInfo = record
     point: PointInfo;
 
-    coordinates: Cardinal;
+    coordinates: culong;
 
     primitive: PrimitiveType;
 

packages/imagemagick/src/drawing_wand.inc

@@ -42,7 +42,7 @@ type
  );
 
   DrawingWand = record
-    id: Cardinal;
+    id: culong;
 
     name: array[0..MaxTextExtent] of Char;
 
@@ -59,7 +59,7 @@ type
     mvg_alloc,                // total allocated memory
 //    mvg_length: size_t;       // total MVG length
 
-    mvg_width: Cardinal;      // current line width 
+    mvg_width: culong;      // current line width 
 
     { Pattern support }
     
@@ -71,7 +71,7 @@ type
 
     { Graphic wand }
     
-    index: Cardinal;          // array index
+    index: culong;          // array index
 
     graphic_context: PPDrawInfo;
 
@@ -79,7 +79,7 @@ type
 
     { Pretty-printing depth }
   
-    indent_depth: Cardinal;       // number of left-hand pad characters 
+    indent_depth: culong;       // number of left-hand pad characters 
 
     { Path operation support }
   
@@ -90,7 +90,7 @@ type
     destroy,
     debug: MagickBooleanType;
 
-    signature: Cardinal;
+    signature: culong;
   end;
  
   PDrawingWand = ^DrawingWand;
@@ -112,7 +112,7 @@ function DrawGetTextDecoration(const wand: PDrawingWand): DecorationType; cdecl;
 
 function DrawGetFillAlpha(const wand: PDrawingWand): double; cdecl; external WandExport;
 function DrawGetFontSize(const wand: PDrawingWand): double; cdecl; external WandExport;
-function DrawGetStrokeDashArray(const wand: PDrawingWand; number_elements: Cardinal): PDouble; cdecl; external WandExport;
+function DrawGetStrokeDashArray(const wand: PDrawingWand; number_elements: culong): PDouble; cdecl; external WandExport;
 function DrawGetStrokeDashOffset(const wand: PDrawingWand): double; cdecl; external WandExport;
 function DrawGetStrokeAlpha(const wand: PDrawingWand): double; cdecl; external WandExport;
 function DrawGetStrokeWidth(const wand: PDrawingWand): double; cdecl; external WandExport;
@@ -121,7 +121,7 @@ function PeekDrawingWand(const wand: PDrawingWand): PDrawInfo; cdecl; external W
 
 function CloneDrawingWand(const wand: PDrawingWand): PDrawingWand; cdecl; external WandExport;
 function DestroyDrawingWand(wand: PDrawingWand): PDrawingWand; cdecl; external WandExport;
-{ Sem documentação
+{ Sem documenta
 function DrawAllocateWand(const DrawInfo *,Image *): PDrawingWand; cdecl; external WandExport;
 }
 function NewDrawingWand: PDrawingWand; cdecl; external WandExport;
@@ -148,7 +148,7 @@ function DrawSetClipPath(wand: PDrawingWand; const clip_path: PChar): MagickBool
 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 DrawSetStrokeDashArray(wand: PDrawingWand; const number_elements: Cardinal;
+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;
@@ -160,15 +160,15 @@ function DrawGetFontStretch(const wand: PDrawingWand): StretchType; cdecl; exter
 
 function DrawGetFontStyle(const wand: PDrawingWand): StyleType; cdecl; external WandExport;
 
-function DrawGetFontWeight(const wand: PDrawingWand): Cardinal; cdecl; external WandExport;
-function DrawGetStrokeMiterLimit(const wand: PDrawingWand): Cardinal; cdecl; external WandExport;
+function DrawGetFontWeight(const wand: PDrawingWand): culong; cdecl; external WandExport;
+function DrawGetStrokeMiterLimit(const wand: PDrawingWand): culong; cdecl; external WandExport;
 
 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;
 procedure DrawArc(wand: PDrawingWand; const sx, sy, ex, ey, sd, ed: double); cdecl; external WandExport;
-procedure DrawBezier(wand: PDrawingWand; const number_coordinates: Cardinal;
+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;
@@ -213,7 +213,7 @@ procedure DrawPathLineToRelative(wand: PDrawingWand; const x, y: double); cdecl;
  const mode: PathMode; const x: double); cdecl; external WandExport;
 procedure DrawPathLineToHorizontalRelative(wand: PDrawingWand); cdecl; external WandExport;
 
-Contradição na declaração
+Contradio na declarao
 }
 procedure DrawPathLineToVerticalAbsolute(wand: PDrawingWand; const y: double); cdecl; external WandExport;
 procedure DrawPathLineToVerticalRelative(wand: PDrawingWand; const y: double); cdecl; external WandExport;
@@ -221,9 +221,9 @@ procedure DrawPathMoveToAbsolute(wand: PDrawingWand; const x, y: double); cdecl;
 procedure DrawPathMoveToRelative(wand: PDrawingWand; const x, y: double); cdecl; external WandExport;
 procedure DrawPathStart(wand: PDrawingWand); cdecl; external WandExport;
 procedure DrawPoint(wand: PDrawingWand; const x, y: double); cdecl; external WandExport;
-procedure DrawPolygon(wand: PDrawingWand; const number_coordinates: Cardinal; const coordinates: PPointInfo
+procedure DrawPolygon(wand: PDrawingWand; const number_coordinates: culong; const coordinates: PPointInfo
  ); cdecl; external WandExport;
-procedure DrawPolyline(wand: PDrawingWand; const number_coordinates: Cardinal; const coordinates: PPointInfo
+procedure DrawPolyline(wand: PDrawingWand; const number_coordinates: culong; const coordinates: PPointInfo
  ); cdecl; external WandExport;
 procedure DrawPopClipPath(wand: PDrawingWand); cdecl; external WandExport;
 procedure DrawPopDefs(wand: PDrawingWand); cdecl; external WandExport;
@@ -241,7 +241,7 @@ procedure DrawSetFillRule(wand: PDrawingWand; const fill_rule: FillRule); cdecl;
 procedure DrawSetFontSize(wand: PDrawingWand; const pointsize: double); cdecl; external WandExport;
 procedure DrawSetFontStretch(wand: PDrawingWand; const font_stretch: StretchType); cdecl; external WandExport;
 procedure DrawSetFontStyle(wand: PDrawingWand; const style: StyleType); cdecl; external WandExport;
-procedure DrawSetFontWeight(wand: PDrawingWand; const font_weight: Cardinal); cdecl; external WandExport;
+procedure DrawSetFontWeight(wand: PDrawingWand; const font_weight: culong); cdecl; external WandExport;
 procedure DrawSetGravity(wand: PDrawingWand; const gravity: GravityType); cdecl; external WandExport;
 procedure DrawSkewX(wand: PDrawingWand; const degrees: double); cdecl; external WandExport;
 procedure DrawSkewY(wand: PDrawingWand; const degrees: double); cdecl; external WandExport;
@@ -251,7 +251,7 @@ procedure DrawSetStrokeColor(wand: PDrawingWand; const stroke_wand: PPixelWand);
 procedure DrawSetStrokeDashOffset(wand: PDrawingWand; const dash_offset: double); cdecl; external WandExport;
 procedure DrawSetStrokeLineCap(wand: PDrawingWand; const linecap_: LineCap); cdecl; external WandExport;
 procedure DrawSetStrokeLineJoin(wand: PDrawingWand; const linejoin_: LineJoin); cdecl; external WandExport;
-procedure DrawSetStrokeMiterLimit(wand: PDrawingWand; const miterlimit: Cardinal); cdecl; external WandExport;
+procedure DrawSetStrokeMiterLimit(wand: PDrawingWand; const miterlimit: culong); cdecl; external WandExport;
 procedure DrawSetStrokeAlpha(wand: PDrawingWand; const stroke_opacity: double); cdecl; external WandExport;
 procedure DrawSetStrokeWidth(wand: PDrawingWand; const troke_width: double); cdecl; external WandExport;
 procedure DrawSetTextAlignment(wand: PDrawingWand; const alignment: AlignType); cdecl; external WandExport;
@@ -260,7 +260,7 @@ procedure DrawSetTextAntialias(wand: PDrawingWand; const text_antialias: MagickB
 procedure DrawSetTextDecoration(wand: PDrawingWand; const decoration: DecorationType); cdecl; external WandExport;
 procedure DrawSetTextEncoding(wand: PDrawingWand; const encoding: PChar); cdecl; external WandExport;
 procedure DrawSetTextUnderColor(wand: PDrawingWand; const under_wand: PPixelWand); cdecl; external WandExport;
-procedure DrawSetViewbox(wand: PDrawingWand; x1, y1, x2, y2: Cardinal); 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;
 
 {

packages/imagemagick/src/imagemagick.pas

@@ -30,9 +30,9 @@ unit ImageMagick;
 
 interface
 
-uses SysUtils;
+uses SysUtils, ctypes;
 
-{$MINENUMSIZE 1}
+{$PACKENUM 4}
 
 const
 {$ifdef Win32}

packages/imagemagick/src/magick_attribute.inc

@@ -23,7 +23,7 @@ function MagickGetFormat(wand: PMagickWand): PChar; cdecl; external WandExport;
 function MagickGetHomeURL: PChar; cdecl; external WandExport;
 function MagickGetOption(wand: PMagickWand;
  const key: PChar): PChar; cdecl; external WandExport;
-{sem documentação
+{sem documenta
 extern WandExport char
   *MagickQueryConfigureOption(const char *),
   **MagickQueryConfigureOptions(const char *,unsigned long *),
@@ -34,13 +34,13 @@ function MagickGetCompression(wand: PMagickWand): CompressionType; cdecl; extern
 
 function MagickGetCopyright: PChar; cdecl; external WandExport;
 function MagickGetPackageName: PChar; cdecl; external WandExport;
-function MagickGetQuantumDepth(depth: PCardinal): PChar; cdecl; external WandExport;
-function MagickGetQuantumRange(range: PCardinal): 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: PCardinal): PChar; cdecl; external WandExport;
+function MagickGetVersion(version: Pculong): PChar; cdecl; external WandExport;
 
 function MagickGetSamplingFactors(wand: PMagickWand;
- number_factors: PCardinal): Pdouble; cdecl; external WandExport;
+ number_factors: Pculong): Pdouble; cdecl; external WandExport;
 {function (wand: PMagickWand): Pdouble; cdecl; external WandExport;
   *MagickQueryFontMetrics(MagickWand *,const DrawingWand *,const char *),
   *MagickQueryMultilineFontMetrics(MagickWand *,const DrawingWand *,

packages/imagemagick/src/magick_image.inc

@@ -50,10 +50,10 @@ function MagickGetImageType(wand: PMagickWand): ImageType; cdecl; external WandE
 
 function MagickGetImageInterlaceScheme(wand: PMagickWand): InterlaceType; cdecl; external WandExport;
 
-function MagickGetImageIndex(wand: PMagickWand): Integer; cdecl; external WandExport;
+function MagickGetImageIndex(wand: PMagickWand): clong; cdecl; external WandExport;
 
 function MagickAdaptiveThresholdImage(wand: PMagickWand;
-     const width, height: Cardinal; const offset: Integer): MagickBooleanType; cdecl; external WandExport;
+     const width, height: culong; const offset: clong): MagickBooleanType; cdecl; external WandExport;
 function MagickAddImage(wand: PMagickWand; const add_wand: PMagickWand): MagickBooleanType; cdecl; external WandExport;
 function MagickAddNoiseImage(wand: PMagickWand; const noise_type: NoiseType): MagickBooleanType; cdecl; external WandExport;
 function MagickAffineTransformImage(wand: PMagickWand;
@@ -70,38 +70,38 @@ function MagickBlurImage(wand: PMagickWand;
 function MagickBlurImageChannel(wand: PMagickWand;
  const channel: ChannelType; const radius, sigma: double): MagickBooleanType; cdecl; external WandExport;
 function MagickBorderImage(wand: PMagickWand;
- const bordercolor: PPixelWand; const width, height: Cardinal): MagickBooleanType; cdecl; external WandExport;
+ const bordercolor: PPixelWand; const width, height: culong): MagickBooleanType; cdecl; external WandExport;
 function MagickCharcoalImage(wand: PMagickWand;
    const radius, sigma: double): MagickBooleanType; cdecl; external WandExport;
 function MagickChopImage(wand: PMagickWand;
- const width, height: Cardinal; const x, y: Integer): MagickBooleanType; cdecl; external WandExport;
+ 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;
 function MagickColorFloodfillImage(wand: PMagickWand;
  const fill: PPixelWand; const fuzz: double; const bordercolor: PPixelWand;
- const x, y: Integer): MagickBooleanType; cdecl; external WandExport;
+ 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;
 function MagickCompositeImage(wand: PMagickWand;
  const composite_wand: PMagickWand; const compose: CompositeOperator;
- const x, y: Integer): MagickBooleanType; cdecl; external WandExport;
+ const x, y: clong): MagickBooleanType; cdecl; external WandExport;
 function MagickConstituteImage(wand: PMagickWand;
- const columns, rows: Cardinal; const map: PChar;
+ const columns, rows: culong; const map: PChar;
  const storage: StorageType; pixels: Pointer): MagickBooleanType; cdecl; external WandExport;
 function MagickContrastImage(wand: PMagickWand;
  const sharpen: MagickBooleanType): MagickBooleanType; cdecl; external WandExport;
 function MagickConvolveImage(wand: PMagickWand;
- const order: Cardinal; const kernel: PDouble): MagickBooleanType; cdecl; external WandExport;
+ const order: culong; const kernel: PDouble): MagickBooleanType; cdecl; external WandExport;
 function MagickConvolveImageChannel(wand: PMagickWand;
- const channel: ChannelType; const order: Cardinal;
+ const channel: ChannelType; const order: culong;
  const kernel: PDouble): MagickBooleanType; cdecl; external WandExport;
 function MagickCropImage(wand: PMagickWand;
- const width, height: Cardinal; const x, y: Integer): MagickBooleanType; cdecl; external WandExport;
+ const width, height: culong; const x, y: clong): MagickBooleanType; cdecl; external WandExport;
 function MagickCycleColormapImage(wand: PMagickWand;
- const displace: Integer): MagickBooleanType; cdecl; external WandExport;
+ 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;
@@ -122,8 +122,8 @@ function MagickEvaluateImageChannel(wand: PMagickWand;
 function MagickFlipImage(wand: PMagickWand): MagickBooleanType; cdecl; external WandExport;
 function MagickFlopImage(wand: PMagickWand): MagickBooleanType; cdecl; external WandExport;
 function MagickFrameImage(wand: PMagickWand;
- const matte_color: PPixelWand; const width, height: Cardinal;
- const inner_bevel, outer_bevel: Integer): MagickBooleanType; cdecl; external WandExport;
+ const matte_color: PPixelWand; const width, height: culong;
+ const inner_bevel, outer_bevel: clong): MagickBooleanType; cdecl; external WandExport;
 function MagickGammaImage(wand: PMagickWand; const gamma: double): MagickBooleanType; cdecl; external WandExport;
 function MagickGammaImageChannel(wand: PMagickWand;
  const channel: ChannelType; const gamma: double): MagickBooleanType; cdecl; external WandExport;
@@ -143,22 +143,22 @@ function MagickGetImageDistortion(wand: PMagickWand;
  const reference: PMagickWand; const metric: MetricType;
  distortion: Pdouble): MagickBooleanType; cdecl; external WandExport;
 function MagickGetImageChannelExtrema(wand: PMagickWand;
- const channel: ChannelType; minima, maxima: PCardinal): MagickBooleanType; cdecl; external WandExport;
+ const channel: ChannelType; minima, maxima: Pculong): MagickBooleanType; cdecl; external WandExport;
 function MagickGetImageChannelMean(wand: PMagickWand;
  const channel: ChannelType; mean, standard_deviation: Pdouble): MagickBooleanType; cdecl; external WandExport;
 function MagickGetImageColormapColor(wand: PMagickWand;
- const index: Cardinal; color: PPixelWand): MagickBooleanType; cdecl; external WandExport;
+ const index: culong; color: PPixelWand): MagickBooleanType; cdecl; external WandExport;
 function MagickGetImageExtrema(wand: PMagickWand;
- min, max: Cardinal): MagickBooleanType; cdecl; external WandExport;
+ min, max: culong): MagickBooleanType; cdecl; external WandExport;
 function MagickGetImageGreenPrimary(wand: PMagickWand; x, y: Pdouble): MagickBooleanType; cdecl; external WandExport;
 function MagickGetImageMatteColor(wand: PMagickWand;
  matte_color: PPixelWand): MagickBooleanType; cdecl; external WandExport;
 function MagickGetImagePage(wand: PMagickWand;
- width, height: PCardinal; x, y: PInteger): MagickBooleanType; cdecl; external WandExport;
+ width, height: Pculong; x, y: Pclong): MagickBooleanType; cdecl; external WandExport;
 function MagickGetImagePixelColor(wand: PMagickWand;
- const x, y: Integer; color: PPixelWand): MagickBooleanType; cdecl; external WandExport;
+ const x, y: clong; color: PPixelWand): MagickBooleanType; cdecl; external WandExport;
 function MagickGetImagePixels(wand: PMagickWand;
- const x, y: Integer; const columns, rows: Cardinal;
+ const x, y: clong; const columns, rows: culong;
  const map: PChar; 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;
@@ -177,7 +177,7 @@ function MagickMapImage(wand: PMagickWand;
  const map_wand: PMagickWand; const dither: MagickBooleanType): MagickBooleanType; cdecl; external WandExport;
 function MagickMatteFloodfillImage(wand: PMagickWand;
  const opacity: Quantum; const fuzz: double; const bordercolor: PPixelWand;
- const x, y: Integer): MagickBooleanType; cdecl; external WandExport;
+ const x, y: clong): MagickBooleanType; cdecl; external WandExport;
 function MagickMedianFilterImage(wand: PMagickWand; const radius: double): MagickBooleanType; cdecl; external WandExport;
 function MagickMinifyImage(wand: PMagickWand): MagickBooleanType; cdecl; external WandExport;
 function MagickModulateImage(wand: PMagickWand;
@@ -192,7 +192,7 @@ function MagickNegateImageChannel(wand: PMagickWand): MagickBooleanType; externa
   Documentation not found
 }
 function MagickNewImage(wand: PMagickWand;
- const columns, rows: Cardinal; const background: PPixelWand): MagickBooleanType; cdecl; external WandExport;
+ const columns, rows: culong; const background: PPixelWand): MagickBooleanType; cdecl; external WandExport;
 function MagickNextImage(wand: PMagickWand): MagickBooleanType; cdecl; external WandExport;
 function MagickNormalizeImage(wand: PMagickWand): MagickBooleanType; cdecl; external WandExport;
 function MagickOilPaintImage(wand: PMagickWand; const radius: double): MagickBooleanType; cdecl; external WandExport;
@@ -209,24 +209,24 @@ function MagickPosterizeImage(wand: PMagickWand;
 }
 function MagickPreviousImage(wand: PMagickWand): MagickBooleanType; cdecl; external WandExport;
 function MagickProfileImage(wand: PMagickWand; const name: PChar;
- const profile: PChar; const length: Cardinal): MagickBooleanType; cdecl; external WandExport;
+ const profile: PChar; const length: culong): MagickBooleanType; cdecl; external WandExport;
 function MagickQuantizeImage(wand: PMagickWand;
- const number_colors: Cardinal; const colorspace: ColorspaceType;
- const treedepth: Cardinal; const dither, measure_error): MagickBooleanType; cdecl; external WandExport;
+ const number_colors: culong; const colorspace: ColorspaceType;
+ const treedepth: culong; const dither, measure_error): MagickBooleanType; cdecl; external WandExport;
 function MagickQuantizeImages(wand: PMagickWand;
- const number_colors: Cardinal; const colorspace: ColorspaceType;
- const treedepth: Cardinal; const dither: MagickBooleanType;
+ const number_colors: culong; const colorspace: ColorspaceType;
+ const treedepth: culong; const dither: MagickBooleanType;
  const measure_error: MagickBooleanType): MagickBooleanType; cdecl; external WandExport;
 function MagickRadialBlurImage(wand: PMagickWand; const angle: double): MagickBooleanType; cdecl; external WandExport;
 function MagickRadialBlurImageChannel(wand: PMagickWand;
  const channel: ChannelType; const angle: double): MagickBooleanType; cdecl; external WandExport;
 function MagickRaiseImage(wand: PMagickWand;
- const width, height: Cardinal; const x, y: Integer;
+ const width, height: culong; const x, y: clong;
  const raise_: MagickBooleanType): MagickBooleanType; cdecl; external WandExport;
 function MagickReadImage(wand: PMagickWand; const filename: PChar
 ): MagickBooleanType; cdecl; external WandExport;
 function MagickReadImageBlob(wand: PMagickWand;
- const blob: Pointer; const length: Integer): MagickBooleanType; cdecl; external WandExport;
+ const blob: Pointer; const length: clong): MagickBooleanType; cdecl; external WandExport;
 //function MagickReadImageFile(wand: PMagickWand; file_: file): MagickBooleanType; external WandExport;
 
 function MagickReduceNoiseImage(wand: PMagickWand; const radius: double): MagickBooleanType; cdecl; external WandExport;
@@ -235,14 +235,14 @@ function MagickResampleImage(wand: PMagickWand;
  const x_resolution, y_resolution: double;
  const filter: FilterTypes; const blur: double): MagickBooleanType; cdecl; external WandExport;
 function MagickResizeImage(wand: PMagickWand;
- const columns, rows: Cardinal; const filter: FilterTypes;
+ const columns, rows: culong; const filter: FilterTypes;
  const blur: double): MagickBooleanType; cdecl; external WandExport;
 function MagickRollImage(wand: PMagickWand;
- const x: Integer; const y: Cardinal): MagickBooleanType; cdecl; external WandExport;
+ const x: clong; const y: culong): MagickBooleanType; cdecl; external WandExport;
 function MagickRotateImage(wand: PMagickWand; const background: PPixelWand;
  const degrees: double): MagickBooleanType; cdecl; external WandExport;
-function MagickSampleImage(wand: PMagickWand; const columns, rows: Cardinal): MagickBooleanType; cdecl; external WandExport;
-function MagickScaleImage(wand: PMagickWand; const columns, rows: Cardinal): MagickBooleanType; cdecl; external WandExport;
+function MagickSampleImage(wand: PMagickWand; const columns, rows: culong): MagickBooleanType; cdecl; external WandExport;
+function MagickScaleImage(wand: PMagickWand; const columns, rows: culong): MagickBooleanType; cdecl; external WandExport;
 function MagickSeparateImageChannel(wand: PMagickWand; const channel: ChannelType): MagickBooleanType; cdecl; external WandExport;
 
 // MagickSepiaToneImage(MagickWand *,const double),
@@ -253,35 +253,35 @@ function MagickSetImageBackgroundColor(wand: PMagickWand; const background: PPix
 function MagickSetImageBias(wand: PMagickWand; const bias: double): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageBluePrimary(wand: PMagickWand; const x, y: double): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageBorderColor(wand: PMagickWand; const border: PPixelWand): MagickBooleanType; cdecl; external WandExport;
-function MagickSetImageChannelDepth(wand: PMagickWand; const channel: ChannelType; const depth: Cardinal): MagickBooleanType; cdecl; external WandExport;
-function MagickSetImageColormapColor(wand: PMagickWand; const index: Cardinal; const color: PPixelWand): MagickBooleanType; cdecl; external WandExport;
+function MagickSetImageChannelDepth(wand: PMagickWand; const channel: ChannelType; const depth: culong): MagickBooleanType; cdecl; external WandExport;
+function MagickSetImageColormapColor(wand: PMagickWand; const index: culong; const color: PPixelWand): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageColorspace(wand: PMagickWand; const colorspace: ColorspaceType): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageCompose(wand: PMagickWand; const compose: CompositeOperator): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageCompression(wand: PMagickWand; const compression: CompressionType): MagickBooleanType; cdecl; external WandExport;
-function MagickSetImageCompressionQuality(wand: PMagickWand; const quality: Cardinal): MagickBooleanType; cdecl; external WandExport;
-function MagickSetImageDelay(wand: PMagickWand; const delay: Cardinal): MagickBooleanType; cdecl; external WandExport;
-function MagickSetImageDepth(wand: PMagickWand; const depth: Cardinal): MagickBooleanType; cdecl; external WandExport;
+function MagickSetImageCompressionQuality(wand: PMagickWand; const quality: culong): MagickBooleanType; cdecl; external WandExport;
+function MagickSetImageDelay(wand: PMagickWand; const delay: culong): MagickBooleanType; cdecl; external WandExport;
+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: Cardinal): 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 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: Integer): MagickBooleanType; cdecl; external WandExport;
+function MagickSetImageIndex(wand: PMagickWand; const index: clong): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageInterlaceScheme(wand: PMagickWand; const interlace_scheme: InterlaceType): MagickBooleanType; cdecl; external WandExport;
-function MagickSetImageIterations(wand: PMagickWand; const iterations: Cardinal): MagickBooleanType; cdecl; external WandExport;
+function MagickSetImageIterations(wand: PMagickWand; const iterations: culong): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageMatteColor(wand: PMagickWand; const matte: PPixelWand): MagickBooleanType; cdecl; external WandExport;
-function MagickSetImagePage(wand: PMagickWand; const width, height: Cardinal; const x, y: Integer): MagickBooleanType; cdecl; external WandExport;
-function MagickSetImagePixels(wand: PMagickWand; const x, y: Integer; const columns, rows: Cardinal;
+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 length: Cardinal): MagickBooleanType; cdecl; external WandExport;
+ 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
  ): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageResolution(wand: PMagickWand; const x_resolution, y_resolution: double
  ): MagickBooleanType; cdecl; external WandExport;
-function MagickSetImageScene(wand: PMagickWand; const scene: Cardinal): MagickBooleanType; cdecl; external WandExport;
+function MagickSetImageScene(wand: PMagickWand; const scene: culong): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageType(wand: PMagickWand; const image_type: ImageType
  ): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageUnits(wand: PMagickWand; const units: ResolutionType
@@ -290,13 +290,13 @@ function MagickSetImageUnits(wand: PMagickWand; const units: ResolutionType
 // const method: VirtualPixelMethod): MagickBooleanType; cdecl; external WandExport;
 function MagickSetImageWhitePoint(wand: PMagickWand; const x, y: double
  ): MagickBooleanType; cdecl; external WandExport;
-function MagickShadowImage(wand: PMagickWand; const radius, sigma: double; const x, y: Integer
+function MagickShadowImage(wand: PMagickWand; const radius, sigma: double; const x, y: clong
  ): MagickBooleanType; cdecl; external WandExport;
 function MagickSharpenImage(wand: PMagickWand; const radius, sigma: double
  ): MagickBooleanType; cdecl; external WandExport;
 function MagickSharpenImageChannel(wand: PMagickWand; const channel: ChannelType;
  const radius, sigma: double): MagickBooleanType; cdecl; external WandExport;
-function MagickShaveImage(wand: PMagickWand; const columns, rows: Cardinal
+function MagickShaveImage(wand: PMagickWand; const columns, rows: culong
  ): MagickBooleanType; cdecl; external WandExport;
 function MagickShearImage(wand: PMagickWand; const background: PPixelWand;
  const x_shear, y_shear: double): MagickBooleanType; cdecl; external WandExport;
@@ -308,7 +308,7 @@ function MagickSigmoidalContrastImageChannel(wand: PMagickWand;
  ): MagickBooleanType; cdecl; external WandExport;
 function MagickSolarizeImage(wand: PMagickWand; const threshold: double
  ): MagickBooleanType; cdecl; external WandExport;
-function MagickSpliceImage(wand: PMagickWand; const width, height: Cardinal; const x, y: Integer
+function MagickSpliceImage(wand: PMagickWand; const width, height: culong; const x, y: clong
  ): MagickBooleanType; cdecl; external WandExport;
 function MagickSpreadImage(wand: PMagickWand; const radius: double): MagickBooleanType; cdecl; external WandExport;
 function MagickStripImage(wand: PMagickWand): MagickBooleanType; cdecl; external WandExport;
@@ -358,9 +358,9 @@ function MagickFxImageChannel(wand: PMagickWand; const channel: ChannelType; con
  ): PMagickWand; cdecl; external WandExport;
 function MagickGetImage(wand: PMagickWand): PMagickWand; cdecl; external WandExport;
 function MagickGetImageRegion(wand: PMagickWand;
- const width, height: Cardinal; const x, y: Integer
+ const width, height: culong; const x, y: clong
  ): PMagickWand; cdecl; external WandExport;
-function MagickMorphImages(wand: PMagickWand; const number_frames: Cardinal): PMagickWand; cdecl; external WandExport;
+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;
@@ -368,13 +368,13 @@ function MagickMosaicImages(wand: PMagickWand): PMagickWand; cdecl; external Wan
 // ): 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: Integer): PMagickWand; cdecl; external WandExport;
+ 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 NewMagickWandFromImage(para1: PImage): PMagickWand; cdecl; external WandExport;
 
-function MagickGetImageHistogram(wand: PMagickWand; number_colors: PCardinal): PPPixelWand; cdecl; external  WandExport;
+function MagickGetImageHistogram(wand: PMagickWand; number_colors: Pculong): PPPixelWand; cdecl; external  WandExport;
 
 function MagickGetImageRenderingIntent(wand: PMagickWand): RenderingIntent; cdecl; external WandExport;
 
@@ -385,16 +385,16 @@ function MagickGetImagesBlob(wand: PMagickWand; length: Psize_t): PByte; cdecl;
 function MagickGetImageProfile(wand: PMagickWand; name: PChar; length: Psize_t): PByte; cdecl; external WandExport;
 function MagickRemoveImageProfile(wand: PMagickWand; name: PChar; length: Psize_t): PByte; cdecl; external WandExport;
 
-function MagickGetImageColors(wand: PMagickWand): Cardinal; cdecl; external WandExport;
-function MagickGetImageCompressionQuality(wand: PMagickWand): Cardinal; cdecl; external WandExport;
-function MagickGetImageDelay(wand: PMagickWand): Cardinal; cdecl; external WandExport;
-function MagickGetImageChannelDepth(wand: PMagickWand; const channel: ChannelType): Cardinal; cdecl; external WandExport;
-function MagickGetImageDepth(wand: PMagickWand): Cardinal; cdecl; external WandExport;
-function MagickGetImageHeight(wand: PMagickWand): Cardinal; cdecl; external WandExport;
-function MagickGetImageIterations(wand: PMagickWand): Cardinal; cdecl; external WandExport;
-function MagickGetImageScene(wand: PMagickWand): Cardinal; cdecl; external WandExport;
-function MagickGetImageWidth(wand: PMagickWand): Cardinal; cdecl; external WandExport;
-function MagickGetNumberImages(wand: PMagickWand): Cardinal; cdecl; external WandExport;
+function MagickGetImageColors(wand: PMagickWand): culong; cdecl; external WandExport;
+function MagickGetImageCompressionQuality(wand: PMagickWand): culong; cdecl; external WandExport;
+function MagickGetImageDelay(wand: PMagickWand): culong; cdecl; external WandExport;
+function MagickGetImageChannelDepth(wand: PMagickWand; const channel: ChannelType): culong; cdecl; external WandExport;
+function MagickGetImageDepth(wand: PMagickWand): culong; cdecl; external WandExport;
+function MagickGetImageHeight(wand: PMagickWand): culong; cdecl; external WandExport;
+function MagickGetImageIterations(wand: PMagickWand): culong; cdecl; external WandExport;
+function MagickGetImageScene(wand: PMagickWand): culong; cdecl; external WandExport;
+function MagickGetImageWidth(wand: PMagickWand): culong; cdecl; external WandExport;
+function MagickGetNumberImages(wand: PMagickWand): culong; cdecl; external WandExport;
 
 //function MagickGetImageVirtualPixelMethod(wand: PMagickWand): VirtualPixelMethod; cdecl; external WandExport;
 

packages/imagemagick/src/magick_type.inc

@@ -25,7 +25,7 @@ const
   MagickTrue = 1;
 
 type
-  MagickBooleanType = Cardinal;
+  MagickBooleanType = culong;
 
   PMagickBooleanType = ^MagickBooleanType;
 
@@ -451,7 +451,7 @@ type
   ColorPacket = record
    pixel: PixelPacket;
    index: IndexPacket;
-   count: Cardinal;
+   count: culong;
   end;
   
   PColorPacket = ^ColorPacket;
@@ -469,17 +469,17 @@ type
 type 
   ProfileInfo = record
    name: PChar;
-   length: Integer;
+   length: cint;
    info: PChar;
-   signature: Cardinal;
+   signature: culong;
   end;
   
   PProfileInfo = ^ProfileInfo;
 
 type 
   RectangleInfo = record
-   width, height: Cardinal;
-   x, y: Cardinal;
+   width, height: culong;
+   x, y: culong;
   end;
 
 type
@@ -498,7 +498,7 @@ type
   TimerInfo = record
    user, elapsed: Timer;
    state: TimerState;
-   signature: Cardinal;
+   signature: culong;
   end;
   
   PTimerInfo = ^TimerInfo;
@@ -512,13 +512,13 @@ type
   ExceptionInfo = record
    //severity: ExceptionType;
    //error_number: Shortint;
-   severity: Cardinal;
-   error_number: Cardinal;
+   severity: culong;
+   error_number: culong;
    reason, description: PChar;
 	 exceptions: Pointer;
 	 relinquish: MagickBooleanType;
    semaphore: Pointer; //PSemaphoreInfo;
-   signature: Cardinal;
+   signature: culong;
   end;
   
   PExceptionInfo = ^ExceptionInfo;
@@ -536,10 +536,10 @@ type
    storage_class: ClassType;
    colorspace: ColorspaceType;
    compression: CompressionType;
-   quality: Cardinal;
+   quality: culong;
    orientation: OrientationType;
    taint, matte: MagickBooleanType;
-   columns, rows, depth, colors: Cardinal;
+   columns, rows, depth, colors: culong;
    colormap: PPixelPacket;
    background_color, border_color, matte_color: PixelPacket;
    gamma: double;
@@ -548,7 +548,7 @@ type
    profiles: Pointer;
    units: ResolutionType;
    montage, directory, geometry: PChar;
-   offset: Integer;
+   offset: cint;
    x_resolution, y_resolution: double;
    page, extract_info, tile_info: RectangleInfo;  // deprecated
    bias, blur, fuzz: double;
@@ -559,8 +559,8 @@ type
    compose: CompositeOperator;
    dispose: DisposeType;
    clip_mask: Pointer; // PImage
-   scene, delay, ticks_per_second, iterations, total_colors: Cardinal;
-   start_loop: Integer;
+   scene, delay, ticks_per_second, iterations, total_colors: culong;
+   start_loop: cint;
    error: ErrorInfo;
    timer: TimerInfo;
    progress_monitor: MagickProgressMonitor;
@@ -570,15 +570,15 @@ type
    ascii85: Pointer; //_Ascii85Info_
    blob: Pointer; // _BlobInfo_
    filename, magick_filename, magick: array[1..MaxTextExtent] of char;
-   magick_columns, magick_rows: Cardinal;
+   magick_columns, magick_rows: culong;
    exception: ExceptionInfo;
    debug: MagickBooleanType;
    reference_count: Longint;
    semaphore: Pointer; //PSemaphoreInfo;
    color_profile, iptc_profile: ProfileInfo;
    generic_profile: PProfileInfo;
-   generic_profiles: Cardinal;  // this & ProfileInfo is deprecated
-   signature: Cardinal;
+   generic_profiles: culong;  // this & ProfileInfo is deprecated
+   signature: culong;
    previous, list, next: Pointer;
 {  struct _Image
     *previous,
@@ -598,16 +598,16 @@ type
    orientation: OrientationType;
    temporary, adjoin, affirm, antialias: MagickBooleanType;
    size, extract, page, scenes: PChar;
-   scene, number_scenes, depth: Cardinal;
+   scene, number_scenes, depth: culong;
    interlace: InterlaceType;
    endian: EndianType;
    units: ResolutionType;
-   quality: Cardinal;
+   quality: culong;
    sampling_factor, server_name, font, texture, density: PChar;
    pointsize, fuzz: double;
    background_color, border_color, matte_color: PixelPacket;
    dither, monochrome: MagickBooleanType;
-   colors: Cardinal;
+   colors: culong;
    colorspace: ColorspaceType;
    type_: ImageType ;
    preview_type: PreviewType;
@@ -619,10 +619,10 @@ type
    options: Pointer;
    progress_monitor: MagickProgressMonitor;
    client_data, cache: Pointer;
-   stream: Cardinal; //StreamHandler;
+   stream: culong; //StreamHandler;
    file_: Pointer; // *file
    blob: Pointer;
-   length: Integer;
+   length: cint;
    magick, unique, zero, filename: array[1..MaxTextExtent] of char;
    debug: MagickBooleanType;
 
@@ -630,9 +630,9 @@ type
     Deprecated.
   }
    tile: PChar;
-   subimage, subrange: Cardinal;
+   subimage, subrange: culong;
    pen: PixelPacket;
-   signature: Cardinal;
+   signature: culong;
  end;
 
   PImageInfo = ^ImageInfo;

packages/imagemagick/src/magick_wand.pas

@@ -28,28 +28,28 @@ unit magick_wand;
 	{$PACKRECORDS C}
 {$ENDIF}
 
-{$MINENUMSIZE 1}
+{$PACKENUM 4}
 
 interface
 
-uses ImageMagick;
+uses ImageMagick, ctypes, unixtype;
 
 { Various types }
 type
   MagickWand = record
-    id: Cardinal;
+    id: culong;
     name: array[1..MaxTextExtent] of Char;
     exception: ExceptionInfo;
     image_info: PImageInfo;
     quantize_info: PQuantizeInfo;
     images: PImage;
     active, pend, debug: MagickBooleanType;
-    signature: Cardinal;
+    signature: culong;
   end;
 
   PMagickWand = ^MagickWand;
 
-  size_t = Integer;
+//  size_t = Integer;
   
   Psize_t = ^size_t;
 

packages/imagemagick/src/pixel.inc

@@ -49,7 +49,7 @@ type
     green,
     blue,
     opacity,
-    index: Cardinal;
+    index: culong;
   end;
 
 type
@@ -60,7 +60,7 @@ type
 
     fuzz: double;
 
-    depth: Cardinal;
+    depth: culong;
 
     red,
     green,

packages/imagemagick/src/pixel_iterator.inc

@@ -18,7 +18,7 @@
 
 type
   PixelIterator = record
-    id: Cardinal;
+    id: culong;
 
     name: array[0..MaxTextExtent] of char;
 
@@ -28,13 +28,13 @@ type
 
     region: RectangleInfo;
 
-    y: Integer;
+    y: cint;
 
     pixel_wand: PPPixelWand;
 
     debug: MagickBooleanType;
 
-    signature: Cardinal;
+    signature: culong;
   end;
   
   PPixelIterator = ^PixelIterator;
@@ -46,17 +46,17 @@ function PixelGetIteratorException(const iterator: PPixeliterator;
 function IsPixelIterator(const iterator: PPixeliterator): MagickBooleanType; cdecl; external WandExport;
 function PixelClearIteratorException(iterator: PPixeliterator): MagickBooleanType; cdecl; external WandExport;
 function PixelSetIteratorRow(iterator: PPixeliterator;
- const row: Integer): MagickBooleanType; cdecl; external WandExport;
+ const row: cint): MagickBooleanType; cdecl; external WandExport;
 function PixelSyncIterator(iterator: PPixeliterator): MagickBooleanType; cdecl; external WandExport;
 
 function DestroyPixelIterator(iterator: PPixeliterator): PPixelIterator; cdecl; external WandExport;
 function NewPixelIterator(wand: PMagickWand): PPixelIterator; cdecl; external WandExport;
 function NewPixelRegionIterator(
- wand: PMagickWand; const x, y: Integer; const columns, rows: Cardinal;
+ wand: PMagickWand; const x, y: cint; const columns, rows: culong;
  const modify: MagickBooleanType): PPixelIterator; cdecl; external WandExport;
 
-function PixelGetNextIteratorRow(iterator: PPixeliterator; var wandCount: Cardinal): PPPixelWand; cdecl; external WandExport;
-function PixelGetPreviousIteratorRow(iterator: PPixeliterator; var wandCount: Cardinal): PPPixelWand; cdecl; external WandExport;
+function PixelGetNextIteratorRow(iterator: PPixeliterator; var wandCount: culong): PPPixelWand; cdecl; external WandExport;
+function PixelGetPreviousIteratorRow(iterator: PPixeliterator; var wandCount: culong): PPPixelWand; cdecl; external WandExport;
 
 procedure ClearPixelIterator(iterator: PPixeliterator); cdecl; external WandExport;
 procedure PixelResetIterator(iterator: PPixeliterator); cdecl; external WandExport;

packages/imagemagick/src/pixel_wand.inc

@@ -22,7 +22,7 @@
 }
 type
   PixelWand = record
-    id: Cardinal;
+    id: culong;
 
     name: array[1..MaxTextExtent] of char;
 
@@ -30,11 +30,11 @@ type
 
     pixel: MagickPixelPacket;
 
-    count: Cardinal;
+    count: culong;
 
     debug: MagickBooleanType;
 
-    signature: Cardinal;
+    signature: culong;
   end;
   
   PPixelWand = ^PixelWand;
@@ -65,9 +65,9 @@ function PixelSetColor(wand: PPixelWand; const color: PChar): MagickBooleanType;
 
 function DestroyPixelWand(wand: PPixelWand): PPixelWand; cdecl; external WandExport;
 function DestroyPixelWands(wand: PPPixelWand;
- const number_wands: Cardinal): PPPixelWand; cdecl; external WandExport;
+ const number_wands: culong): PPPixelWand; cdecl; external WandExport;
 function NewPixelWand: PPixelWand; cdecl; external WandExport;
-function NewPixelWands(const number_wands: Cardinal): PPPixelWand; cdecl; external WandExport;
+function NewPixelWands(const number_wands: culong): PPPixelWand; cdecl; external WandExport;
 
 function PixelGetAlphaQuantum(const wand: PPixelWand): Quantum; cdecl; external  WandExport;
 function PixelGetBlackQuantum(const wand: PPixelWand): Quantum; cdecl; external WandExport;
@@ -79,7 +79,7 @@ function PixelGetOpacityQuantum(const wand: PPixelWand): Quantum; cdecl; externa
 function PixelGetRedQuantum(const wand: PPixelWand): Quantum; cdecl; external WandExport;
 function PixelGetYellowQuantum(const wand: PPixelWand): Quantum; cdecl; external WandExport;
 
-function PixelGetColorCount(const wand: PPixelWand): Cardinal; cdecl; external WandExport;
+function PixelGetColorCount(const wand: PPixelWand): culong; cdecl; external WandExport;
 
 procedure ClearPixelWand(wand: PPixelWand); cdecl; external WandExport;
 procedure PixelGetMagickColor(const wand: PPixelWand; packet: PMagickPixelPacket); cdecl; external WandExport;
@@ -90,7 +90,7 @@ procedure PixelSetBlack(wand: PPixelWand; const opacity: Double); cdecl; externa
 procedure PixelSetBlackQuantum(wand: PPixelWand; const opacity: Quantum); cdecl; external WandExport;
 procedure PixelSetBlue(wand: PPixelWand; const opacity: Double); cdecl; external WandExport;
 procedure PixelSetBlueQuantum(wand: PPixelWand; const opacity: Quantum); cdecl; external WandExport;
-procedure PixelSetColorCount(wand: PPixelWand; const count: Cardinal); cdecl; external WandExport;
+procedure PixelSetColorCount(wand: PPixelWand; const count: culong); cdecl; external WandExport;
 procedure PixelSetCyan(wand: PPixelWand; const opacity: Double); cdecl; external WandExport;
 procedure PixelSetCyanQuantum(wand: PPixelWand; const opacity: Quantum); cdecl; external WandExport;
 procedure PixelSetGreen(wand: PPixelWand; const opacity: Double); cdecl; external WandExport;

packages/imagemagick/src/quantize.inc

@@ -18,9 +18,9 @@
 
 type
   QuantizeInfo = record
-    number_colors: Cardinal;
+    number_colors: culong;
 
-    tree_depth: Cardinal;
+    tree_depth: culong; 
 
     dither: MagickBooleanType;
 
@@ -28,7 +28,7 @@ type
 
     measure_error: MagickBooleanType;
 
-    signature: Cardinal;
+    signature: culong; 
   end;
 	PQuantizeInfo = ^QuantizeInfo;
 

packages/imagemagick/src/statistic.inc

@@ -18,13 +18,13 @@
 
 type
   ChannelStatistics = record
-    depth: Cardinal;
+    depth: culong;
 
     minima, maxima: Quantum;
 
     mean, standard_deviation: double;
 
-    scale: Cardinal;
+    scale: culong;
   end;
   
   PChannelStatistics = ^ChannelStatistics;

packages/imagemagick/src/type.inc

@@ -42,7 +42,7 @@ type
 
 type
   TypeInfo = record
-    face: Cardinal;
+    face: culong;
 
     path,
     name,
@@ -53,7 +53,7 @@ type
 
     stretch: StretchType;
 
-    weight: Cardinal;
+    weight: culong;
 
     encoding,
     foundry,
@@ -68,7 +68,7 @@ type
     *previous,
     *next;  /* deprecated, use GetTypeInfoList() */}
 
-    signature: Cardinal;
+    signature: culong;
   end;
 
 {function GetTypeList(const char *,unsigned long *,ExceptionInfo *): PPChar; external MagickExport;