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

Comparing:
oup/rewrite/Global/OniImgClass.pas (file contents), Revision 105 by alloc, Wed Feb 21 00:29:27 2007 UTC vs.
oup/current/Global/OniImgClass.pas (file contents), Revision 118 by alloc, Fri Mar 23 00:58:09 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 140 | Line 141 | begin
141    begin
142      SetLength(tempd, Self.FWidth * Self.FHeight * 4);
143      case Self.FStoreType of
144 <      0:
144 >      0: // 16bit, RGB444, A4?
145        begin
146          for y := 0 to Self.FHeight - 1 do
147          begin
# Line 159 | Line 160 | begin
160            end;
161          end;
162        end;
163 <      1, 2:
163 >      1, 2: // 16bit, RGB555, A1?
164        begin
165          for y := 0 to Self.FHeight - 1 do
166          begin
# Line 178 | Line 179 | begin
179            end;
180          end;
181        end;
182 <      9:
182 >      8: // 32bit, RGB888, A8?
183 >      begin end;
184 >      9: // Compressed, RGB565
185        begin
186          DecompressImage;
187        end;
# Line 309 | Line 312 | end;
312   function TOniImage.Load(ConnectionID, FileID: Integer): Boolean;
313   var
314    FileInfo: TFileInfo;
312 –  ext:      String;
315   begin
316    FileInfo := ConManager.Connection[ConnectionID].GetFileInfo(fileid);
317    if FileInfo.Extension = 'PSpc' then
# Line 369 | 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 534 | 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 602 | Line 604 | begin
604  
605    x    := Self.FWidth;
606    y    := Self.FHeight;
607 <  size := x * y * bpp div 8;
607 >  size := (x * y * bpp) div 8;
608    if fading then
609    begin
610      repeat
611        x    := x div 2;
612        y    := y div 2;
613 <      size := size + x * y * bpp div 8;
613 >      size := (size + x * y * bpp) div 8;
614      until (x = 1) or (y = 1);
615    end;
616    Result := size;
# Line 619 | Line 621 | end;
621  
622   procedure TOniImage.GetAsData(var Target: TStream);
623   var
622 –  i:      Integer;
624    revert: Boolean;
625   begin
626    //    if not (DT_Decoded32 in Self.FDataType) then
# Line 654 | Line 655 | end;
655   procedure TOniImage.GetAs32bit(var Target: TStream);
656   begin
657    if not (DT_Decoded32 in Self.FDataType) then
658 <    Self.DecodeImage;
658 >    Self.DecodeImageTo32bit;
659    if not Assigned(Target) then
660      Target := TMemoryStream.Create;
661    Target.Write(FData[0], Length(FData));
# Line 683 | Line 684 | var
684    i, x, y: Integer;
685   begin
686    if not (DT_Decoded32 in Self.FDataType) then
687 <    Self.DecodeImage;
687 >    Self.DecodeImageTo32bit;
688  
689    SetLength(Target, Self.FWidth * Self.FHeight * 3 + 54);
690    for y := 0 to Self.FHeight - 1 do

Diff Legend

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