ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/oup/current/Global/OniImgClass.pas
(Generate patch)

Comparing oup/current/Global/OniImgClass.pas (file contents):
Revision 113 by alloc, Sun Feb 25 17:20:22 2007 UTC vs.
Revision 124 by alloc, Fri Mar 23 03:07:58 2007 UTC

# Line 19 | Line 19 | type
19  
20      function ResizeImage(oldx, oldy: Integer; img: TByteData): TByteData;
21      procedure RevertImage;
22 –    procedure DecodeImage;
22      procedure DecompressImage;
23    protected
24    public
# Line 38 | Line 37 | type
37      function LoadFromTXMB(ConnectionID, FileID: Integer): Boolean;
38      function GetImageDataSize(fading: Boolean): Integer;
39  
40 +    procedure DecodeImageTo32bit;
41 +
42      procedure GetAsData(var Target: TStream); overload;
43      procedure GetAsData(var Target: TByteData); overload;
44      procedure GetAs32bit(var Target: TStream); overload;
# Line 131 | Line 132 | end;
132  
133  
134  
135 < procedure TOniImage.DecodeImage;
135 > procedure TOniImage.DecodeImageTo32bit;
136   var
137    x, y:  Integer;
138    tempd: TByteData;
# Line 370 | Line 371 | begin
371    end;
372    txmpimg := TOniImage.Create;
373    txmpimg.LoadFromTXMP(ConnectionID, PSpc.TXMP);
374 <  txmpimg.DecodeImage;
374 >  txmpimg.DecodeImageTo32bit;
375   //  txmpimg.WriteToBMP('C:\file.bmp');
376    txmpimg.GetAs32bit(txmpdata);
377   {    ShowMessage(IntToStr(txmpimg.Width)+'x'+IntToStr(txmpimg.Height));
# Line 535 | Line 536 | begin
536      link := link div 256;
537      images_decoded[i] := TOniImage.Create;
538      images_decoded[i].LoadFromTXMP(ConnectionID, link);
539 <    images_decoded[i].DecodeImage;
539 >    images_decoded[i].DecodeImageTo32bit;
540      images_decoded[i].RevertImage;
541    end;
542    SetLength(Self.FData, Self.FWidth * Self.FHeight * 4);
# Line 588 | Line 589 | var
589    size: Integer;
590    x, y: Word;
591    bpp:  Byte;
592 +  minside: Byte;
593   begin
594 +  minside := 1;
595    case Self.FStoreType of
596      9:
597 <      bpp := 8;
597 >    begin
598 >      bpp := 4;
599 >      minside := 4;
600 >    end;
601      0, 1, 2:
602        bpp := 16;
603      8:
# Line 603 | Line 609 | begin
609  
610    x    := Self.FWidth;
611    y    := Self.FHeight;
612 <  size := x * y * bpp div 8;
612 >  size := (x * y * bpp) div 8;
613    if fading then
614    begin
615      repeat
616        x    := x div 2;
617        y    := y div 2;
618 <      size := size + x * y * bpp div 8;
619 <    until (x = 1) or (y = 1);
618 >      size := size + (x * y * bpp) div 8;
619 >    until (x = minside) or (y = minside);
620    end;
621    Result := size;
622   end;
# Line 654 | Line 660 | end;
660   procedure TOniImage.GetAs32bit(var Target: TStream);
661   begin
662    if not (DT_Decoded32 in Self.FDataType) then
663 <    Self.DecodeImage;
663 >    Self.DecodeImageTo32bit;
664    if not Assigned(Target) then
665      Target := TMemoryStream.Create;
666    Target.Write(FData[0], Length(FData));
# Line 683 | Line 689 | var
689    i, x, y: Integer;
690   begin
691    if not (DT_Decoded32 in Self.FDataType) then
692 <    Self.DecodeImage;
692 >    Self.DecodeImageTo32bit;
693  
694    SetLength(Target, Self.FWidth * Self.FHeight * 3 + 54);
695    for y := 0 to Self.FHeight - 1 do

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)