From: <tom...@us...> - 2021-07-26 11:16:15
|
Revision: 3562 http://sourceforge.net/p/gexperts/code/3562 Author: tommiprami Date: 2021-07-26 11:16:12 +0000 (Mon, 26 Jul 2021) Log Message: ----------- - Inlined method must be implemented before it is called Modified Paths: -------------- trunk/ExternalSource/dzlib/u_dzConvertUtils.pas trunk/ExternalSource/dzlib/u_dzGraphicsUtils.pas trunk/ExternalSource/dzlib/u_dzNullableTimespan.pas trunk/ExternalSource/dzlib/u_dzStringUtils.pas Modified: trunk/ExternalSource/dzlib/u_dzConvertUtils.pas =================================================================== --- trunk/ExternalSource/dzlib/u_dzConvertUtils.pas 2021-07-25 15:13:36 UTC (rev 3561) +++ trunk/ExternalSource/dzlib/u_dzConvertUtils.pas 2021-07-26 11:16:12 UTC (rev 3562) @@ -664,11 +664,7 @@ Result := '0' + Result; end; -function ReduceToByte(const _Value: Integer): Byte; -begin - Result := ReduceToUInt8(_Value); -end; - +// Inlined method must be implemented before it is called function ReduceToUInt8(const _Value: Integer): UInt8; begin if _Value < 0 then @@ -679,6 +675,11 @@ Result := _Value; end; +function ReduceToByte(const _Value: Integer): Byte; +begin + Result := ReduceToUInt8(_Value); +end; + function ReduceToInt8(const _Value: Integer): Int8; begin if _Value < MinInt8 then Modified: trunk/ExternalSource/dzlib/u_dzGraphicsUtils.pas =================================================================== --- trunk/ExternalSource/dzlib/u_dzGraphicsUtils.pas 2021-07-25 15:13:36 UTC (rev 3561) +++ trunk/ExternalSource/dzlib/u_dzGraphicsUtils.pas 2021-07-26 11:16:12 UTC (rev 3562) @@ -1119,6 +1119,12 @@ _Canvas.Polygon([_Tip, Point(BaselineLeft, BaselineY), Point(BaselineRight, BaselineY)]); end; +// Inlined method must be iomplemented before it is called +function GetFastLuminance(_Red, _Green, _Blue: Byte): Byte; +begin + Result := Round(0.299 * _Red + 0.587 * _Green + 0.114 * _Blue); +end; + function TdzRgbTriple_GetFastLuminance(const _Triple: TdzRgbTriple): Byte; begin Result := GetFastLuminance(_Triple.Red, _Triple.Green, _Triple.Blue); @@ -1132,11 +1138,6 @@ _Triple.Blue := GetBValue(_Color); end; -function GetFastLuminance(_Red, _Green, _Blue: Byte): Byte; -begin - Result := Round(0.299 * _Red + 0.587 * _Green + 0.114 * _Blue); -end; - procedure GetRgbHls(_Red, _Green, _Blue: Byte; out _Hls: THlsRec); begin ColorRGBToHLS(RGB(_Red, _Green, _Blue), _Hls.Hue, _Hls.Luminance, _Hls.Saturation); @@ -1174,6 +1175,12 @@ {$IFDEF SUPPORTS_ENHANCED_RECORDS} { TdzRgbTriple } +// Inlined method must be iomplemented before it is called +function TdzRgbTriple.GetFastLuminance: Byte; +begin + Result := Round(0.299 * Red + 0.587 * Green + 0.114 * Blue); +end; + function TdzRgbTriple.GetBrightness(_Channel: TRgbBrightnessChannelEnum): Byte; begin case _Channel of @@ -1221,11 +1228,6 @@ Blue := _Value; end; -function TdzRgbTriple.GetFastLuminance: Byte; -begin - Result := Round(0.299 * Red + 0.587 * Green + 0.114 * Blue); -end; - class function TdzRgbTriple.GetFastLuminance(_Red, _Green, _Blue: Byte): Byte; begin Result := Round(0.299 * _Red + 0.587 * _Green + 0.114 * _Blue); @@ -1411,6 +1413,8 @@ Hue: Word; Saturation: Word; begin + Result := 0; + GetHls(Hue, Result, Saturation) end; @@ -1897,6 +1901,18 @@ end; end; +// Inlined method muist be implemented before it is used +function TryCalcEllipsePoints(_x0, _y0, _a, _b, _x: Extended; out _y1, _y2: Extended): Boolean; +var + y: Extended; +begin + Result := TryCalcEllipsePoint(_a, _b, _x - _x0, y); + if Result then begin + _y1 := -y + _y0; + _y2 := y + _y0; + end; +end; + procedure TBitmap_BlurEllipse(_bmp: TBitmap; _Left, _Top, _Right, _Bottom: Integer; _Passes: Integer); var x, y: Integer; @@ -2015,17 +2031,6 @@ _y := _b * Sqrt(sq); end; -function TryCalcEllipsePoints(_x0, _y0, _a, _b, _x: Extended; out _y1, _y2: Extended): Boolean; -var - y: Extended; -begin - Result := TryCalcEllipsePoint(_a, _b, _x - _x0, y); - if Result then begin - _y1 := -y + _y0; - _y2 := y + _y0; - end; -end; - procedure TBitmap24_FilterPixels(_SrcBmp, _DstBmp: TBitmap; _Callback: TPixel24FilterCallback); const BytesPerPixel = 3; @@ -2640,6 +2645,18 @@ end; end; +// Inlined method must be iomplemented before it is called +function AddToPtr(const _Ptr: Pointer; _Offset: NativeInt): Pointer; +begin + Result := Pointer(NativeInt(_Ptr) + _Offset); +end; + +// Inlined method must be iomplemented before it is called +function PtrDiff(const _Ptr1, _Ptr2: Pointer): NativeInt; +begin + Result := NativeInt(_Ptr1) - NativeInt(_Ptr2); +end; + procedure TBitmap8_Sharpen(_SrcBmp, _DstBmp: TBitmap; const _AlphaMap: TSingleMatrix); type PPixel = PByte; @@ -2965,16 +2982,6 @@ _Rop); end; -function AddToPtr(const _Ptr: Pointer; _Offset: NativeInt): Pointer; -begin - Result := Pointer(NativeInt(_Ptr) + _Offset); -end; - -function PtrDiff(const _Ptr1, _Ptr2: Pointer): NativeInt; -begin - Result := NativeInt(_Ptr1) - NativeInt(_Ptr2); -end; - function TBitmap8_TryCalcAverage(_bmp: TBitmap; _LowCutoff, _HighCutoff: Byte; out _Average: Byte): Boolean; const Modified: trunk/ExternalSource/dzlib/u_dzNullableTimespan.pas =================================================================== --- trunk/ExternalSource/dzlib/u_dzNullableTimespan.pas 2021-07-25 15:13:36 UTC (rev 3561) +++ trunk/ExternalSource/dzlib/u_dzNullableTimespan.pas 2021-07-26 11:16:12 UTC (rev 3562) @@ -161,6 +161,14 @@ { TNullableTimespan } +// Inlined method must be implemented before called +procedure TNullableTimespan.SetDaysAndMicroseconds(_FullDays: Int64; _MicroSeconds: Int64); +begin + FFullDays := _FullDays; + FMicroSeconds := _MicroSeconds; + FIsValid := GetNullableTypesFlagInterface; +end; + procedure TNullableTimespan.AssignDays(_Days: Double); begin SetDaysAndMicroseconds(Trunc(_Days), Round(Frac(_Days) / OneMicrosecond)); @@ -638,13 +646,6 @@ raise EInvalidValue.Create(_('NullableTimespan value is invalid')); end; -procedure TNullableTimespan.SetDaysAndMicroseconds(_FullDays: Int64; _MicroSeconds: Int64); -begin - FFullDays := _FullDays; - FMicroSeconds := _MicroSeconds; - FIsValid := GetNullableTypesFlagInterface; -end; - function TNullableTimespan.InDays: Double; begin if not TryGetDays(Result) then Modified: trunk/ExternalSource/dzlib/u_dzStringUtils.pas =================================================================== --- trunk/ExternalSource/dzlib/u_dzStringUtils.pas 2021-07-25 15:13:36 UTC (rev 3561) +++ trunk/ExternalSource/dzlib/u_dzStringUtils.pas 2021-07-26 11:16:12 UTC (rev 3562) @@ -527,6 +527,12 @@ Result := RemoveSuffixIfMatching(_s, _Suffix); end; +// Inlined functions must be implemented before it is used. +function UEndsWith(const _End, _s: string): Boolean; +begin + Result := AnsiEndsText(_End, _s); +end; + function RemoveSuffixIfMatching(const _s, _Suffix: string): string; begin if UEndsWith(_Suffix, _s) then @@ -1406,11 +1412,6 @@ Result := AnsiEndsStr(_End, RightStr(_s, Length(_End))); end; -function UEndsWith(const _End, _s: string): Boolean; -begin - Result := AnsiEndsText(_End, _s); -end; - function UnquoteString(const _s: string; _Quote: Char): string; var Len: Integer; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |