Changeset 105 for oup/rewrite/Global

Timestamp:

Feb 21, 2007, 1:29:27 AM (18 years ago)

Author:

alloc

Message:

 

Location:

oup/rewrite/Global

Files:

• Functions.pas (modified) (10 diffs)
• OniImgClass.pas (modified) (8 diffs)
• RawList.pas (modified) (1 diff)

oup/rewrite/Global/Functions.pas

@@ -11 +11 @@
 function Decode_Float(buffer: TByteData): Single;
 function Encode_Float(input: Single): TByteData;
+function IntToBin(Value: Byte): String;
 function DataToBin(Data: TByteData): String;
 function BinToInt(bin: String): Byte;
@@ -39 +40 @@
 
 
-
 function BoolToStr(bool: Boolean): String;
 begin
@@ -49 +49 @@
 
 
-
-
 function HexToLong(hex: String): LongWord;
 
@@ -76 +74 @@
 begin
   if NormalizeHexString(hex) then
-  begin
-    Result := StrToInt(hex);
-{
-    hex    := UpperCase(hex);
+    Result := StrToInt(hex)
+  else
     Result := 0;
-    for i := 1 to Length(hex) do
-    begin
-      Result := Result shl 4;
-      case hex[i] of
-        '0'..'9':
-          Result := Result + Ord(hex[i]) - 48;
-        'A'..'F':
-          Result := Result + Ord(hex[i]) - 55;
-        else
-          Result := 0;
-          Exit;
-      end;
-    end;
-}
-  end
-  else
-  begin
-    Result := 0;
-  end;
-end;
-
-
+end;
 
 
@@ -109 +84 @@
   Result := buffer[0] + buffer[1] * 256 + buffer[2] * 256 * 256 + buffer[3] * 256 * 256 * 256;
 end;
-
-
 
 
@@ -126 +99 @@
 
 
-
-
 function Decode_Float(buffer: TByteData): Single;
 var
@@ -139 +110 @@
 
 
-
-
 function Encode_Float(input: Single): TByteData;
 var
@@ -150 +119 @@
 
 
+function IntToBin(Value: Byte): String;
+var
+  i: Byte;
+begin
+  Result := '';
+  for i := 7 downto 0 do
+    Result := Result + IntToStr((Value shr i) and $01);
+end;
 
 
@@ -171 +148 @@
   end;
 end;
-
-
 
 
@@ -193 +168 @@
   end;
 end;
-
 
 

oup/rewrite/Global/OniImgClass.pas

@@ -39 +39 @@
     function GetImageDataSize(fading: Boolean): Integer;
 
-    function GetAsData: TByteData;
-    function GetAs32bit: TByteData;
+    procedure GetAsData(var Target: TStream); overload;
+    procedure GetAsData(var Target: TByteData); overload;
+    procedure GetAs32bit(var Target: TStream); overload;
+    procedure GetAs32bit(var Target: TByteData); overload;
+    procedure GetAsBMP(var Target: TStream); overload;
     procedure GetAsBMP(var Target: TByteData); overload;
-    procedure GetAsBMP(var Target: TStream); overload;
     function LoadFromBMP(filename: String): Boolean;
     function WriteToBMP(filename: String): Boolean;
-    function GetMipMappedImage(var faded: TByteData): Boolean;
+    function GetMipMappedImage(var Target: TStream): Boolean; overload;
+    function GetMipMappedImage(var Target: TByteData): Boolean; overload;
   published
   end;
@@ -369 +372 @@
   txmpimg.DecodeImage;
 //  txmpimg.WriteToBMP('C:\file.bmp');
-  txmpdata := txmpimg.GetAs32bit;
+  txmpimg.GetAs32bit(txmpdata);
 {    ShowMessage(IntToStr(txmpimg.Width)+'x'+IntToStr(txmpimg.Height));
     for i:=0 to High(txmpdata) do
@@ -615 +618 @@
 
 
-function TOniImage.GetAsData: TByteData;
+procedure TOniImage.GetAsData(var Target: TStream);
 var
   i:      Integer;
@@ -629 +632 @@
   else
     revert := False;
-  SetLength(Result, Length(Self.FData));
-  for i := 0 to High(Result) do
-    Result[i] := Self.FData[i];
+  if not Assigned(Target) then
+    Target := TMemoryStream.Create;
+  Target.Write(FData[0], Length(FData));
+  Target.Seek(0, soFromBeginning);
   if revert then
     Self.RevertImage;
 end;
 
-
-
-
-function TOniImage.GetAs32bit: TByteData;
-var
-  i: Integer;
+procedure TOniImage.GetAsData(var Target: TByteData);
+var
+  mem: TStream;
+begin
+  mem := TMemoryStream.Create;
+  GetAsData(mem);
+  SetLength(Target, mem.Size);
+  mem.Read(Target[0], mem.Size);
+  mem.Free;
+end;
+
+
+procedure TOniImage.GetAs32bit(var Target: TStream);
 begin
   if not (DT_Decoded32 in Self.FDataType) then
     Self.DecodeImage;
-  SetLength(Result, Length(Self.FData));
-  for i := 0 to High(Result) do
-    Result[i] := Self.FData[i];
-end;
-
-
+  if not Assigned(Target) then
+    Target := TMemoryStream.Create;
+  Target.Write(FData[0], Length(FData));
+  Target.Seek(0, soFromBeginning);
+end;
+
+procedure TOniImage.GetAs32bit(var Target: TByteData);
+var
+  mem: TStream;
+begin
+  mem := TMemoryStream.Create;
+  GetAs32bit(mem);
+  SetLength(Target, mem.Size);
+  mem.Read(Target[0], mem.Size);
+  mem.Free;
+end;
 
 
@@ -786 +807 @@
 
 
-
-function TOniImage.GetMipMappedImage(var faded: TByteData): Boolean;
+function TOniImage.GetMipMappedImage(var Target: TByteData): Boolean;
 var
   i:      Integer;
@@ -810 +830 @@
   x := Self.FWidth;
   y := Self.FHeight;
-  SetLength(faded, x * y * Self.FDepth div 8);
+  SetLength(Target, x * y * Self.FDepth div 8);
   SetLength(fadelvldata, x * y * Self.FDepth div 8);
-  for i := 0 to Length(faded) - 1 do
-  begin
-    faded[i] := Self.FData[i];
+  for i := 0 to Length(Target) - 1 do
+  begin
+    Target[i] := Self.FData[i];
     fadelvldata[i] := Self.FData[i];
   end;
@@ -821 +841 @@
     x := x div 2;
     y := y div 2;
-    SetLength(faded, Length(faded) + x * y * Self.FDepth div 8);
+    SetLength(Target, Length(Target) + x * y * Self.FDepth div 8);
     for i := 0 to Length(fadelvldata) - 1 do
-      faded[Length(faded) - x * y * Self.FDepth div 8 + i] := fadelvldata[i];
+      Target[Length(Target) - x * y * Self.FDepth div 8 + i] := fadelvldata[i];
   until (x = 1) or (y = 1) or ((x mod 2) = 1) or ((y mod 2) = 1);
   if (x > 1) and (y > 1) then
@@ -834 +854 @@
 
 
+function TOniImage.GetMipMappedImage(var Target: TStream): Boolean;
+var
+  data: TByteData;
+  streampos: Integer;
+begin
+  Result := GetMipMappedImage(data);
+  if not Assigned(Target) then
+    Target := TMemoryStream.Create;
+  streampos := Target.Position;
+  Target.Write(data[0], Length(data));
+  Target.Seek(streampos, soFromBeginning);
+end;
+
+
 end.

oup/rewrite/Global/RawList.pas

@@ -18 +18 @@
       FRawListHandlers: TRawListHandlers;
     public
+      property RawListHandlers: TRawListHandlers read FRawListHandlers;
       procedure InsertRawListHandler(ext: String; needed: Boolean; handler: THandler);
       function GetRawList(ConnectionID, FileID: Integer): TRawDataList;