paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-30 12:12:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

aggpass: clean up

Browse Source 
git-svn-id: trunk@39888 -
This commit is contained in:
mattias 2013-01-19 08:35:38 +00:00
parent 906b5868a0
commit f7ca9e6a3b
11 changed files with 98 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
components/aggpas/expat-pas/xmlrole.pas
View File

@ -150,75 +150,75 @@ const
that ,| are not mixed in a model group that ,| are not mixed in a model group
content of literals } content of literals }
KW_ANY : array[0..3 ] of char = ( {KW_ANY : array[0..3 ] of char = (
ASCII_A ,ASCII_N ,ASCII_Y ,#0 ); ASCII_A ,ASCII_N ,ASCII_Y ,#0 );}
KW_ATTLIST : array[0..7 ] of char = ( {KW_ATTLIST : array[0..7 ] of char = (
ASCII_A ,ASCII_T ,ASCII_T ,ASCII_L ,ASCII_I ,ASCII_S ,ASCII_T ,#0 ); ASCII_A ,ASCII_T ,ASCII_T ,ASCII_L ,ASCII_I ,ASCII_S ,ASCII_T ,#0 );}
KW_CDATA : array[0..5 ] of char = ( {KW_CDATA : array[0..5 ] of char = (
ASCII_C ,ASCII_D ,ASCII_A ,ASCII_T ,ASCII_A ,#0 ); ASCII_C ,ASCII_D ,ASCII_A ,ASCII_T ,ASCII_A ,#0 );}
KW_DOCTYPE : array[0..7 ] of char = ( KW_DOCTYPE : array[0..7 ] of char = (
ASCII_D ,ASCII_O ,ASCII_C ,ASCII_T ,ASCII_Y ,ASCII_P ,ASCII_E ,#0 ); ASCII_D ,ASCII_O ,ASCII_C ,ASCII_T ,ASCII_Y ,ASCII_P ,ASCII_E ,#0 );
KW_ELEMENT : array[0..7 ] of char = ( {KW_ELEMENT : array[0..7 ] of char = (
ASCII_E ,ASCII_L ,ASCII_E ,ASCII_M ,ASCII_E ,ASCII_N ,ASCII_T ,#0 ); ASCII_E ,ASCII_L ,ASCII_E ,ASCII_M ,ASCII_E ,ASCII_N ,ASCII_T ,#0 );}
KW_EMPTY : array[0..5 ] of char = ( {KW_EMPTY : array[0..5 ] of char = (
ASCII_E ,ASCII_M ,ASCII_P ,ASCII_T ,ASCII_Y ,#0 ); ASCII_E ,ASCII_M ,ASCII_P ,ASCII_T ,ASCII_Y ,#0 );}
KW_ENTITIES : array[0..8 ] of char = ( {KW_ENTITIES : array[0..8 ] of char = (
ASCII_E ,ASCII_N ,ASCII_T ,ASCII_I ,ASCII_T ,ASCII_I ,ASCII_E ,ASCII_S , ASCII_E ,ASCII_N ,ASCII_T ,ASCII_I ,ASCII_T ,ASCII_I ,ASCII_E ,ASCII_S ,
#0 ); #0 );}
KW_ENTITY : array[0..6 ] of char = ( {KW_ENTITY : array[0..6 ] of char = (
ASCII_E ,ASCII_N ,ASCII_T ,ASCII_I ,ASCII_T ,ASCII_Y ,#0 ); ASCII_E ,ASCII_N ,ASCII_T ,ASCII_I ,ASCII_T ,ASCII_Y ,#0 );}
KW_FIXED : array[0..5 ] of char = ( {KW_FIXED : array[0..5 ] of char = (
ASCII_F ,ASCII_I ,ASCII_X ,ASCII_E ,ASCII_D ,#0 ); ASCII_F ,ASCII_I ,ASCII_X ,ASCII_E ,ASCII_D ,#0 );}
KW_ID : array[0..2 ] of char = ( {KW_ID : array[0..2 ] of char = (
ASCII_I ,ASCII_D ,#0 ); ASCII_I ,ASCII_D ,#0 );}
KW_IDREF : array[0..5 ] of char = ( {KW_IDREF : array[0..5 ] of char = (
ASCII_I ,ASCII_D ,ASCII_R ,ASCII_E ,ASCII_F ,#0 ); ASCII_I ,ASCII_D ,ASCII_R ,ASCII_E ,ASCII_F ,#0 );}
KW_IDREFS : array[0..6 ] of char = ( {KW_IDREFS : array[0..6 ] of char = (
ASCII_I ,ASCII_D ,ASCII_R ,ASCII_E ,ASCII_F ,ASCII_S ,#0 ); ASCII_I ,ASCII_D ,ASCII_R ,ASCII_E ,ASCII_F ,ASCII_S ,#0 );}
KW_IGNORE : array[0..6 ] of char = ( {KW_IGNORE : array[0..6 ] of char = (
ASCII_I ,ASCII_G ,ASCII_N ,ASCII_O ,ASCII_R ,ASCII_E ,#0 ); ASCII_I ,ASCII_G ,ASCII_N ,ASCII_O ,ASCII_R ,ASCII_E ,#0 );}
KW_IMPLIED : array[0..7 ] of char = ( {KW_IMPLIED : array[0..7 ] of char = (
ASCII_I ,ASCII_M ,ASCII_P ,ASCII_L ,ASCII_I ,ASCII_E ,ASCII_D ,#0 ); ASCII_I ,ASCII_M ,ASCII_P ,ASCII_L ,ASCII_I ,ASCII_E ,ASCII_D ,#0 );}
KW_INCLUDE : array[0..7 ] of char = ( {KW_INCLUDE : array[0..7 ] of char = (
ASCII_I ,ASCII_N ,ASCII_C ,ASCII_L ,ASCII_U ,ASCII_D ,ASCII_E ,#0 ); ASCII_I ,ASCII_N ,ASCII_C ,ASCII_L ,ASCII_U ,ASCII_D ,ASCII_E ,#0 );}
KW_NDATA : array[0..5 ] of char = ( {KW_NDATA : array[0..5 ] of char = (
ASCII_N ,ASCII_D ,ASCII_A ,ASCII_T ,ASCII_A ,#0 ); ASCII_N ,ASCII_D ,ASCII_A ,ASCII_T ,ASCII_A ,#0 );}
KW_NMTOKEN : array[0..7 ] of char = ( {KW_NMTOKEN : array[0..7 ] of char = (
ASCII_N ,ASCII_M ,ASCII_T ,ASCII_O ,ASCII_K ,ASCII_E ,ASCII_N ,#0 ); ASCII_N ,ASCII_M ,ASCII_T ,ASCII_O ,ASCII_K ,ASCII_E ,ASCII_N ,#0 );}
KW_NMTOKENS : array[0..8 ] of char = ( {KW_NMTOKENS : array[0..8 ] of char = (
ASCII_N ,ASCII_M ,ASCII_T ,ASCII_O ,ASCII_K ,ASCII_E ,ASCII_N ,ASCII_S , ASCII_N ,ASCII_M ,ASCII_T ,ASCII_O ,ASCII_K ,ASCII_E ,ASCII_N ,ASCII_S ,
#0 ); #0 );}
KW_NOTATION : array[0..8 ] of char = ( {KW_NOTATION : array[0..8 ] of char = (
ASCII_N ,ASCII_O ,ASCII_T ,ASCII_A ,ASCII_T ,ASCII_I ,ASCII_O ,ASCII_N , ASCII_N ,ASCII_O ,ASCII_T ,ASCII_A ,ASCII_T ,ASCII_I ,ASCII_O ,ASCII_N ,
#0 ); #0 );}
KW_PCDATA : array[0..6 ] of char = ( {KW_PCDATA : array[0..6 ] of char = (
ASCII_P ,ASCII_C ,ASCII_D ,ASCII_A ,ASCII_T ,ASCII_A ,#0 ); ASCII_P ,ASCII_C ,ASCII_D ,ASCII_A ,ASCII_T ,ASCII_A ,#0 );}
KW_PUBLIC : array[0..6 ] of char = ( KW_PUBLIC : array[0..6 ] of char = (
ASCII_P ,ASCII_U ,ASCII_B ,ASCII_L ,ASCII_I ,ASCII_C ,#0 ); ASCII_P ,ASCII_U ,ASCII_B ,ASCII_L ,ASCII_I ,ASCII_C ,#0 );
KW_REQUIRED : array[0..8 ] of char = ( {KW_REQUIRED : array[0..8 ] of char = (
ASCII_R ,ASCII_E ,ASCII_Q ,ASCII_U ,ASCII_I ,ASCII_R ,ASCII_E ,ASCII_D , ASCII_R ,ASCII_E ,ASCII_Q ,ASCII_U ,ASCII_I ,ASCII_R ,ASCII_E ,ASCII_D ,
#0 ); #0 );}
KW_SYSTEM : array[0..6 ] of char = ( KW_SYSTEM : array[0..6 ] of char = (
ASCII_S ,ASCII_Y ,ASCII_S ,ASCII_T ,ASCII_E ,ASCII_M ,#0 ); ASCII_S ,ASCII_Y ,ASCII_S ,ASCII_T ,ASCII_E ,ASCII_M ,#0 );

82
components/aggpas/expat-pas/xmltok.pas
View File

@ -666,47 +666,47 @@ const
isInvalid4:utf8_isInvalid4 ); isInvalid4:utf8_isInvalid4 );
{$IFDEF XML_NS } {$IFDEF XML_NS }
internal_utf8_encoding_ns : normal_encoding = ( //internal_utf8_encoding_ns : normal_encoding = (
enc:(scanners :(normal_prologTok ,normal_contentTok ,normal_cdataSectionTok {$IFDEF XML_DTD },normal_ignoreSectionTok {$ENDIF } ); // enc:(scanners :(normal_prologTok ,normal_contentTok ,normal_cdataSectionTok {$IFDEF XML_DTD },normal_ignoreSectionTok {$ENDIF } );
literalScanners:(normal_attributeValueTok ,normal_entityValueTok ); // literalScanners:(normal_attributeValueTok ,normal_entityValueTok );
//
sameName :normal_sameName; // sameName :normal_sameName;
nameMatchesAscii :normal_nameMatchesAscii; // nameMatchesAscii :normal_nameMatchesAscii;
nameLength :normal_nameLength; // nameLength :normal_nameLength;
skipS :normal_skipS; // skipS :normal_skipS;
getAtts :normal_getAtts; // getAtts :normal_getAtts;
charRefNumber :normal_charRefNumber; // charRefNumber :normal_charRefNumber;
predefinedEntityName:normal_predefinedEntityName; // predefinedEntityName:normal_predefinedEntityName;
updatePosition :normal_updatePosition; // updatePosition :normal_updatePosition;
isPublicId :normal_isPublicId; // isPublicId :normal_isPublicId;
utf8Convert :utf8_toUtf8; // utf8Convert :utf8_toUtf8;
utf16Convert :utf8_toUtf16; // utf16Convert :utf8_toUtf16;
//
minBytesPerChar:1; // minBytesPerChar:1;
//
isUtf8 :#1; // isUtf8 :#1;
isUtf16:#0 ); // isUtf16:#0 );
type_:({$I iasciitab.inc} // type_:({$I iasciitab.inc}
{$I utf8tab.inc}); // {$I utf8tab.inc});
//
{$IFDEF XML_MIN_SIZE } //{$IFDEF XML_MIN_SIZE }
byteType :sb_byteType; // byteType :sb_byteType;
isNameMin :isNever; // isNameMin :isNever;
isNmstrtMin:isNever; // isNmstrtMin:isNever;
byteToAscii:sb_byteToAscii; // byteToAscii:sb_byteToAscii;
charMatches:sb_charMatches; // charMatches:sb_charMatches;
//
{$ENDIF } //{$ENDIF }
//
isName2 :utf8_isName2; // isName2 :utf8_isName2;
isName3 :utf8_isName3; // isName3 :utf8_isName3;
isName4 :isNever; // isName4 :isNever;
isNmstrt2 :utf8_isNmstrt2; // isNmstrt2 :utf8_isNmstrt2;
isNmstrt3 :utf8_isNmstrt3; // isNmstrt3 :utf8_isNmstrt3;
isNmstrt4 :isNever; // isNmstrt4 :isNever;
isInvalid2:utf8_isInvalid2; // isInvalid2:utf8_isInvalid2;
isInvalid3:utf8_isInvalid3; // isInvalid3:utf8_isInvalid3;
isInvalid4:utf8_isInvalid4 ); // isInvalid4:utf8_isInvalid4 );
{$ENDIF } {$ENDIF }

4
components/aggpas/expat-pas/xmltok_ns.inc
View File

@ -37,14 +37,14 @@
{ xmltok_ns.inc } { xmltok_ns.inc }
const const
{$IFDEF XML_NS } {$IFDEF XML_NS }
encodingsNS : array[0..6 ] of ENCODING_ptr = ( {encodingsNS : array[0..6 ] of ENCODING_ptr = (
@latin1_encoding_ns.enc , @latin1_encoding_ns.enc ,
@ascii_encoding_ns.enc , @ascii_encoding_ns.enc ,
@utf8_encoding_ns.enc , @utf8_encoding_ns.enc ,
@big2_encoding_ns.enc , @big2_encoding_ns.enc ,
@big2_encoding_ns.enc , @big2_encoding_ns.enc ,
@little2_encoding_ns.enc , @little2_encoding_ns.enc ,
@utf8_encoding_ns.enc ); { NO_ENC } @utf8_encoding_ns.enc );} { NO_ENC }
{$ENDIF } {$ENDIF }

11
components/aggpas/src/agg_2D.pas
View File

@ -677,8 +677,8 @@ end;
{ PREMULTIPLY } { PREMULTIPLY }
procedure Image.premultiply; procedure Image.premultiply;
var //var
pixf : pixel_formats; // pixf : pixel_formats;
begin begin
{ pixfmt_rgba32(pixf ,@renBuf ); { pixfmt_rgba32(pixf ,@renBuf );
@ -689,8 +689,8 @@ end;
{ DEMULTIPLY } { DEMULTIPLY }
procedure Image.demultiply; procedure Image.demultiply;
var //var
pixf : pixel_formats; // pixf : pixel_formats;
begin begin
{ pixfmt_rgba32(pixf ,@renBuf ); { pixfmt_rgba32(pixf ,@renBuf );
@ -2108,9 +2108,10 @@ procedure Agg2D.font(
italic : boolean = false; italic : boolean = false;
ch : FontCacheType = RasterFontCache; ch : FontCacheType = RasterFontCache;
angle : double = 0.0 ); angle : double = 0.0 );
{$IFDEF AGG2D_USE_WINFONTS}
var var
b : int; b : int;
{$ENDIF}
begin begin
m_textAngle :=angle; m_textAngle :=angle;
m_fontHeight :=height; m_fontHeight :=height;

4
components/aggpas/src/agg_basics.pas
View File

@ -1149,7 +1149,6 @@ var
fr : integer; fr : integer;
get : shortstring; get : shortstring;
flg : char;
dth , dth ,
prc , prc ,
err : integer; err : integer;
@ -1254,7 +1253,6 @@ begin
fr:=trunc(system.frac(val ) ); fr:=trunc(system.frac(val ) );
sc:=_string; sc:=_string;
flg:=#0;
dth:=1; dth:=1;
prc:=0; prc:=0;
prf:=#0; prf:=#0;
@ -1283,7 +1281,7 @@ begin
_flags : _flags :
case src^ of case src^ of
'-' ,'+' ,'0' ,' ' ,'#' : '-' ,'+' ,'0' ,' ' ,'#' :
flg:=src^; ;
'1'..'9' : '1'..'9' :
begin begin

3
components/aggpas/src/agg_color.pas
View File

@ -244,13 +244,12 @@ end;
{ FROM_WAVELENGTH } { FROM_WAVELENGTH }
constructor aggclr.from_wavelength(wl ,gamma : double ); constructor aggclr.from_wavelength(wl ,gamma : double );
var var
tr ,tg ,tb ,ta ,s : double; tr ,tg ,tb ,s : double;
begin begin
tr:=0; tr:=0;
tg:=0; tg:=0;
tb:=0; tb:=0;
ta:=0;
if (wl >= 380.0 ) and if (wl >= 380.0 ) and
(wl <= 440.0 ) then (wl <= 440.0 ) then

3
components/aggpas/src/agg_scanline_storage_aa.pas
View File

@ -1671,9 +1671,6 @@ end;
{ REWIND_SCANLINES } { REWIND_SCANLINES }
function serialized_scanlines_adaptor_aa.rewind_scanlines; function serialized_scanlines_adaptor_aa.rewind_scanlines;
var
x : int;
begin begin
m_ptr:=m_data; m_ptr:=m_data;

4
components/aggpas/src/agg_span_pattern_resample_gray.pas
View File

@ -145,7 +145,7 @@ var
span : aggclr_ptr; span : aggclr_ptr;
intr : span_interpolator_ptr; intr : span_interpolator_ptr;
fg ,diameter ,filter_size ,radius_x ,radius_y ,maxx ,maxy ,y_lr ,y_hr , fg ,diameter ,filter_size ,radius_x ,radius_y ,{%H-}maxx ,{%H-}maxy ,y_lr ,y_hr ,
total_weight ,x_lr_ini ,x_hr_ini ,weight_y ,x_lr ,x_hr ,weight : int; total_weight ,x_lr_ini ,x_hr_ini ,weight_y ,x_lr ,x_hr ,weight : int;
row_ptr ,fg_ptr : int8u_ptr; row_ptr ,fg_ptr : int8u_ptr;
@ -297,7 +297,7 @@ var
intr : span_interpolator_ptr; intr : span_interpolator_ptr;
fg ,diameter ,filter_size ,rx ,ry ,rx_inv ,ry_inv ,radius_x ,radius_y , fg ,diameter ,filter_size ,rx ,ry ,rx_inv ,ry_inv ,radius_x ,radius_y ,
maxx ,maxy ,y_lr ,y_hr ,total_weight ,x_lr_ini ,x_hr_ini ,weight_y , {%H-}maxx ,{%H-}maxy ,y_lr ,y_hr ,total_weight ,x_lr_ini ,x_hr_ini ,weight_y ,
x_lr ,x_hr ,weight : int; x_lr ,x_hr ,weight : int;
row_ptr ,fg_ptr : int8u_ptr; row_ptr ,fg_ptr : int8u_ptr;

4
components/aggpas/src/agg_span_pattern_resample_rgb.pas
View File

@ -158,7 +158,7 @@ var
fg : array[0..2 ] of int; fg : array[0..2 ] of int;
diameter ,filter_size ,radius_x ,radius_y ,maxx ,maxy ,y_lr ,y_hr , diameter ,filter_size ,radius_x ,radius_y ,{%H-}maxx ,{%H-}maxy ,y_lr ,y_hr ,
total_weight ,x_lr_ini ,x_hr_ini ,weight_y ,x_lr ,x_hr ,weight : int; total_weight ,x_lr_ini ,x_hr_ini ,weight_y ,x_lr ,x_hr ,weight : int;
row_ptr ,fg_ptr : int8u_ptr; row_ptr ,fg_ptr : int8u_ptr;
@ -337,7 +337,7 @@ var
fg : array[0..2 ] of int; fg : array[0..2 ] of int;
diameter ,filter_size ,rx ,ry ,rx_inv ,ry_inv ,radius_x ,radius_y , diameter ,filter_size ,rx ,ry ,rx_inv ,ry_inv ,radius_x ,radius_y ,
maxx ,maxy ,y_lr ,y_hr ,total_weight ,x_lr_ini ,x_hr_ini ,weight_y , {%H-}maxx ,{%H-}maxy ,y_lr ,y_hr ,total_weight ,x_lr_ini ,x_hr_ini ,weight_y ,
x_lr ,x_hr ,weight : int; x_lr ,x_hr ,weight : int;
row_ptr ,fg_ptr : int8u_ptr; row_ptr ,fg_ptr : int8u_ptr;

4
components/aggpas/src/agg_span_pattern_resample_rgba.pas
View File

@ -158,7 +158,7 @@ var
fg : array[0..3 ] of int; fg : array[0..3 ] of int;
diameter ,filter_size ,radius_x ,radius_y ,maxx ,maxy ,y_lr ,y_hr , diameter ,filter_size ,radius_x ,radius_y ,{%H-}maxx ,{%H-}maxy ,y_lr ,y_hr ,
total_weight ,x_lr_ini ,x_hr_ini ,weight_y ,x_lr ,x_hr ,weight : int; total_weight ,x_lr_ini ,x_hr_ini ,weight_y ,x_lr ,x_hr ,weight : int;
row_ptr ,fg_ptr : int8u_ptr; row_ptr ,fg_ptr : int8u_ptr;
@ -345,7 +345,7 @@ var
fg : array[0..3 ] of int; fg : array[0..3 ] of int;
diameter ,filter_size ,rx ,ry ,rx_inv ,ry_inv ,radius_x ,radius_y ,maxx ,maxy , diameter ,filter_size ,rx ,ry ,rx_inv ,ry_inv ,radius_x ,radius_y ,{%H-}maxx ,{%H-}maxy ,
y_lr ,y_hr ,total_weight ,x_lr_ini ,x_hr_ini ,weight_y ,x_lr ,x_hr ,weight : int; y_lr ,y_hr ,total_weight ,x_lr_ini ,x_hr_ini ,weight_y ,x_lr ,x_hr ,weight : int;
row_ptr ,fg_ptr : int8u_ptr; row_ptr ,fg_ptr : int8u_ptr;

2
components/aggpas/src/svg/agg_svg_exception.pas
View File

@ -133,7 +133,7 @@ var
buf : array[0..49 ] of char; buf : array[0..49 ] of char;
dst , dst ,
max : char_ptr; max : char_ptr;
err : integer; {%H-}err : integer;
begin begin
dst:=@buf[0 ]; dst:=@buf[0 ];