paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-03 10:58:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renames the FreeType define DEBUG to FREETYPE_DEBUG because the previous name was too common

Browse Source 
git-svn-id: trunk@35693 -
This commit is contained in:
sekelsenmat 2012-03-03 20:50:30 +00:00
parent c65328d7bc
commit 54c7e0d2bb
4 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/lazutils/ttcache.pas
View File

@ -383,7 +383,7 @@ var
(* UNLOCK *) (* UNLOCK *)
(* Element wasn't found !! *) (* Element wasn't found !! *)
{$IFDEF DEBUG} {$IFDEF FREETYPE_DEBUG}
{$ENDIF} {$ENDIF}
exit; exit;

4
components/lazutils/ttconfig.inc
View File

@ -4,9 +4,9 @@
(* This file contains several definition pragmas that are used to *) (* This file contains several definition pragmas that are used to *)
(* build several versions of the library. Each constant is commented *) (* build several versions of the library. Each constant is commented *)
(* Define the DEBUG constant if you want the library dumping trace *) (* Define the FREETYPE_DEBUG constant if you want the library dumping trace *)
(* information to the standard error output. *) (* information to the standard error output. *)
{ $DEFINE DEBUG} { $DEFINE FREETYPE_DEBUG}
(* Define the ASSERT constant if you want to generate runtime integrity *) (* Define the ASSERT constant if you want to generate runtime integrity *)

20
components/lazutils/ttgload.pas
View File

@ -252,7 +252,7 @@ const
if ( n_contours > left_contours ) then if ( n_contours > left_contours ) then
begin begin
{$IFDEF DEBUG} {$IFDEF FREETYPE_DEBUG}
Writeln( 'ERROR: Glyph index ',i,' has ',Gl.numberOfContours ); Writeln( 'ERROR: Glyph index ',i,' has ',Gl.numberOfContours );
Writeln( ' contours > left ', left_contours ); Writeln( ' contours > left ', left_contours );
{$ENDIF} {$ENDIF}
@ -272,7 +272,7 @@ const
for k := 0 to n_contours-1 do for k := 0 to n_contours-1 do
begin begin
{$IFDEF DEBUG} Write( n_points,' '); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Write( n_points,' '); {$ENDIF}
n_points := GET_Short; n_points := GET_Short;
exec^.pts.conEnds^[k] := n_points; exec^.pts.conEnds^[k] := n_points;
inc( n_points ); inc( n_points );
@ -280,7 +280,7 @@ const
if n_points > left_points then if n_points > left_points then
begin begin
{$IFDEF DEBUG} Writeln( 'ERROR: Too many points' ); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln( 'ERROR: Too many points' ); {$ENDIF}
error := TT_Err_Too_Many_Points; error := TT_Err_Too_Many_Points;
goto Fail; goto Fail;
end; end;
@ -302,11 +302,11 @@ const
else } else }
begin begin
{$IFDEF DEBUG} Writeln('Instructions size : ', n_ins); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('Instructions size : ', n_ins); {$ENDIF}
if n_ins > face^.maxProfile.maxSizeOfInstructions then if n_ins > face^.maxProfile.maxSizeOfInstructions then
begin begin
{$IFDEF DEBUG} Writeln('Too many instructions'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('Too many instructions'); {$ENDIF}
error := TT_Err_Too_Many_Ins; error := TT_Err_Too_Many_Ins;
goto Fail; goto Fail;
end; end;
@ -515,11 +515,11 @@ const
TT_Forget_Frame; TT_Forget_Frame;
(* load the instructions *) (* load the instructions *)
{$IFDEF DEBUG} Writeln('Instructions size : ', n_ins); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('Instructions size : ', n_ins); {$ENDIF}
if n_ins > exec^.face^.maxProfile.maxSizeOfInstructions then if n_ins > exec^.face^.maxProfile.maxSizeOfInstructions then
begin begin
{$IFDEF DEBUG} Writeln('Too many instructions'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('Too many instructions'); {$ENDIF}
error := TT_Err_Too_Many_Ins; error := TT_Err_Too_Many_Ins;
goto Fail; goto Fail;
end; end;
@ -732,7 +732,7 @@ const
table := LookUp_TrueType_Table( face, 'glyf'); table := LookUp_TrueType_Table( face, 'glyf');
if table < 0 then if table < 0 then
begin begin
{$IFDEF DEBUG} {$IFDEF FREETYPE_DEBUG}
Trace1( 'TTApi.load_glyph : couldn''t find glyf table' ); Trace1( 'TTApi.load_glyph : couldn''t find glyf table' );
{$ENDIF} {$ENDIF}
error := TT_Err_Table_Missing; error := TT_Err_Table_Missing;
@ -871,7 +871,7 @@ const
TT_Forget_Frame; TT_Forget_Frame;
{$IFDEF DEBUG} {$IFDEF FREETYPE_DEBUG}
Writeln('Glyph ', i ); Writeln('Glyph ', i );
Writeln(' # of Contours : ',num_contours ); Writeln(' # of Contours : ',num_contours );
@ -882,7 +882,7 @@ const
if num_contours > left_contours then if num_contours > left_contours then
begin begin
{$IFDEF DEBUG} {$IFDEF FREETYPE_DEBUG}
Writeln( 'ERROR: Glyph index ', i, ' has ', num_contours ); Writeln( 'ERROR: Glyph index ', i, ' has ', num_contours );
Writeln(' contours > left ', left_contours ); Writeln(' contours > left ', left_contours );
{$ENDIF} {$ENDIF}

66
components/lazutils/ttload.pas
View File

@ -193,7 +193,7 @@ uses TTError, TTMemory, TTFile;
begin begin
Load_TrueType_Directory := Failure; Load_TrueType_Directory := Failure;
{$IFDEF DEBUG} Write('Directory '); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Write('Directory '); {$ENDIF}
if Load_TrueType_Collection(face) then if Load_TrueType_Collection(face) then
begin begin
@ -235,7 +235,7 @@ uses TTError, TTMemory, TTFile;
tableDir.entrySelector := GET_UShort; tableDir.entrySelector := GET_UShort;
tableDir.rangeShift := GET_UShort; tableDir.rangeShift := GET_UShort;
{$IFDEF DEBUG} Writeln('Tables number : ', tableDir.numTables ); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('Tables number : ', tableDir.numTables ); {$ENDIF}
TT_Forget_Frame; TT_Forget_Frame;
@ -243,7 +243,7 @@ uses TTError, TTMemory, TTFile;
if (tableDir.version <> $10000 ) and (* MS fonts *) if (tableDir.version <> $10000 ) and (* MS fonts *)
(tableDir.version <> $74727565) then (* Mac fonts *) (tableDir.version <> $74727565) then (* Mac fonts *)
begin begin
{$IFDEF DEBUG} Writeln('Invalid font format'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('Invalid font format'); {$ENDIF}
error := TT_Err_Invalid_File_Format; error := TT_Err_Invalid_File_Format;
exit; exit;
end; end;
@ -268,7 +268,7 @@ uses TTError, TTMemory, TTFile;
end; end;
{$IFDEF DEBUG} Writeln('loaded'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('loaded'); {$ENDIF}
Load_TrueType_Directory := Success; Load_TrueType_Directory := Success;
end; end;
@ -295,7 +295,7 @@ uses TTError, TTMemory, TTFile;
Load_TrueType_MaxProfile := Failure; Load_TrueType_MaxProfile := Failure;
{$IFDEF DEBUG} Write('MaxProfile '); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Write('MaxProfile '); {$ENDIF}
table := LookUp_Mandatory_Table( face, 'maxp'); table := LookUp_Mandatory_Table( face, 'maxp');
if table < 0 then exit; if table < 0 then exit;
@ -370,7 +370,7 @@ uses TTError, TTMemory, TTFile;
inc( maxContours, 4 ); inc( maxContours, 4 );
end; end;
{$IFDEF DEBUG} Writeln('loaded'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('loaded'); {$ENDIF}
Load_TrueType_MaxProfile := Success; Load_TrueType_MaxProfile := Success;
end; end;
@ -466,7 +466,7 @@ uses TTError, TTMemory, TTFile;
begin begin
Load_TrueType_Header := Failure; Load_TrueType_Header := Failure;
{$IFDEF DEBUG} Write('Header '); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Write('Header '); {$ENDIF}
i := LookUp_Mandatory_Table(face, 'head'); i := LookUp_Mandatory_Table(face, 'head');
if i <= 0 then exit; if i <= 0 then exit;
@ -504,7 +504,7 @@ uses TTError, TTMemory, TTFile;
Index_To_Loc_Format := GET_Short; Index_To_Loc_Format := GET_Short;
Glyph_Data_Format := GET_Short; Glyph_Data_Format := GET_Short;
{$IFDEF DEBUG} Writeln('Units per EM : ',Units_Per_EM ); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('Units per EM : ',Units_Per_EM ); {$ENDIF}
end; end;
@ -512,7 +512,7 @@ uses TTError, TTMemory, TTFile;
end; end;
{$IFDEF DEBUG} Writeln('loaded'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('loaded'); {$ENDIF}
Load_TrueType_Header := Success; Load_TrueType_Header := Success;
end; end;
@ -549,7 +549,7 @@ uses TTError, TTMemory, TTFile;
begin begin
Load_TrueType_Metrics := Failure; Load_TrueType_Metrics := Failure;
{$IFDEF DEBUG} {$IFDEF FREETYPE_DEBUG}
if vertical then if vertical then
Write('vmtx ') Write('vmtx ')
else else
@ -593,7 +593,7 @@ uses TTError, TTMemory, TTFile;
if num_shorts < 0 then if num_shorts < 0 then
begin begin
{$IFDEF DEBUG} Writeln('!! More metrics than glyphs !\n'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('!! More metrics than glyphs !\n'); {$ENDIF}
if vertical then error := TT_Err_Invalid_Vert_Metrics if vertical then error := TT_Err_Invalid_Vert_Metrics
else error := TT_Err_Invalid_Horiz_Metrics; else error := TT_Err_Invalid_Horiz_Metrics;
exit; exit;
@ -632,7 +632,7 @@ uses TTError, TTMemory, TTFile;
TT_Forget_Frame; TT_Forget_Frame;
{$IFDEF DEBUG} Writeln('loaded'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('loaded'); {$ENDIF}
Load_TrueType_Metrics := Success; Load_TrueType_Metrics := Success;
end; end;
@ -660,7 +660,7 @@ uses TTError, TTMemory, TTFile;
begin begin
Load_TrueType_Metrics_Header := Failure; Load_TrueType_Metrics_Header := Failure;
{$IFDEF DEBUG} {$IFDEF FREETYPE_DEBUG}
if vertical then if vertical then
Write('Vertical Header ') Write('Vertical Header ')
else else
@ -733,7 +733,7 @@ uses TTError, TTMemory, TTFile;
end; end;
{$IFDEF DEBUG} Writeln('loaded'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('loaded'); {$ENDIF}
Load_TrueType_Metrics_Header := Load_TrueType_Metrics( face, vertical ); Load_TrueType_Metrics_Header := Load_TrueType_Metrics( face, vertical );
end; end;
@ -765,7 +765,7 @@ uses TTError, TTMemory, TTFile;
Load_TrueType_Locations := Failure; Load_TrueType_Locations := Failure;
{$IFDEF DEBUG} Write('Locations '); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Write('Locations '); {$ENDIF}
with face^ do with face^ do
begin begin
@ -782,7 +782,7 @@ uses TTError, TTMemory, TTFile;
numLocations := dirTables^[T].Length shr 2; numLocations := dirTables^[T].Length shr 2;
{$IFDEF DEBUG} {$IFDEF FREETYPE_DEBUG}
Writeln('Glyph locations # ( 32 bits offsets ) : ', numLocations ); Writeln('Glyph locations # ( 32 bits offsets ) : ', numLocations );
{$ENDIF} {$ENDIF}
@ -799,7 +799,7 @@ uses TTError, TTMemory, TTFile;
begin begin
numLocations := dirTables^[T].Length shr 1; numLocations := dirTables^[T].Length shr 1;
{$IFDEF DEBUG} {$IFDEF FREETYPE_DEBUG}
Writeln('Glyph locations # ( 16 bits offsets ) : ', numLocations ); Writeln('Glyph locations # ( 16 bits offsets ) : ', numLocations );
{$ENDIF} {$ENDIF}
@ -814,7 +814,7 @@ uses TTError, TTMemory, TTFile;
end; end;
{$IFDEF DEBUG} Writeln('loaded'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('loaded'); {$ENDIF}
Load_TrueType_Locations := Success; Load_TrueType_Locations := Success;
end; end;
@ -925,7 +925,7 @@ uses TTError, TTMemory, TTFile;
begin begin
Load_TrueType_CVT := Failure; Load_TrueType_CVT := Failure;
{$IFDEF DEBUG} Write('CVT '); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Write('CVT '); {$ENDIF}
(* the CVT table is optional *) (* the CVT table is optional *)
@ -935,7 +935,7 @@ uses TTError, TTMemory, TTFile;
face^.cvt := nil; face^.cvt := nil;
face^.cvtSize := 0; face^.cvtSize := 0;
Load_TrueType_CVT := Success; Load_TrueType_CVT := Success;
{$IFDEF DEBUG} writeln('none'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} writeln('none'); {$ENDIF}
exit; exit;
end; end;
@ -956,7 +956,7 @@ uses TTError, TTMemory, TTFile;
TT_Forget_Frame; TT_Forget_Frame;
end; end;
{$IFDEF DEBUG} Writeln('loaded'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('loaded'); {$ENDIF}
Load_TrueType_CVT := Success; Load_TrueType_CVT := Success;
end; end;
@ -991,7 +991,7 @@ uses TTError, TTMemory, TTFile;
Load_TrueType_CMap := Failure; Load_TrueType_CMap := Failure;
{$IFDEF DEBUG} Write('CMaps '); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Write('CMaps '); {$ENDIF}
t := LookUp_Mandatory_Table( face,'cmap' ); t := LookUp_Mandatory_Table( face,'cmap' );
if t < 0 then exit; if t < 0 then exit;
@ -1050,7 +1050,7 @@ uses TTError, TTMemory, TTFile;
end; (* with face^ *) end; (* with face^ *)
{$IFDEF DEBUG} Writeln('loaded'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('loaded'); {$ENDIF}
Load_TrueType_CMap := Success; Load_TrueType_CMap := Success;
exit; exit;
@ -1117,7 +1117,7 @@ uses TTError, TTMemory, TTFile;
Load_TrueType_Programs := Failure; Load_TrueType_Programs := Failure;
{$IFDEF DEBUG} Write('Font program '); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Write('Font program '); {$ENDIF}
(* The font program is optional *) (* The font program is optional *)
@ -1130,7 +1130,7 @@ uses TTError, TTMemory, TTFile;
fontProgram := nil; fontProgram := nil;
fontPgmSize := 0; fontPgmSize := 0;
{$IFDEF DEBUG} Writeln('none in file'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('none in file'); {$ENDIF}
end end
else else
@ -1145,10 +1145,10 @@ uses TTError, TTMemory, TTFile;
fontProgram^, fontProgram^,
fontPgmSize ) then exit; fontPgmSize ) then exit;
{$IFDEF DEBUG} Writeln('loaded, ',fontPgmSize,' bytes'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('loaded, ',fontPgmSize,' bytes'); {$ENDIF}
end; end;
{$IFDEF DEBUG} Write('CVT program '); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Write('CVT program '); {$ENDIF}
t := LookUp_trueType_Table( face, 'prep' ); t := LookUp_trueType_Table( face, 'prep' );
@ -1161,7 +1161,7 @@ uses TTError, TTMemory, TTFile;
cvtProgram := nil; cvtProgram := nil;
cvtPgmSize := 0; cvtPgmSize := 0;
{$IFDEF DEBUG} Writeln('none in file'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('none in file'); {$ENDIF}
end end
else else
@ -1176,7 +1176,7 @@ uses TTError, TTMemory, TTFile;
cvtProgram^, cvtProgram^,
cvtPgmSize ) then exit; cvtPgmSize ) then exit;
{$IFDEF DEBUG} Writeln('loaded, ',cvtPgmSize,' bytes'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('loaded, ',cvtPgmSize,' bytes'); {$ENDIF}
end; end;
Load_TrueType_Programs := Success; Load_TrueType_Programs := Success;
@ -1201,7 +1201,7 @@ uses TTError, TTMemory, TTFile;
begin begin
Load_TrueType_OS2 := Failure; Load_TrueType_OS2 := Failure;
{$IFDEF DEBUG} Write('OS/2 table '); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Write('OS/2 table '); {$ENDIF}
(* We now support Apple fonts who do not have an OS/2 table *) (* We now support Apple fonts who do not have an OS/2 table *)
table := LookUp_Mandatory_Table( face, 'OS/2' ); table := LookUp_Mandatory_Table( face, 'OS/2' );
@ -1271,7 +1271,7 @@ uses TTError, TTMemory, TTFile;
end; end;
{$IFDEF DEBUG} Writeln('loaded'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('loaded'); {$ENDIF}
Load_TrueType_OS2 := Success; Load_TrueType_OS2 := Success;
end; end;
@ -1294,7 +1294,7 @@ uses TTError, TTMemory, TTFile;
begin begin
Load_TrueType_Postscript := Failure; Load_TrueType_Postscript := Failure;
{$IFDEF DEBUG} Write('post table '); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Write('post table '); {$ENDIF}
table := LookUp_TrueType_Table( face, 'post' ); table := LookUp_TrueType_Table( face, 'post' );
if table < 0 then exit; if table < 0 then exit;
@ -1317,7 +1317,7 @@ uses TTError, TTMemory, TTFile;
TT_Forget_Frame; TT_Forget_Frame;
{$IFDEF DEBUG} Writeln('loaded'); {$ENDIF} {$IFDEF FREETYPE_DEBUG} Writeln('loaded'); {$ENDIF}
Load_trueType_Postscript := Success; Load_trueType_Postscript := Success;
end; end;