Browse Source

* PChar -> PAnsiChar

Michaël Van Canneyt 2 years ago
parent
commit
4fd74f8471
2 changed files with 48 additions and 48 deletions
  1. 19 19
      packages/imlib/src/gdk_imlib.pp
  2. 29 29
      packages/imlib/src/imlib.pp

+ 19 - 19
packages/imlib/src/gdk_imlib.pp

@@ -97,21 +97,21 @@ Type
         xjustification : longint;
         yjustification : longint;
         page_size : longint;
-        color : char;
+        color : AnsiChar;
      end;
 
    PGdkImlibInitParams = ^TGdkImlibInitParams;
    TGdkImlibInitParams = record
         flags : longint;
         visualid : longint;
-        palettefile : Pchar;
-        sharedmem : char;
-        sharedpixmaps : char;
-        paletteoverride : char;
-        remap : char;
-        fastrender : char;
-        hiquality : char;
-        dither : char;
+        palettefile : PAnsiChar;
+        sharedmem : AnsiChar;
+        sharedpixmaps : AnsiChar;
+        paletteoverride : AnsiChar;
+        remap : AnsiChar;
+        fastrender : AnsiChar;
+        hiquality : AnsiChar;
+        dither : AnsiChar;
         imagecachesize : longint;
         pixmapcachesize : longint;
      end;
@@ -148,9 +148,9 @@ procedure gdk_imlib_init;cdecl;external gdk_imlibdll name 'gdk_imlib_init';
 procedure gdk_imlib_init_params(p:PGdkImlibInitParams);cdecl;external gdk_imlibdll name 'gdk_imlib_init_params';
 function gdk_imlib_get_render_type:gint;cdecl;external gdk_imlibdll name 'gdk_imlib_get_render_type';
 procedure gdk_imlib_set_render_type(rend_type:gint);cdecl;external gdk_imlibdll name 'gdk_imlib_set_render_type';
-function gdk_imlib_load_colors(afile:Pchar):gint;cdecl;external gdk_imlibdll name 'gdk_imlib_load_colors';
-function gdk_imlib_load_image(afile:Pchar):PGdkImlibImage;cdecl;external gdk_imlibdll name 'gdk_imlib_load_image';
-function gdk_imlib_load_alpha(afile:Pchar):PGdkImlibImage;cdecl;external gdk_imlibdll name 'gdk_imlib_load_alpha';
+function gdk_imlib_load_colors(afile:PAnsiChar):gint;cdecl;external gdk_imlibdll name 'gdk_imlib_load_colors';
+function gdk_imlib_load_image(afile:PAnsiChar):PGdkImlibImage;cdecl;external gdk_imlibdll name 'gdk_imlib_load_image';
+function gdk_imlib_load_alpha(afile:PAnsiChar):PGdkImlibImage;cdecl;external gdk_imlibdll name 'gdk_imlib_load_alpha';
 function gdk_imlib_best_color_match(r:Pgint; g:Pgint; b:Pgint):gint;cdecl;external gdk_imlibdll name 'gdk_imlib_best_color_match';
 procedure gdk_imlib_best_color_get(c:PGdkColor);cdecl;external gdk_imlibdll name 'gdk_imlib_best_color_get';
 function gdk_imlib_render(image:PGdkImlibImage; width:gint; height:gint):gint;cdecl;external gdk_imlibdll name 'gdk_imlib_render';
@@ -167,10 +167,10 @@ procedure gdk_imlib_get_image_border(image:PGdkImlibImage; border:PGdkImlibBorde
 procedure gdk_imlib_set_image_border(image:PGdkImlibImage; border:PGdkImlibBorder);cdecl;external gdk_imlibdll name 'gdk_imlib_set_image_border';
 procedure gdk_imlib_get_image_shape(image:PGdkImlibImage; color:PGdkImlibColor);cdecl;external gdk_imlibdll name 'gdk_imlib_get_image_shape';
 procedure gdk_imlib_set_image_shape(image:PGdkImlibImage; color:PGdkImlibColor);cdecl;external gdk_imlibdll name 'gdk_imlib_set_image_shape';
-function gdk_imlib_save_image_to_eim(image:PGdkImlibImage; afile:Pchar):gint;cdecl;external gdk_imlibdll name 'gdk_imlib_save_image_to_eim';
-function gdk_imlib_add_image_to_eim(image:PGdkImlibImage; afile:Pchar):gint;cdecl;external gdk_imlibdll name 'gdk_imlib_add_image_to_eim';
-function gdk_imlib_save_image_to_ppm(image:PGdkImlibImage; afile:Pchar):gint;cdecl;external gdk_imlibdll name 'gdk_imlib_save_image_to_ppm';
-function gdk_imlib_load_file_to_pixmap(filename:Pchar; pmap:PPGdkPixmap; mask:PPGdkBitmap):gint;cdecl;external gdk_imlibdll name 'gdk_imlib_load_file_to_pixmap';
+function gdk_imlib_save_image_to_eim(image:PGdkImlibImage; afile:PAnsiChar):gint;cdecl;external gdk_imlibdll name 'gdk_imlib_save_image_to_eim';
+function gdk_imlib_add_image_to_eim(image:PGdkImlibImage; afile:PAnsiChar):gint;cdecl;external gdk_imlibdll name 'gdk_imlib_add_image_to_eim';
+function gdk_imlib_save_image_to_ppm(image:PGdkImlibImage; afile:PAnsiChar):gint;cdecl;external gdk_imlibdll name 'gdk_imlib_save_image_to_ppm';
+function gdk_imlib_load_file_to_pixmap(filename:PAnsiChar; pmap:PPGdkPixmap; mask:PPGdkBitmap):gint;cdecl;external gdk_imlibdll name 'gdk_imlib_load_file_to_pixmap';
 procedure gdk_imlib_set_image_modifier(image:PGdkImlibImage; mods:PGdkImlibColorModifier);cdecl;external gdk_imlibdll name 'gdk_imlib_set_image_modifier';
 procedure gdk_imlib_set_image_red_modifier(image:PGdkImlibImage; mods:PGdkImlibColorModifier);cdecl;external gdk_imlibdll name 'gdk_imlib_set_image_red_modifier';
 procedure gdk_imlib_set_image_green_modifier(image:PGdkImlibImage; mods:PGdkImlibColorModifier);cdecl;external gdk_imlibdll name 'gdk_imlib_set_image_green_modifier';
@@ -203,10 +203,10 @@ procedure gdk_imlib_set_fallback(fallback:gint);cdecl;external gdk_imlibdll name
 function gdk_imlib_get_visual:PGdkVisual;cdecl;external gdk_imlibdll name 'gdk_imlib_get_visual';
 function gdk_imlib_get_colormap:PGdkColormap;cdecl;external gdk_imlibdll name 'gdk_imlib_get_colormap';
 function gdk_imlib_get_sysconfig:Pgchar;cdecl;external gdk_imlibdll name 'gdk_imlib_get_sysconfig';
-function gdk_imlib_create_image_from_xpm_data(data:PPchar):PGdkImlibImage;cdecl;external gdk_imlibdll name 'gdk_imlib_create_image_from_xpm_data';
-function gdk_imlib_data_to_pixmap(data:PPchar; pmap:PPGdkPixmap; mask:PPGdkBitmap):gint;cdecl;external gdk_imlibdll name 'gdk_imlib_data_to_pixmap';
+function gdk_imlib_create_image_from_xpm_data(data:PPAnsiChar):PGdkImlibImage;cdecl;external gdk_imlibdll name 'gdk_imlib_create_image_from_xpm_data';
+function gdk_imlib_data_to_pixmap(data:PPAnsiChar; pmap:PPGdkPixmap; mask:PPGdkBitmap):gint;cdecl;external gdk_imlibdll name 'gdk_imlib_data_to_pixmap';
 procedure gdk_imlib_crop_image(image:PGdkImlibImage; x:gint; y:gint; w:gint; h:gint);cdecl;external gdk_imlibdll name 'gdk_imlib_crop_image';
-function gdk_imlib_save_image(image:PGdkImlibImage; afile:Pchar; info:PGdkImlibSaveInfo):gint;cdecl;external gdk_imlibdll name 'gdk_imlib_save_image';
+function gdk_imlib_save_image(image:PGdkImlibImage; afile:PAnsiChar; info:PGdkImlibSaveInfo):gint;cdecl;external gdk_imlibdll name 'gdk_imlib_save_image';
 function gdk_imlib_crop_and_clone_image(image:PGdkImlibImage; x:longint; y:longint; w:longint; h:longint):PGdkImlibImage;cdecl;external gdk_imlibdll name 'gdk_imlib_crop_and_clone_image';
 function gdk_imlib_create_image_from_drawable(gwin:PGdkWindow; gmask:PGdkBitmap; x:longint; y:longint; width:longint;
            height:longint):PGdkImlibImage;cdecl;external gdk_imlibdll name 'gdk_imlib_create_image_from_drawable';

+ 29 - 29
packages/imlib/src/imlib.pp

@@ -66,14 +66,14 @@ Type
         rgb_height : longint;
         rgb_data : Pbyte;
         alpha_data : Pbyte;
-        filename : PChar;
+        filename : PAnsiChar;
         width : longint;
         height : longint;
         shape_color : TImlibColor;
         border : TImlibBorder;
         pixmap : TPixmap;
         shape_mask : TPixmap;
-        cache : char;
+        cache : AnsiChar;
         mods : TImlibColorModifier;
         rmod : TImlibColorModifier;
         gmod : TImlibColorModifier;
@@ -92,8 +92,8 @@ Type
         depth : longint;
         render_depth : longint;
         root_cmap : TColormap;
-        shm : char;
-        shmp : char;
+        shm : AnsiChar;
+        shmp : AnsiChar;
         shm_event : longint;
         last_xim : PXImage;
         last_sxim : PXImage;
@@ -118,19 +118,19 @@ Type
         x : TXdata;
         byte_order : longint;
         cache : record
-             on_image : char;
+             on_image : AnsiChar;
              size_image : longint;
              num_image : longint;
              used_image : longint;
              image : Pointer;//image_cache;
-             on_pixmap : char;
+             on_pixmap : AnsiChar;
              size_pixmap : longint;
              num_pixmap : longint;
              used_pixmap : longint;
              pixmap : Pointer;//pixmap_cache;
           end;
-        fastrend : char;
-        hiq : char;
+        fastrend : AnsiChar;
+        hiq : AnsiChar;
         mods : TImlibColorModifier;
         rmod : TImlibColorModifier;
         gmod : TImlibColorModifier;
@@ -138,8 +138,8 @@ Type
         rmap : array[0..255] of byte;
         gmap : array[0..255] of byte;
         bmap : array[0..255] of byte;
-        fallback : char;
-        ordered_dither : char;
+        fallback : AnsiChar;
+        ordered_dither : AnsiChar;
      end;
 
    PImlibSaveInfo = ^TImlibSaveInfo;
@@ -149,21 +149,21 @@ Type
         xjustification : longint;
         yjustification : longint;
         page_size : longint;
-        color : char;
+        color : AnsiChar;
      end;
 
    PImlibInitParams = ^TImlibInitParams;
    TImlibInitParams = record
         flags : longint;
         visualid : longint;
-        palettefile : Pchar;
-        sharedmem : char;
-        sharedpixmaps : char;
-        paletteoverride : char;
-        remap : char;
-        fastrender : char;
-        hiquality : char;
-        dither : char;
+        palettefile : PAnsiChar;
+        sharedmem : AnsiChar;
+        sharedpixmaps : AnsiChar;
+        paletteoverride : AnsiChar;
+        remap : AnsiChar;
+        fastrender : AnsiChar;
+        hiquality : AnsiChar;
+        dither : AnsiChar;
         imagecachesize : longint;
         pixmapcachesize : longint;
         cmap : TColormap;
@@ -201,8 +201,8 @@ function Imlib_init(disp:PDisplay):PImlibData;cdecl;external imlibdll name 'Imli
 function Imlib_init_with_params(disp:PDisplay; p:PImlibInitParams):PImlibData;cdecl;external imlibdll name 'Imlib_init_with_params';
 function Imlib_get_render_type(id:PImlibData):longint;cdecl;external imlibdll name 'Imlib_get_render_type';
 procedure Imlib_set_render_type(id:PImlibData; rend_type:longint);cdecl;external imlibdll name 'Imlib_set_render_type';
-function Imlib_load_colors(id:PImlibData; thefile:Pchar):longint;cdecl;external imlibdll name 'Imlib_load_colors';
-function Imlib_load_image(id:PImlibData; thefile:Pchar):PImlibImage;cdecl;external imlibdll name 'Imlib_load_image';
+function Imlib_load_colors(id:PImlibData; thefile:PAnsiChar):longint;cdecl;external imlibdll name 'Imlib_load_colors';
+function Imlib_load_image(id:PImlibData; thefile:PAnsiChar):PImlibImage;cdecl;external imlibdll name 'Imlib_load_image';
 function Imlib_best_color_match(id:PImlibData; r:Plongint; g:Plongint; b:Plongint):longint;cdecl;external imlibdll name 'Imlib_best_color_match';
 function Imlib_render(id:PImlibData; image:PImlibImage; width:longint; height:longint):longint;cdecl;external imlibdll name 'Imlib_render';
 function Imlib_copy_image(id:PImlibData; image:PImlibImage):TPixmap;cdecl;external imlibdll name 'Imlib_copy_image';
@@ -217,10 +217,10 @@ procedure Imlib_get_image_border(id:PImlibData; image:PImlibImage; border:PImlib
 procedure Imlib_set_image_border(id:PImlibData; image:PImlibImage; border:PImlibBorder);cdecl;external imlibdll name 'Imlib_set_image_border';
 procedure Imlib_get_image_shape(id:PImlibData; image:PImlibImage; color:PImlibColor);cdecl;external imlibdll name 'Imlib_get_image_shape';
 procedure Imlib_set_image_shape(id:PImlibData; image:PImlibImage; color:PImlibColor);cdecl;external imlibdll name 'Imlib_set_image_shape';
-function Imlib_save_image_to_eim(id:PImlibData; image:PImlibImage; thefile:Pchar):longint;cdecl;external imlibdll name 'Imlib_save_image_to_eim';
-function Imlib_add_image_to_eim(id:PImlibData; image:PImlibImage; thefile:Pchar):longint;cdecl;external imlibdll name 'Imlib_add_image_to_eim';
-function Imlib_save_image_to_ppm(id:PImlibData; image:PImlibImage; thefile:Pchar):longint;cdecl;external imlibdll name 'Imlib_save_image_to_ppm';
-function Imlib_load_file_to_pixmap(id:PImlibData; filename:Pchar; pmap:PPixmap; mask:PPixmap):longint;cdecl;external imlibdll name 'Imlib_load_file_to_pixmap';
+function Imlib_save_image_to_eim(id:PImlibData; image:PImlibImage; thefile:PAnsiChar):longint;cdecl;external imlibdll name 'Imlib_save_image_to_eim';
+function Imlib_add_image_to_eim(id:PImlibData; image:PImlibImage; thefile:PAnsiChar):longint;cdecl;external imlibdll name 'Imlib_add_image_to_eim';
+function Imlib_save_image_to_ppm(id:PImlibData; image:PImlibImage; thefile:PAnsiChar):longint;cdecl;external imlibdll name 'Imlib_save_image_to_ppm';
+function Imlib_load_file_to_pixmap(id:PImlibData; filename:PAnsiChar; pmap:PPixmap; mask:PPixmap):longint;cdecl;external imlibdll name 'Imlib_load_file_to_pixmap';
 procedure Imlib_set_image_modifier(id:PImlibData; image:PImlibImage; mods:PImlibColorModifier);cdecl;external imlibdll name 'Imlib_set_image_modifier';
 procedure Imlib_set_image_red_modifier(id:PImlibData; image:PImlibImage; mods:PImlibColorModifier);cdecl;external imlibdll name 'Imlib_set_image_red_modifier';
 procedure Imlib_set_image_green_modifier(id:PImlibData; image:PImlibImage; mods:PImlibColorModifier);cdecl;external imlibdll name 'Imlib_set_image_green_modifier';
@@ -255,12 +255,12 @@ function Imlib_get_fallback(id:PImlibData):longint;cdecl;external imlibdll name
 procedure Imlib_set_fallback(id:PImlibData; fallback:longint);cdecl;external imlibdll name 'Imlib_set_fallback';
 function Imlib_get_visual(id:PImlibData):PVisual;cdecl;external imlibdll name 'Imlib_get_visual';
 function Imlib_get_colormap(id:PImlibData):TColormap;cdecl;external imlibdll name 'Imlib_get_colormap';
-function Imlib_get_sysconfig(id:PImlibData):Pchar;cdecl;external imlibdll name 'Imlib_get_sysconfig';
-function Imlib_create_image_from_xpm_data(id:PImlibData; data:PPchar):PImlibImage;cdecl;external imlibdll name 'Imlib_create_image_from_xpm_data';
-function Imlib_data_to_pixmap(id:PImlibData; data:PPchar; pmap:PPixmap; mask:PPixmap):longint;cdecl;external imlibdll name 'Imlib_data_to_pixmap';
+function Imlib_get_sysconfig(id:PImlibData):PAnsiChar;cdecl;external imlibdll name 'Imlib_get_sysconfig';
+function Imlib_create_image_from_xpm_data(id:PImlibData; data:PPAnsiChar):PImlibImage;cdecl;external imlibdll name 'Imlib_create_image_from_xpm_data';
+function Imlib_data_to_pixmap(id:PImlibData; data:PPAnsiChar; pmap:PPixmap; mask:PPixmap):longint;cdecl;external imlibdll name 'Imlib_data_to_pixmap';
 procedure Imlib_crop_image(id:PImlibData; image:PImlibImage; x:longint; y:longint; w:longint;
             h:longint);cdecl;external imlibdll name 'Imlib_crop_image';
-function Imlib_save_image(id:PImlibData; image:PImlibImage; thefile:Pchar; info:PImlibSaveInfo):longint;cdecl;external imlibdll name 'Imlib_save_image';
+function Imlib_save_image(id:PImlibData; image:PImlibImage; thefile:PAnsiChar; info:PImlibSaveInfo):longint;cdecl;external imlibdll name 'Imlib_save_image';
 function Imlib_crop_and_clone_image(id:PImlibData; image:PImlibImage; x:longint; y:longint; w:longint;
            h:longint):PImlibImage;cdecl;external imlibdll name 'Imlib_crop_and_clone_image';
 function Imlib_create_image_from_drawable(id:PImlibData; win:TDrawable; mask:TPixmap; x:longint; y:longint;