From 4998861d1ed76847c990057efa48f94fd19e0346 Mon Sep 17 00:00:00 2001 From: zueuk Date: Mon, 20 Apr 2009 07:43:43 +0000 Subject: [PATCH] 64-bit rendering removed --- 2.10/Source/ImageMaker.pas | 10 ++++++---- 2.10/Source/RenderThread.pas | 9 ++++----- 2.10/Source/RenderTypes.pas | 11 ++++------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/2.10/Source/ImageMaker.pas b/2.10/Source/ImageMaker.pas index 6d4f764..3736d15 100644 --- a/2.10/Source/ImageMaker.pas +++ b/2.10/Source/ImageMaker.pas @@ -27,7 +27,7 @@ type FBucketHeight: integer; FBucketWidth: integer; - FBuckets64: TBucket64Array; +// FBuckets64: TBucket64Array; FBuckets48: TBucket48Array; FBuckets32: TBucket32Array; FBuckets32f: TBucket32fArray; @@ -35,7 +35,7 @@ type FOnProgress: TOnProgress; FGetBucket: function(x, y: integer): TBucket64 of object; - function GetBucket64(x, y: integer): TBucket64; +// function GetBucket64(x, y: integer): TBucket64; function GetBucket48(x, y: integer): TBucket64; function GetBucket32(x, y: integer): TBucket64; function GetBucket32f(x, y: integer): TBucket64; @@ -207,7 +207,7 @@ end; /////////////////////////////////////////////////////////////////////////////// procedure TImageMaker.SetBucketData(const Buckets: pointer; BucketWidth, BucketHeight: integer; bits: integer); begin - FBuckets64 := TBucket64Array(Buckets); + //FBuckets64 := TBucket64Array(Buckets); FBuckets48 := TBucket48Array(Buckets); FBuckets32f := TBucket32fArray(Buckets); FBuckets32 := TBucket32Array(Buckets); @@ -219,7 +219,7 @@ begin BITS_32: FGetBucket := GetBucket32; BITS_32f: FGetBucket := GetBucket32f; BITS_48: FGetBucket := GetBucket48; - BITS_64: FGetBucket := GetBucket64; + //BITS_64: FGetBucket := GetBucket64; else assert(false); end; end; @@ -560,10 +560,12 @@ end; /////////////////////////////////////////////////////////////////////////////// +{ function TImageMaker.GetBucket64(x, y: integer): TBucket64; begin Result := FBuckets64[y][x]; end; +} function TImageMaker.GetBucket32(x, y: integer): TBucket64; begin diff --git a/2.10/Source/RenderThread.pas b/2.10/Source/RenderThread.pas index 09baa21..f2247f6 100644 --- a/2.10/Source/RenderThread.pas +++ b/2.10/Source/RenderThread.pas @@ -25,7 +25,6 @@ uses Classes, Windows, Messages, Graphics, ControlPoint, Render, Global, RenderTypes, PngImage, - Render64, Render64MT, Render48, Render48MT, Render32, Render32MT, Render32f, Render32fMT; @@ -171,14 +170,14 @@ begin 0: FRenderer := TRenderer32.Create; 1: FRenderer := TRenderer32f.Create; 2: FRenderer := TRenderer48.Create; - 3: FRenderer := TRenderer64.Create; + //3: FRenderer := TRenderer64.Create; end; end else begin case FBitsPerSample of 0: FRenderer := TRenderer32MM.Create; 1: FRenderer := TRenderer32fMM.Create; 2: FRenderer := TRenderer48MM.Create; - 3: FRenderer := TRenderer64MM.Create; + //3: FRenderer := TRenderer64MM.Create; end; FRenderer.MaxMem := MaxMem; end; @@ -189,14 +188,14 @@ begin 0: FRenderer := TRenderer32MT.Create; 1: FRenderer := TRenderer32fMT.Create; 2: FRenderer := TRenderer48MT.Create; - 3: FRenderer := TRenderer64MT.Create; + //3: FRenderer := TRenderer64MT.Create; end; end else begin case FBitsPerSample of 0: FRenderer := TRenderer32MT_MM.Create; 1: FRenderer := TRenderer32fMT_MM.Create; 2: FRenderer := TRenderer48MT_MM.Create; - 3: FRenderer := TRenderer64MT_MM.Create; + //3: FRenderer := TRenderer64MT_MM.Create; end; FRenderer.MaxMem := MaxMem; end; diff --git a/2.10/Source/RenderTypes.pas b/2.10/Source/RenderTypes.pas index b843bb4..7403263 100644 --- a/2.10/Source/RenderTypes.pas +++ b/2.10/Source/RenderTypes.pas @@ -27,9 +27,8 @@ type Blue, Count: Int64; end; - PBucket64 = ^TBucket64; - TBucket64Array = array of array of TBucket64; -// PBucket64Array = ^PBucket64Array; +// PBucket64 = ^TBucket64; +// TBucket64Array = array of array of TBucket64; TBucket48 = packed record rl: longword; rh: word; @@ -39,7 +38,6 @@ type end; PBucket48 = ^TBucket48; TBucket48Array = array of array of TBucket48; -// PBucket48Array = ^PBucket48Array; TBucket32f = record Red, @@ -49,7 +47,6 @@ type end; PBucket32f = ^TBucket32f; TBucket32fArray = array of array of TBucket32f; -// PBucket32fArray = ^PBucket32fArray; TBucket32 = Record Red, @@ -74,8 +71,8 @@ const BITS_32 = 0; BITS_32f = 1; BITS_48 = 2; - BITS_64 = 3; - SizeOfBucket: array[0..3] of byte = (16, 16, 24, 32); + //BITS_64 = 3; + SizeOfBucket: array[0..2] of byte = (16, 16, 24); //, 32); type TBucketStats = record