ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/oup/current/Global/OniImgClass.pas

Comparing:
oup/rewrite/Global/OniImgClass.pas (file contents), Revision 97 by alloc, Mon Jan 22 23:05:45 2007 UTC vs.
oup/current/Global/OniImgClass.pas (file contents), Revision 127 by alloc, Fri Mar 23 17:14:40 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	<	function GetAsData: TByteData;
41	<	function GetAs32bit: TByteData;
42	<	procedure GetAsBMP(var Target: TByteData); overload;
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;
45	>	procedure GetAs32bit(var Target: TByteData); overload;
46		procedure GetAsBMP(var Target: TStream); overload;
47	+	procedure GetAsBMP(var Target: TByteData); overload;
48		function LoadFromBMP(filename: String): Boolean;
49		function WriteToBMP(filename: String): Boolean;
50	<	function GetMipMappedImage(var faded: TByteData): Boolean;
50	>	function GetMipMappedImage(var Target: TStream): Boolean; overload;
51	>	function GetMipMappedImage(var Target: TByteData): Boolean; overload;
52		published
53		end;
54
#	Line 128 | Line 132 | end;
132
133
134
135	<	procedure TOniImage.DecodeImage;
135	>	procedure TOniImage.DecodeImageTo32bit;
136		var
137		x, y:  Integer;
138		tempd: TByteData;
#	Line 137 | 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 156 | 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 175 | 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 306 | Line 312 | end;
312		function TOniImage.Load(ConnectionID, FileID: Integer): Boolean;
313		var
314		FileInfo: TFileInfo;
309	–	ext:      String;
315		begin
316		FileInfo := ConManager.Connection[ConnectionID].GetFileInfo(fileid);
317		if FileInfo.Extension = 'PSpc' then
#	Line 366 | 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	<	txmpdata := txmpimg.GetAs32bit;
376	>	txmpimg.GetAs32bit(txmpdata);
377		{    ShowMessage(IntToStr(txmpimg.Width)+'x'+IntToStr(txmpimg.Height));
378		for i:=0 to High(txmpdata) do
379		txmpimg.Data[i]:=txmpdata[i];
#	Line 531 | 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 584 | 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 599 | 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	>	if FStoreType = 9 then
621	>	begin
622	>	repeat
623	>	x    := x div 2;
624	>	y    := y div 2;
625	>	size := size + (x * y * 16) div 8;
626	>	until (x = 1) or (y = 1);
627	>	end;
628		end;
629		Result := size;
630		end;
#	Line 614 | Line 632 | end;
632
633
634
635	<	function TOniImage.GetAsData: TByteData;
635	>	procedure TOniImage.GetAsData(var Target: TStream);
636		var
619	–	i:      Integer;
637		revert: Boolean;
638		begin
639		//    if not (DT_Decoded32 in Self.FDataType) then
#	Line 628 | Line 645 | begin
645		end
646		else
647		revert := False;
648	<	SetLength(Result, Length(Self.FData));
649	<	for i := 0 to High(Result) do
650	<	Result[i] := Self.FData[i];
648	>	if not Assigned(Target) then
649	>	Target := TMemoryStream.Create;
650	>	Target.Write(FData[0], Length(FData));
651	>	Target.Seek(0, soFromBeginning);
652		if revert then
653		Self.RevertImage;
654		end;
655
656	<
639	<
640	<
641	<	function TOniImage.GetAs32bit: TByteData;
656	>	procedure TOniImage.GetAsData(var Target: TByteData);
657		var
658	<	i: Integer;
658	>	mem: TStream;
659		begin
660	<	if not (DT_Decoded32 in Self.FDataType) then
661	<	Self.DecodeImage;
662	<	SetLength(Result, Length(Self.FData));
663	<	for i := 0 to High(Result) do
664	<	Result[i] := Self.FData[i];
660	>	mem := TMemoryStream.Create;
661	>	GetAsData(mem);
662	>	SetLength(Target, mem.Size);
663	>	mem.Read(Target[0], mem.Size);
664	>	mem.Free;
665		end;
666
667
668	+	procedure TOniImage.GetAs32bit(var Target: TStream);
669	+	begin
670	+	if not (DT_Decoded32 in Self.FDataType) then
671	+	Self.DecodeImageTo32bit;
672	+	if not Assigned(Target) then
673	+	Target := TMemoryStream.Create;
674	+	Target.Write(FData[0], Length(FData));
675	+	Target.Seek(0, soFromBeginning);
676	+	end;
677	+
678	+	procedure TOniImage.GetAs32bit(var Target: TByteData);
679	+	var
680	+	mem: TStream;
681	+	begin
682	+	mem := TMemoryStream.Create;
683	+	GetAs32bit(mem);
684	+	SetLength(Target, mem.Size);
685	+	mem.Read(Target[0], mem.Size);
686	+	mem.Free;
687	+	end;
688
689
690		procedure TOniImage.GetAsBMP(var Target: TByteData);
#	Line 662 | Line 697 | var
697		i, x, y: Integer;
698		begin
699		if not (DT_Decoded32 in Self.FDataType) then
700	<	Self.DecodeImage;
700	>	Self.DecodeImageTo32bit;
701
702		SetLength(Target, Self.FWidth * Self.FHeight * 3 + 54);
703		for y := 0 to Self.FHeight - 1 do
#	Line 699 | Line 734 | end;
734		procedure TOniImage.GetAsBMP(var Target: TStream);
735		var
736		data: TByteData;
737	+	streampos: Integer;
738		begin
739		GetAsBMP(data);
740	+	streampos := Target.Position;
741		Target.Write(data[0], Length(data));
742	+	Target.Seek(streampos, soFromBeginning);
743		end;
744
745
#	Line 782 | Line 820 | end;
820
821
822
823	<
786	<	function TOniImage.GetMipMappedImage(var faded: TByteData): Boolean;
823	>	function TOniImage.GetMipMappedImage(var Target: TByteData): Boolean;
824		var
825		i:      Integer;
826		x, y:   Word;
#	Line 806 | Line 843 | begin
843
844		x := Self.FWidth;
845		y := Self.FHeight;
846	<	SetLength(faded, x * y * Self.FDepth div 8);
846	>	SetLength(Target, x * y * Self.FDepth div 8);
847		SetLength(fadelvldata, x * y * Self.FDepth div 8);
848	<	for i := 0 to Length(faded) - 1 do
848	>	for i := 0 to Length(Target) - 1 do
849		begin
850	<	faded[i] := Self.FData[i];
850	>	Target[i] := Self.FData[i];
851		fadelvldata[i] := Self.FData[i];
852		end;
853		repeat
854		fadelvldata := Self.ResizeImage(x, y, fadelvldata);
855		x := x div 2;
856		y := y div 2;
857	<	SetLength(faded, Length(faded) + x * y * Self.FDepth div 8);
857	>	SetLength(Target, Length(Target) + x * y * Self.FDepth div 8);
858		for i := 0 to Length(fadelvldata) - 1 do
859	<	faded[Length(faded) - x * y * Self.FDepth div 8 + i] := fadelvldata[i];
859	>	Target[Length(Target) - x * y * Self.FDepth div 8 + i] := fadelvldata[i];
860		until (x = 1) or (y = 1) or ((x mod 2) = 1) or ((y mod 2) = 1);
861		if (x > 1) and (y > 1) then
862		Exit;
#	Line 830 | Line 867 | begin
867		end;
868
869
870	+	function TOniImage.GetMipMappedImage(var Target: TStream): Boolean;
871	+	var
872	+	data: TByteData;
873	+	streampos: Integer;
874	+	begin
875	+	Result := GetMipMappedImage(data);
876	+	if not Assigned(Target) then
877	+	Target := TMemoryStream.Create;
878	+	streampos := Target.Position;
879	+	Target.Write(data[0], Length(data));
880	+	Target.Seek(streampos, soFromBeginning);
881	+	end;
882	+
883	+
884		end.

Diff Legend

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