pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

jvcllaz: Check packages and demos for Laz 1.8.4 / 2.0.0 / 2.0.2 / trunk and FPC 3.0.4 / FPC 3.2 / trunk. 32-bit, Laz 2.0.2/FPC 3.2 64 bit. Make fixes needed.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6971 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2019-05-29 23:35:34 +00:00
parent 35b4753bbc
commit a67a3f9d55
89 changed files with 441 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/jvcllaz/run/JvMM/jvfullcolorspaces.pas
View File

@ -1433,10 +1433,10 @@ end;
procedure TJvDEFColorSpace.AddCustomColor(AColor: TColor;
AShortName, APrettyName: string);
begin
if FDelphiColors.IndexOfObject(TObject(AColor)) = -1 then
if FDelphiColors.IndexOfObject(TObject(PtrInt(AColor))) = -1 then
begin
FDelphiColors.Values[AShortName] := APrettyName;
FDelphiColors.Objects[FDelphiColors.IndexOfName(AShortName)] := TObject(AColor);
FDelphiColors.Objects[FDelphiColors.IndexOfName(AShortName)] := TObject(PtrInt(AColor));
end;
end;
@ -1447,7 +1447,7 @@ var
begin
NewColor := clNone;
for I := 0 to FDelphiColors.Count - 1 do
if AColor = TColor(FDelphiColors.Objects[I]) then
if AColor = PtrInt(FDelphiColors.Objects[I]) then
begin
NewColor := AColor;
Break;
@ -1512,7 +1512,7 @@ end;
function TJvDEFColorSpace.GetColorValue(Index: Integer): TColor;
begin
if (Index >= 0) and (Index < FDelphiColors.Count) then
Result := TColor(FDelphiColors.Objects[Index])
Result := PtrInt(FDelphiColors.Objects[Index])
else
Result := clNone;
end;

4
components/jvcllaz/run/JvMM/jvid3v2base.pas
View File

@ -3854,7 +3854,7 @@ begin
if hfUnsynchronisation in Header.Flags then
ApplyUnsynchronisationSchemeOnCurrentStream;
FileStream := TFileStream.Create(FFileName, fmOpenReadWrite or fmShareExclusive);
FileStream := TFileStream.Create(AFileName, fmOpenReadWrite or fmShareExclusive);
try
OldTagSizeInclHeader := GetTagSizeInclHeader(FileStream);
@ -5151,7 +5151,7 @@ end;
procedure TJvID3Frame.DataChanged;
begin
if Assigned(FController) then
FController.ID3Event(ideFrameChange, Longint(Self));
FController.ID3Event(ideFrameChange, PtrInt(Self));
end;
procedure TJvID3Frame.Error(const Msg: string);

24
components/jvcllaz/run/JvMM/jvid3v2types.pas
View File

@ -1325,7 +1325,7 @@ end;
procedure TJvID3TermFinder.BuildList_ID3Genres;
var
I: Integer;
I: PtrInt;
begin
if Assigned(FLists[ltID3Genres]) then
Exit;
@ -1358,7 +1358,7 @@ begin
for FrameID := Low(TJvID3FrameID) to High(TJvID3FrameID) do
with CID3FrameDefs[FrameID] do
if LongTextID[0] <> #0 then
AddObject(string(LongTextID), TObject(FrameID));
AddObject(string(LongTextID), TObject(PtrInt(FrameID)));
end;
end;
@ -1378,13 +1378,13 @@ begin
for FrameID := Low(TJvID3FrameID) to High(TJvID3FrameID) do
with CID3FrameDefs[FrameID] do
if ShortTextID[0] <> #0 then
AddObject(string(ShortTextID), TObject(FrameID));
AddObject(string(ShortTextID), TObject(PtrInt(FrameID)));
end;
end;
procedure TJvID3TermFinder.BuildList_ISO_639_2Code;
var
I: Integer;
I: PtrInt;
begin
if Assigned(FLists[ltISO_639_2Code]) then
Exit;
@ -1403,7 +1403,7 @@ end;
procedure TJvID3TermFinder.BuildList_ISO_639_2Name;
var
I: Integer;
I: PtrInt;
begin
if Assigned(FLists[ltISO_639_2Name]) then
Exit;
@ -1436,7 +1436,7 @@ begin
AStrings.AddObject('', TObject(255));
for I := 0 to FLists[ltID3Genres].Count - 1 do
if InclWinampGenres or (Integer(FLists[ltID3Genres].Objects[I]) <= CGenre_HighV1) then
if InclWinampGenres or (PtrInt(FLists[ltID3Genres].Objects[I]) <= CGenre_HighV1) then
AStrings.AddObject(FLists[ltID3Genres][I], FLists[ltID3Genres].Objects[I]);
finally
AStrings.EndUpdate;
@ -1464,7 +1464,7 @@ begin
Result := -1;
if Result >= 0 then
Result := Integer(FLists[ltID3Genres].Objects[Result])
Result := PtrInt(FLists[ltID3Genres].Objects[Result])
else
Result := cDefaultGenre[InclWinampGenres];
end;
@ -1494,7 +1494,7 @@ begin
Result := -1;
if Result >= 0 then
Result := Integer(FLists[ltID3Genres].Objects[Result])
Result := PtrInt(FLists[ltID3Genres].Objects[Result])
else
Result := CDefaultGenre[InclWinampGenres];
end;
@ -1516,7 +1516,7 @@ begin
if I < 0 then
Result := fiUnknownFrame
else
Result := TJvID3FrameID(FLists[ltID3LongText].Objects[I]);
Result := TJvID3FrameID(PtrInt(FLists[ltID3LongText].Objects[I]));
end;
function TJvID3TermFinder.ID3ShortTextToFrameID(
@ -1536,7 +1536,7 @@ begin
if I < 0 then
Result := fiUnknownFrame
else
Result := TJvID3FrameID(FLists[ltID3ShortText].Objects[I]);
Result := TJvID3FrameID(PtrInt(FLists[ltID3ShortText].Objects[I]));
end;
function TJvID3TermFinder.IsFrameOk(const S: AnsiString): Boolean;
@ -1560,7 +1560,7 @@ begin
Result := FLists[ltISO_639_2Code].IndexOf(string(AnsiLowerCase(ACode)));
if Result >= 0 then
Result := Integer(FLists[ltISO_639_2Code].Objects[Result]);
Result := Integer(PtrInt(FLists[ltISO_639_2Code].Objects[Result]));
end;
procedure TJvID3TermFinder.ISO_639_2Names(AStrings: TStrings);
@ -1577,7 +1577,7 @@ begin
Result := FLists[ltISO_639_2Name].IndexOf(AName);
if Result >= 0 then
Result := Integer(FLists[ltISO_639_2Name].Objects[Result]);
Result := PtrInt(FLists[ltISO_639_2Name].Objects[Result]);
end;
initialization