ソースを参照

* fixed some compiler hints in delphi 7

* version incremented to 3.0.1
master
Bergmann89 12年前
コミット
440a368662
1個のファイルの変更5行の追加6行の削除
  1. +5
    -6
      glBitmap.pas

+ 5
- 6
glBitmap.pas ファイルの表示

@@ -11,7 +11,7 @@ not use this file except in compliance with the License. You may
obtain a copy of the License at obtain a copy of the License at
http://www.mozilla.org/MPL/MPL-1.1.html http://www.mozilla.org/MPL/MPL-1.1.html
------------------------------------------------------------ ------------------------------------------------------------
Version 3.0.0 unstable
Version 3.0.1
------------------------------------------------------------ ------------------------------------------------------------
History History
20-11-2013 20-11-2013
@@ -5002,7 +5002,7 @@ var
bfFormat: TbmpBitfieldFormat; bfFormat: TbmpBitfieldFormat;
pSourceLine, pDestLine: PByte; pSourceLine, pDestLine: PByte;
pSourceMD, pDestMD: Pointer; pSourceMD, pDestMD: Pointer;
x, y: Integer;
x, y: Cardinal;
pixel: TglBitmapPixelData; pixel: TglBitmapPixelData;
begin begin
bfFormat := TbmpBitfieldFormat.Create; bfFormat := TbmpBitfieldFormat.Create;
@@ -5386,7 +5386,6 @@ var
TempPtr: PByte; TempPtr: PByte;
Size: Integer; Size: Integer;
begin begin
result := nil;
Temp := (ClassType.Create as TglBitmap); Temp := (ClassType.Create as TglBitmap);
try try
// copy texture data if assigned // copy texture data if assigned
@@ -8052,8 +8051,8 @@ end;
procedure TglBitmap2D.GetDataFromTexture; procedure TglBitmap2D.GetDataFromTexture;
var var
Temp: PByte; Temp: PByte;
TempWidth, TempHeight: Integer;
TempIntFormat: GLint;
TempWidth, TempHeight: GLint;
TempIntFormat: GLenum;
IntFormat, f: TglBitmapFormat; IntFormat, f: TglBitmapFormat;
FormatDesc: TFormatDescriptor; FormatDesc: TFormatDescriptor;
begin begin
@@ -8062,7 +8061,7 @@ begin
// Request Data // Request Data
glGetTexLevelParameteriv(Target, 0, GL_TEXTURE_WIDTH, @TempWidth); glGetTexLevelParameteriv(Target, 0, GL_TEXTURE_WIDTH, @TempWidth);
glGetTexLevelParameteriv(Target, 0, GL_TEXTURE_HEIGHT, @TempHeight); glGetTexLevelParameteriv(Target, 0, GL_TEXTURE_HEIGHT, @TempHeight);
glGetTexLevelParameteriv(Target, 0, GL_TEXTURE_INTERNAL_FORMAT, @TempIntFormat);
glGetTexLevelParameteriv(Target, 0, GL_TEXTURE_INTERNAL_FORMAT, PGLint(@TempIntFormat));


IntFormat := tfEmpty; IntFormat := tfEmpty;
for f := Low(TglBitmapFormat) to High(TglBitmapFormat) do begin for f := Low(TglBitmapFormat) to High(TglBitmapFormat) do begin


読み込み中…
キャンセル
保存