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 122 by alloc, Fri Mar 23 01:41:15 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 599 | 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 614 | Line 619 | end;
619
620
621
622	<	function TOniImage.GetAsData: TByteData;
622	>	procedure TOniImage.GetAsData(var Target: TStream);
623		var
619	–	i:      Integer;
624		revert: Boolean;
625		begin
626		//    if not (DT_Decoded32 in Self.FDataType) then
#	Line 628 | Line 632 | begin
632		end
633		else
634		revert := False;
635	<	SetLength(Result, Length(Self.FData));
636	<	for i := 0 to High(Result) do
637	<	Result[i] := Self.FData[i];
635	>	if not Assigned(Target) then
636	>	Target := TMemoryStream.Create;
637	>	Target.Write(FData[0], Length(FData));
638	>	Target.Seek(0, soFromBeginning);
639		if revert then
640		Self.RevertImage;
641		end;
642
643	<
639	<
640	<
641	<	function TOniImage.GetAs32bit: TByteData;
643	>	procedure TOniImage.GetAsData(var Target: TByteData);
644		var
645	<	i: Integer;
645	>	mem: TStream;
646		begin
647	<	if not (DT_Decoded32 in Self.FDataType) then
648	<	Self.DecodeImage;
649	<	SetLength(Result, Length(Self.FData));
650	<	for i := 0 to High(Result) do
651	<	Result[i] := Self.FData[i];
647	>	mem := TMemoryStream.Create;
648	>	GetAsData(mem);
649	>	SetLength(Target, mem.Size);
650	>	mem.Read(Target[0], mem.Size);
651	>	mem.Free;
652		end;
653
654
655	+	procedure TOniImage.GetAs32bit(var Target: TStream);
656	+	begin
657	+	if not (DT_Decoded32 in Self.FDataType) then
658	+	Self.DecodeImageTo32bit;
659	+	if not Assigned(Target) then
660	+	Target := TMemoryStream.Create;
661	+	Target.Write(FData[0], Length(FData));
662	+	Target.Seek(0, soFromBeginning);
663	+	end;
664	+
665	+	procedure TOniImage.GetAs32bit(var Target: TByteData);
666	+	var
667	+	mem: TStream;
668	+	begin
669	+	mem := TMemoryStream.Create;
670	+	GetAs32bit(mem);
671	+	SetLength(Target, mem.Size);
672	+	mem.Read(Target[0], mem.Size);
673	+	mem.Free;
674	+	end;
675
676
677		procedure TOniImage.GetAsBMP(var Target: TByteData);
#	Line 662 | 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
#	Line 699 | Line 721 | end;
721		procedure TOniImage.GetAsBMP(var Target: TStream);
722		var
723		data: TByteData;
724	+	streampos: Integer;
725		begin
726		GetAsBMP(data);
727	+	streampos := Target.Position;
728		Target.Write(data[0], Length(data));
729	+	Target.Seek(streampos, soFromBeginning);
730		end;
731
732
#	Line 782 | Line 807 | end;
807
808
809
810	<
786	<	function TOniImage.GetMipMappedImage(var faded: TByteData): Boolean;
810	>	function TOniImage.GetMipMappedImage(var Target: TByteData): Boolean;
811		var
812		i:      Integer;
813		x, y:   Word;
#	Line 806 | Line 830 | begin
830
831		x := Self.FWidth;
832		y := Self.FHeight;
833	<	SetLength(faded, x * y * Self.FDepth div 8);
833	>	SetLength(Target, x * y * Self.FDepth div 8);
834		SetLength(fadelvldata, x * y * Self.FDepth div 8);
835	<	for i := 0 to Length(faded) - 1 do
835	>	for i := 0 to Length(Target) - 1 do
836		begin
837	<	faded[i] := Self.FData[i];
837	>	Target[i] := Self.FData[i];
838		fadelvldata[i] := Self.FData[i];
839		end;
840		repeat
841		fadelvldata := Self.ResizeImage(x, y, fadelvldata);
842		x := x div 2;
843		y := y div 2;
844	<	SetLength(faded, Length(faded) + x * y * Self.FDepth div 8);
844	>	SetLength(Target, Length(Target) + x * y * Self.FDepth div 8);
845		for i := 0 to Length(fadelvldata) - 1 do
846	<	faded[Length(faded) - x * y * Self.FDepth div 8 + i] := fadelvldata[i];
846	>	Target[Length(Target) - x * y * Self.FDepth div 8 + i] := fadelvldata[i];
847		until (x = 1) or (y = 1) or ((x mod 2) = 1) or ((y mod 2) = 1);
848		if (x > 1) and (y > 1) then
849		Exit;
#	Line 830 | Line 854 | begin
854		end;
855
856
857	+	function TOniImage.GetMipMappedImage(var Target: TStream): Boolean;
858	+	var
859	+	data: TByteData;
860	+	streampos: Integer;
861	+	begin
862	+	Result := GetMipMappedImage(data);
863	+	if not Assigned(Target) then
864	+	Target := TMemoryStream.Create;
865	+	streampos := Target.Position;
866	+	Target.Write(data[0], Length(data));
867	+	Target.Seek(streampos, soFromBeginning);
868	+	end;
869	+
870	+
871		end.

Diff Legend

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