{***********************************************************
glBitmap by Steffen Xonna aka Lossy eX (2003-2008)
http://www.opengl24.de/index.php?cat=header&file=glbitmap
+
+modified by Delphi OpenGL Community (http://delphigl.com/)
+
+
------------------------------------------------------------
The contents of this file are used with permission, subject to
the Mozilla Public License Version 1.1 (the "License"); you may
***********************************************************}
unit glBitmap;
-{.$MESSAGE warn 'Hey. I''m the glBitmap.pas and i need to be configured. My master tell me your preferences! ;)'}
// Please uncomment the defines below to configure the glBitmap to your preferences.
// If you have configured the unit you can uncomment the warning above.
+{$MESSAGE warn 'Hey. I''m the glBitmap.pas and i need to be configured. My master tell me your preferences! ;)'}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Preferences ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// use dglOpenGL.pas if not enabled
{.$DEFINE GLB_NATIVE_OGL_DYNAMIC}
+
// activate to enable the support for SDL_surfaces
-{$DEFINE GLB_SDL}
+{.$DEFINE GLB_SDL}
// activate to enable the support for TBitmap from Delphi (not lazarus)
{.$DEFINE GLB_DELPHI}
+// activate to enable the support for TLazIntfImage from Lazarus
+{$DEFINE GLB_LAZARUS}
+
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// activate to enable the support of SDL_image to load files. (READ ONLY)
// If you enable SDL_image all other libraries will be ignored!
-{$DEFINE GLB_SDL_IMAGE}
+{.$DEFINE GLB_SDL_IMAGE}
+
+
-// activate to enable png support with the unit pngimage. You can download it from http://pngdelphi.sourceforge.net/
+// activate to enable png support with the unit pngimage -> http://pngdelphi.sourceforge.net/
// if you enable pngimage the libPNG will be ignored
{.$DEFINE GLB_PNGIMAGE}
-// activate to use the libPNG http://www.libpng.org/
-// You will need an aditional header.
-// http://www.opengl24.de/index.php?cat=header&file=libpng
+// activate to use the libPNG -> http://www.libpng.org/
+// You will need an aditional header -> http://www.opengl24.de/index.php?cat=header&file=libpng
{.$DEFINE GLB_LIB_PNG}
+
+
// if you enable delphi jpegs the libJPEG will be ignored
{.$DEFINE GLB_DELPHI_JPEG}
-// activateto use the libJPEG http://www.ijg.org/
-// You will need an aditional header.
-// http://www.opengl24.de/index.php?cat=header&file=libjpeg
+// activate to use the libJPEG -> http://www.ijg.org/
+// You will need an aditional header -> http://www.opengl24.de/index.php?cat=header&file=libjpeg
{.$DEFINE GLB_LIB_JPEG}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// PRIVATE: DO not change anything! //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// PRIVATE: do not change anything! //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Delphi Versions
{$IFDEF fpc}
{$DEFINE GLB_WIN}
{$ELSEIF DEFINED(LINUX)}
{$DEFINE GLB_LINUX}
-{$IFEND}
+{$ENDIF}
// native OpenGL Support
{$IF DEFINED(GLB_NATIVE_OGL_STATIC) OR DEFINED(GLB_NATIVE_OGL_DYNAMIC)}
{$DEFINE GLB_NATIVE_OGL}
-{$IFEND}
+{$ENDIF}
// checking define combinations
//SDL Image
interface
uses
- {$IFNDEF GLB_NATIVE_OGL} dglOpenGL, {$ENDIF}
+ {$IFNDEF GLB_NATIVE_OGL} dglOpenGL, {$ENDIF}
{$IF DEFINED(GLB_WIN) AND
- DEFINED(GLB_NATIVE_OGL)} windows, {$IFEND}
+ DEFINED(GLB_NATIVE_OGL)} windows, {$ENDIF}
- {$IFDEF GLB_SDL} SDL, {$ENDIF}
- {$IFDEF GLB_DELPHI} Dialogs, Graphics, {$ENDIF}
+ {$IFDEF GLB_SDL} SDL, {$ENDIF}
+ {$IFDEF GLB_LAZARUS} IntfGraphics, GraphType, {$ENDIF}
+ {$IFDEF GLB_DELPHI} Dialogs, Graphics, {$ENDIF}
- {$IFDEF GLB_SDL_IMAGE} SDL_image, {$ENDIF}
+ {$IFDEF GLB_SDL_IMAGE} SDL_image, {$ENDIF}
- {$IFDEF GLB_PNGIMAGE} pngimage, {$ENDIF}
- {$IFDEF GLB_LIB_PNG} libPNG, {$ENDIF}
+ {$IFDEF GLB_PNGIMAGE} pngimage, {$ENDIF}
+ {$IFDEF GLB_LIB_PNG} libPNG, {$ENDIF}
- {$IFDEF GLB_DELPHI_JPEG} JPEG, {$ENDIF}
- {$IFDEF GLB_LIB_JPEG} libJPEG, {$ENDIF}
+ {$IFDEF GLB_DELPHI_JPEG} JPEG, {$ENDIF}
+ {$IFDEF GLB_LIB_JPEG} libJPEG, {$ENDIF}
Classes, SysUtils;
{$IFDEF GLB_LINUX}
TglXGetProcAddress = function(ProcName: PAnsiChar): Pointer; cdecl;
+ TglXGetProcAddressARB = function(const name: PAnsiChar): pointer; cdecl;
{$ELSE}
- TwglGetProcAddress = function (ProcName: PAnsiChar): Pointer; stdcall;
+ TwglGetProcAddress = function(ProcName: PAnsiChar): Pointer; stdcall;
{$ENDIF}
{$ELSEIF DEFINED(GLB_NATIVE_OGL_STATIC)}
type
////////////////////////////////////////////////////////////////////////////////////////////////////
- EglBitmapException = class(Exception);
- EglBitmapSizeToLargeException = class(EglBitmapException);
- EglBitmapNonPowerOfTwoException = class(EglBitmapException);
- EglBitmapUnsupportedFormat = class(EglBitmapException);
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
TglBitmapFormat = (
tfEmpty = 0, //must be smallest value!
nm3x3,
nm5x5);
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+ EglBitmapException = class(Exception);
+ EglBitmapSizeToLargeException = class(EglBitmapException);
+ EglBitmapNonPowerOfTwoException = class(EglBitmapException);
+ EglBitmapUnsupportedFormat = class(EglBitmapException)
+ constructor Create(const aFormat: TglBitmapFormat); overload;
+ constructor Create(const aMsg: String; const aFormat: TglBitmapFormat); overload;
+ end;
+
////////////////////////////////////////////////////////////////////////////////////////////////////
TglBitmapColorRec = packed record
case Integer of
procedure AfterConstruction; override;
procedure BeforeDestruction; override;
+ procedure PrepareResType(var aResource: String; var aResType: PChar);
+
//Load
procedure LoadFromFile(const aFilename: String);
procedure LoadFromStream(const aStream: TStream); virtual;
procedure LoadFromFunc(const aSize: TglBitmapPixelPosition; const aFunc: TglBitmapFunction;
const aFormat: TglBitmapFormat; const aArgs: Pointer = nil);
- {$IFDEF GLB_DELPHI}
- procedure LoadFromResource(const aInstance: Cardinal; const aResource: String; const aResType: PChar = nil);
- procedure LoadFromResourceID(const sInstance: Cardinal; const aResourceID: Integer; const aResType: PChar);
- {$ENDIF}
+ procedure LoadFromResource(const aInstance: Cardinal; aResource: String; aResType: PChar = nil);
+ procedure LoadFromResourceID(const aInstance: Cardinal; const aResourceID: Integer; const aResType: PChar);
//Save
procedure SaveToFile(const aFileName: String; const aFileType: TglBitmapFileType);
function AssignAlphaToBitmap(const aBitmap: TBitmap): Boolean;
function AddAlphaFromBitmap(const aBitmap: TBitmap; const aFunc: TglBitmapFunction = nil;
const aArgs: Pointer = nil): Boolean;
- function AddAlphaFromResource(const aInstance: Cardinal; const aResource: String; const aResType: PChar = nil;
+ {$ENDIF}
+
+ {$IFDEF GLB_LAZARUS}
+ function AssignToLazIntfImage(const aImage: TLazIntfImage): Boolean;
+ function AssignFromLazIntfImage(const aImage: TLazIntfImage): Boolean;
+ function AssignAlphaToLazIntfImage(const aImage: TLazIntfImage): Boolean;
+ function AddAlphaFromLazIntfImage(const aImage: TLazIntfImage; const aFunc: TglBitmapFunction = nil;
+ const aArgs: Pointer = nil): Boolean;
+ {$ENDIF}
+
+ function AddAlphaFromResource(const aInstance: Cardinal; aResource: String; aResType: PChar = nil;
const aFunc: TglBitmapFunction = nil; const aArgs: Pointer = nil): Boolean;
function AddAlphaFromResourceID(const aInstance: Cardinal; const aResourceID: Integer; const aResType: PChar;
const aFunc: TglBitmapFunction = nil; const aArgs: Pointer = nil): Boolean;
- {$ENDIF}
function AddAlphaFromFunc(const aFunc: TglBitmapFunction; const aArgs: Pointer = nil): Boolean; virtual;
function AddAlphaFromFile(const aFileName: String; const aFunc: TglBitmapFunction = nil; const aArgs: Pointer = nil): Boolean;
constructor Create(const aStream: TStream); overload;
constructor Create(const aSize: TglBitmapPixelPosition; const aFormat: TglBitmapFormat); overload;
constructor Create(const aSize: TglBitmapPixelPosition; const aFormat: TglBitmapFormat; const aFunc: TglBitmapFunction; const aArgs: Pointer = nil); overload;
- {$IFDEF GLB_DELPHI}
constructor Create(const aInstance: Cardinal; const aResource: String; const aResType: PChar = nil); overload;
constructor Create(const aInstance: Cardinal; const aResourceID: Integer; const aResType: PChar); overload;
- {$ENDIF}
private
{$IFDEF GLB_SUPPORT_PNG_READ} function LoadPNG(const aStream: TStream): Boolean; virtual; {$ENDIF}
{$ifdef GLB_SUPPORT_PNG_WRITE} procedure SavePNG(const aStream: TStream); virtual; {$ENDIF}
// Bildeinstellungen
fLines: array of PByte;
- (* TODO
- procedure GetDXTColorBlock(pData: pByte; relX, relY: Integer; var Pixel: TglBitmapPixelData);
- procedure GetPixel2DDXT1(const Pos: TglBitmapPixelPosition; var Pixel: TglBitmapPixelData);
- procedure GetPixel2DDXT3(const Pos: TglBitmapPixelPosition; var Pixel: TglBitmapPixelData);
- procedure GetPixel2DDXT5(const Pos: TglBitmapPixelPosition; var Pixel: TglBitmapPixelData);
- procedure GetPixel2DUnmap(const Pos: TglBitmapPixelPosition; var Pixel: TglBitmapPixelData);
- procedure SetPixel2DUnmap(const Pos: TglBitmapPixelPosition; const Pixel: TglBitmapPixelData);
- *)
-
function GetScanline(const aIndex: Integer): Pointer;
procedure SetDataPointer(const aData: PByte; const aFormat: TglBitmapFormat;
const aWidth: Integer = - 1; const aHeight: Integer = - 1); override;
implementation
-
- (* TODO
- function FormatIsCompressed(Format: TglBitmapInternalFormat): boolean;
- function FormatIsUncompressed(Format: TglBitmapInternalFormat): boolean;
- function LoadTexture(Filename: String; var Texture: Cardinal{$IFDEF GLB_DELPHI}; LoadFromRes : Boolean; Instance: Cardinal = 0{$ENDIF}): Boolean;
- function LoadCubeMap(PositiveX, NegativeX, PositiveY, NegativeY, PositiveZ, NegativeZ: String; var Texture: Cardinal{$IFDEF GLB_DELPHI}; LoadFromRes : Boolean; Instance: Cardinal = 0{$ENDIF}): Boolean;
- function LoadNormalMap(Size: Integer; var Texture: Cardinal): Boolean;
- *)
-
uses
- Math, syncobjs;
+ Math, syncobjs, typinfo;
type
////////////////////////////////////////////////////////////////////////////////////////////////////
FormatDescriptorCS: TCriticalSection;
FormatDescriptors: array[TglBitmapFormat] of TFormatDescriptor;
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+constructor EglBitmapUnsupportedFormat.Create(const aFormat: TglBitmapFormat);
+begin
+ inherited Create('unsupported format: ' + GetEnumName(TypeInfo(TglBitmapFormat), Integer(aFormat)));
+end;
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+constructor EglBitmapUnsupportedFormat.Create(const aMsg: String; const aFormat: TglBitmapFormat);
+begin
+ inherited Create(aMsg + GetEnumName(TypeInfo(TglBitmapFormat), Integer(aFormat)));
+end;
+
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function glBitmapPosition(X, Y: Integer): TglBitmapPixelPosition;
begin
tfS3tcDtx1RGBA, tfS3tcDtx3RGBA, tfS3tcDtx5RGBA]) then
result := result + [ftDDS];
- (* TODO
{$IFDEF GLB_SUPPORT_PNG_WRITE}
if aFormat in [
- tfAlpha4, tfAlpha8, tfAlpha12, tfAlpha16,
- tfLuminance4, tfLuminance8, tfLuminance12, tfLuminance16,
- tfuminance4Alpha4, tfLuminance6Alpha2, tfLuminance8Alpha8, tfLuminance12Alpha4, tfLuminance12Alpha12, tfLuminance16Alpha16,
- tfR3G3B2, tfRGB4, tfRGB5, tfRGB8, tfRGB10, tfRGB12, tfRGB16,
- tfRGBA2, tfRGBA4, tfRGB5A1, tfRGBA8, tfRGB10A2, tfRGBA12, tfRGBA16,
- tfDepth16, tfDepth24, tfDepth32]
- then
+ tfAlpha8, tfLuminance8, tfLuminance8Alpha8,
+ tfRGB8, tfRGBA8,
+ tfBGR8, tfBGRA8] then
result := result + [ftPNG];
{$ENDIF}
{$IFDEF GLB_SUPPORT_JPEG_WRITE}
- if Format in [
- tfAlpha4, tfAlpha8, tfAlpha12, tfAlpha16,
- tfLuminance4, tfLuminance8, tfLuminance12, tfLuminance16,
- tfR3G3B2, tfRGB4, tfRGB5, tfRGB8, tfRGB10, tfRGB12, tfRGB16,
- tfDepth16, tfDepth24, tfDepth32]
- then
+ if aFormat in [tfAlpha8, tfLuminance8, tfRGB8, tfBGR8] then
result := result + [ftJPEG];
{$ENDIF}
-
- if aFormat in [
- tfAlpha4, tfAlpha8, tfAlpha12, tfAlpha16,
- tfLuminance4, tfLuminance8, tfLuminance12, tfLuminance16,
- tfuminance4Alpha4, tfLuminance6Alpha2, tfLuminance8Alpha8, tfLuminance12Alpha4, tfLuminance12Alpha12, tfLuminance16Alpha16,
- tfR3G3B2, tfRGB4, tfRGB5, tfRGB8, tfRGB10, tfRGB12, tfRGB16,
- tfRGBA2, tfRGBA4, tfRGB5A1, tfRGBA8, tfRGB10A2, tfRGBA12, tfRGBA16,
- tfDepth16, tfDepth24, tfDepth32]
- then
- result := result + [ftDDS, ftTGA, ftBMP];
- *)
end;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
end;
{$ENDIF}
-(* TODO LoadFuncs
-function LoadTexture(Filename: String; var Texture: Cardinal{$IFDEF GLB_DELPHI}; LoadFromRes : Boolean; Instance: Cardinal{$ENDIF}): Boolean;
-var
- glBitmap: TglBitmap2D;
-begin
- result := false;
- Texture := 0;
-
- {$IFDEF GLB_DELPHI}
- if Instance = 0 then
- Instance := HInstance;
-
- if (LoadFromRes) then
- glBitmap := TglBitmap2D.CreateFromResourceName(Instance, FileName)
- else
- {$ENDIF}
- glBitmap := TglBitmap2D.Create(FileName);
-
- try
- glBitmap.DeleteTextureOnFree := false;
- glBitmap.FreeDataAfterGenTexture := false;
- glBitmap.GenTexture(true);
- if (glBitmap.ID > 0) then begin
- Texture := glBitmap.ID;
- result := true;
- end;
- finally
- glBitmap.Free;
- end;
-end;
-
-function LoadCubeMap(PositiveX, NegativeX, PositiveY, NegativeY, PositiveZ, NegativeZ: String; var Texture: Cardinal{$IFDEF GLB_DELPHI}; LoadFromRes : Boolean; Instance: Cardinal{$ENDIF}): Boolean;
-var
- CM: TglBitmapCubeMap;
-begin
- Texture := 0;
-
- {$IFDEF GLB_DELPHI}
- if Instance = 0 then
- Instance := HInstance;
- {$ENDIF}
-
- CM := TglBitmapCubeMap.Create;
- try
- CM.DeleteTextureOnFree := false;
-
- // Maps
- {$IFDEF GLB_DELPHI}
- if (LoadFromRes) then
- CM.LoadFromResource(Instance, PositiveX)
- else
- {$ENDIF}
- CM.LoadFromFile(PositiveX);
- CM.GenerateCubeMap(GL_TEXTURE_CUBE_MAP_POSITIVE_X);
-
- {$IFDEF GLB_DELPHI}
- if (LoadFromRes) then
- CM.LoadFromResource(Instance, NegativeX)
- else
- {$ENDIF}
- CM.LoadFromFile(NegativeX);
- CM.GenerateCubeMap(GL_TEXTURE_CUBE_MAP_NEGATIVE_X);
-
- {$IFDEF GLB_DELPHI}
- if (LoadFromRes) then
- CM.LoadFromResource(Instance, PositiveY)
- else
- {$ENDIF}
- CM.LoadFromFile(PositiveY);
- CM.GenerateCubeMap(GL_TEXTURE_CUBE_MAP_POSITIVE_Y);
-
- {$IFDEF GLB_DELPHI}
- if (LoadFromRes) then
- CM.LoadFromResource(Instance, NegativeY)
- else
- {$ENDIF}
- CM.LoadFromFile(NegativeY);
- CM.GenerateCubeMap(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y);
-
- {$IFDEF GLB_DELPHI}
- if (LoadFromRes) then
- CM.LoadFromResource(Instance, PositiveZ)
- else
- {$ENDIF}
- CM.LoadFromFile(PositiveZ);
- CM.GenerateCubeMap(GL_TEXTURE_CUBE_MAP_POSITIVE_Z);
-
- {$IFDEF GLB_DELPHI}
- if (LoadFromRes) then
- CM.LoadFromResource(Instance, NegativeZ)
- else
- {$ENDIF}
- CM.LoadFromFile(NegativeZ);
- CM.GenerateCubeMap(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z);
-
- Texture := CM.ID;
- result := true;
- finally
- CM.Free;
- end;
-end;
-
-function LoadNormalMap(Size: Integer; var Texture: Cardinal): Boolean;
-var
- NM: TglBitmapNormalMap;
-begin
- Texture := 0;
-
- NM := TglBitmapNormalMap.Create;
- try
- NM.DeleteTextureOnFree := false;
- NM.GenerateNormalMap(Size);
-
- Texture := NM.ID;
- result := true;
- finally
- NM.Free;
- end;
-end;
-*)
-
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
procedure glBitmapSetDefaultDeleteTextureOnFree(const aDeleteTextureOnFree: Boolean);
begin
function TFormatDescriptor.MaskMatch(const aRedMask, aGreenMask, aBlueMask, aAlphaMask: QWord): Boolean;
begin
result := false;
-
if (aRedMask = 0) and (aGreenMask = 0) and (aBlueMask = 0) and (aAlphaMask = 0) then
raise EglBitmapException.Create('FormatCheckFormat - All Masks are 0');
-
if (aRedMask <> RedMask) then
exit;
if (aGreenMask <> GreenMask) then
aPixel.Data.g := 0;
aPixel.Data.b := 0;
aPixel.Data.a := aData^;
- inc(aData^);
+ inc(aData);
end;
constructor TfdAlpha_UB1.Create;
f := fPixelSize - s;
bits := Round(8 * f);
case s of
- 0: idx := (aData^ shr (8 - bits - {%H-}PtrUInt(aMapData))) and ((1 shl bits) - 1);
+ 0: idx := (aData^ shr (8 - bits - {%H-}PtrInt(aMapData))) and ((1 shl bits) - 1);
1: idx := aData^;
2: idx := PWord(aData)^;
4: idx := PCardinal(aData)^;
if fFormat = aValue then
exit;
if TFormatDescriptor.Get(Format).PixelSize <> TFormatDescriptor.Get(aValue).PixelSize then
- raise EglBitmapUnsupportedFormat.Create('SetFormat');
+ raise EglBitmapUnsupportedFormat.Create(Format);
SetDataPointer(Data, aValue, Width, Height);
end;
end;
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+procedure TglBitmap.PrepareResType(var aResource: String; var aResType: PChar);
+var
+ TempPos: Integer;
+begin
+ if not Assigned(aResType) then begin
+ TempPos := Pos('.', aResource);
+ aResType := PChar(UpperCase(Copy(aResource, TempPos + 1, Length(aResource) - TempPos)));
+ aResource := UpperCase(Copy(aResource, 0, TempPos -1));
+ end;
+end;
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
procedure TglBitmap.LoadFromFile(const aFilename: String);
var
fs: TFileStream;
AddFunc(Self, aFunc, false, Format, aArgs);
end;
-{$IFDEF GLB_DELPHI}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-procedure TglBitmap.LoadFromResource(const aInstance: Cardinal; const aResource: String; const aResType: PChar = nil);
+procedure TglBitmap.LoadFromResource(const aInstance: Cardinal; aResource: String; aResType: PChar);
var
rs: TResourceStream;
- TempPos: Integer;
- ResTypeStr: String;
- TempResType: PChar;
-begin
- if not Assigned(ResType) then begin
- TempPos := Pos('.', Resource);
- ResTypeStr := UpperCase(Copy(Resource, TempPos + 1, Length(Resource) - TempPos));
- Resource := UpperCase(Copy(Resource, 0, TempPos -1));
- TempResType := PChar(ResTypeStr);
- end else
- TempResType := ResType
-
- rs := TResourceStream.Create(Instance, Resource, TempResType);
+begin
+ PrepareResType(aResource, aResType);
+ rs := TResourceStream.Create(aInstance, aResource, aResType);
try
LoadFromStream(rs);
finally
end;
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-procedure TglBitmap.LoadFromResourceID(const sInstance: Cardinal; const aResourceID: Integer; const aResType: PChar);
+procedure TglBitmap.LoadFromResourceID(const aInstance: Cardinal; const aResourceID: Integer; const aResType: PChar);
var
rs: TResourceStream;
begin
- rs := TResourceStream.CreateFromID(Instance, ResourceID, ResType);
+ rs := TResourceStream.CreateFromID(aInstance, aResourceID, aResType);
try
LoadFromStream(rs);
finally
rs.Free;
end;
end;
-{$ENDIF}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
procedure TglBitmap.SaveToFile(const aFileName: String; const aFileType: TglBitmapFileType);
begin
case aFileType of
{$IFDEF GLB_SUPPORT_PNG_WRITE}
- ftPNG: SavePng(aStream);
+ ftPNG: SavePNG(aStream);
{$ENDIF}
{$IFDEF GLB_SUPPORT_JPEG_WRITE}
ftJPEG: SaveJPEG(aStream);
SourceFD := TFormatDescriptor.Get(aSource.Format);
DestFD := TFormatDescriptor.Get(aFormat);
+ if (SourceFD.IsCompressed) then
+ raise EglBitmapUnsupportedFormat.Create('compressed formats are not supported: ', SourceFD.Format);
+ if (DestFD.IsCompressed) then
+ raise EglBitmapUnsupportedFormat.Create('compressed formats are not supported: ', DestFD.Format);
+
// inkompatible Formats so CreateTemp
if (SourceFD.PixelSize <> DestFD.PixelSize) then
aCreateTemp := true;
TmpData := nil;
if aCreateTemp then begin
- GetMem(TmpData, TFormatDescriptor.Get(aFormat).GetSize(TempWidth, TempHeight));
+ GetMem(TmpData, DestFD.GetSize(TempWidth, TempHeight));
DestData := TmpData;
end else
DestData := Data;
FormatDesc := TFormatDescriptor.Get(Format);
if FormatDesc.IsCompressed then
- raise EglBitmapUnsupportedFormat.Create('AssignToSurface');
+ raise EglBitmapUnsupportedFormat.Create(Format);
if Assigned(Data) then begin
case Trunc(FormatDesc.PixelSize) of
3: TempDepth := 24;
4: TempDepth := 32;
else
- raise EglBitmapUnsupportedFormat.Create('AssignToSurface');
+ raise EglBitmapUnsupportedFormat.Create(Format);
end;
aSurface := SDL_CreateRGBSurface(SDL_SWSURFACE, Width, Height, TempDepth,
tex.Free;
end;
end;
+{$ENDIF}
+{$IFDEF GLB_LAZARUS}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function TglBitmap.AddAlphaFromResource(const aInstance: Cardinal; const aResource: String; const aResType: PChar;
- const aFunc: TglBitmapFunction; const aArgs: PtrInt): Boolean;
+function TglBitmap.AssignToLazIntfImage(const aImage: TLazIntfImage): Boolean;
var
- RS: TResourceStream;
- TempPos: Integer;
- ResTypeStr: String;
- TempResType: PChar;
+ rid: TRawImageDescription;
+ FormatDesc: TFormatDescriptor;
begin
- if Assigned(ResType) then
- TempResType := ResType
+ result := false;
+ if not Assigned(aImage) or (Format = tfEmpty) then
+ exit;
+ FormatDesc := TFormatDescriptor.Get(Format);
+ if FormatDesc.IsCompressed then
+ exit;
+
+ FillChar(rid{%H-}, SizeOf(rid), 0);
+ if (Format in [
+ tfAlpha4, tfAlpha8, tfAlpha12, tfAlpha16,
+ tfLuminance4, tfLuminance8, tfLuminance12, tfLuminance16,
+ tfLuminance4Alpha4, tfLuminance8Alpha8, tfLuminance12Alpha4, tfLuminance12Alpha12, tfLuminance16Alpha16]) then
+ rid.Format := ricfGray
else
- begin
- TempPos := Pos('.', Resource);
- ResTypeStr := UpperCase(Copy(Resource, TempPos + 1, Length(Resource) - TempPos));
- Resource := UpperCase(Copy(Resource, 0, TempPos -1));
- TempResType := PChar(ResTypeStr);
- end;
+ rid.Format := ricfRGBA;
+
+ rid.Width := Width;
+ rid.Height := Height;
+ rid.Depth := CountSetBits(FormatDesc.Range.r or FormatDesc.Range.g or FormatDesc.Range.b or FormatDesc.Range.a);
+ rid.BitOrder := riboBitsInOrder;
+ rid.ByteOrder := riboLSBFirst;
+ rid.LineOrder := riloTopToBottom;
+ rid.LineEnd := rileTight;
+ rid.BitsPerPixel := Round(8 * FormatDesc.PixelSize);
+ rid.RedPrec := CountSetBits(FormatDesc.Range.r);
+ rid.GreenPrec := CountSetBits(FormatDesc.Range.g);
+ rid.BluePrec := CountSetBits(FormatDesc.Range.b);
+ rid.AlphaPrec := CountSetBits(FormatDesc.Range.a);
+ rid.RedShift := FormatDesc.Shift.r;
+ rid.GreenShift := FormatDesc.Shift.g;
+ rid.BlueShift := FormatDesc.Shift.b;
+ rid.AlphaShift := FormatDesc.Shift.a;
+
+ rid.MaskBitsPerPixel := 0;
+ rid.PaletteColorCount := 0;
+
+ aImage.DataDescription := rid;
+ aImage.CreateData;
+
+ Move(Data^, aImage.PixelData^, FormatDesc.GetSize(Dimension));
+
+ result := true;
+end;
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function TglBitmap.AssignFromLazIntfImage(const aImage: TLazIntfImage): Boolean;
+var
+ f: TglBitmapFormat;
+ FormatDesc: TFormatDescriptor;
+ ImageData: PByte;
+ ImageSize: Integer;
+begin
+ result := false;
+ if not Assigned(aImage) then
+ exit;
+ for f := High(f) downto Low(f) do begin
+ FormatDesc := TFormatDescriptor.Get(f);
+ with aImage.DataDescription do
+ if FormatDesc.MaskMatch(
+ (QWord(1 shl RedPrec )-1) shl RedShift,
+ (QWord(1 shl GreenPrec)-1) shl GreenShift,
+ (QWord(1 shl BluePrec )-1) shl BlueShift,
+ (QWord(1 shl AlphaPrec)-1) shl AlphaShift) then
+ break;
+ end;
+
+ if (f = tfEmpty) then
+ exit;
- RS := TResourceStream.Create(Instance, Resource, TempResType);
+ ImageSize := FormatDesc.GetSize(aImage.Width, aImage.Height);
+ ImageData := GetMem(ImageSize);
try
- result := AddAlphaFromStream(RS, Func, CustomData);
+ Move(aImage.PixelData^, ImageData^, (aImage.Width * aImage.Height * aImage.DataDescription.BitsPerPixel) shr 3);
+ SetDataPointer(ImageData, f, aImage.Width, aImage.Height);
+ except
+ FreeMem(ImageData);
+ raise;
+ end;
+
+ result := true;
+end;
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function TglBitmap.AssignAlphaToLazIntfImage(const aImage: TLazIntfImage): Boolean;
+var
+ rid: TRawImageDescription;
+ FormatDesc: TFormatDescriptor;
+ Pixel: TglBitmapPixelData;
+ x, y: Integer;
+ srcMD: Pointer;
+ src, dst: PByte;
+begin
+ result := false;
+ if not Assigned(aImage) or (Format = tfEmpty) then
+ exit;
+ FormatDesc := TFormatDescriptor.Get(Format);
+ if FormatDesc.IsCompressed or not FormatDesc.HasAlpha then
+ exit;
+
+ FillChar(rid{%H-}, SizeOf(rid), 0);
+ rid.Format := ricfGray;
+ rid.Width := Width;
+ rid.Height := Height;
+ rid.Depth := CountSetBits(FormatDesc.Range.a);
+ rid.BitOrder := riboBitsInOrder;
+ rid.ByteOrder := riboLSBFirst;
+ rid.LineOrder := riloTopToBottom;
+ rid.LineEnd := rileTight;
+ rid.BitsPerPixel := 8 * Ceil(rid.Depth / 8);
+ rid.RedPrec := CountSetBits(FormatDesc.Range.a);
+ rid.GreenPrec := 0;
+ rid.BluePrec := 0;
+ rid.AlphaPrec := 0;
+ rid.RedShift := 0;
+ rid.GreenShift := 0;
+ rid.BlueShift := 0;
+ rid.AlphaShift := 0;
+
+ rid.MaskBitsPerPixel := 0;
+ rid.PaletteColorCount := 0;
+
+ aImage.DataDescription := rid;
+ aImage.CreateData;
+
+ srcMD := FormatDesc.CreateMappingData;
+ try
+ FormatDesc.PreparePixel(Pixel);
+ src := Data;
+ dst := aImage.PixelData;
+ for y := 0 to Height-1 do
+ for x := 0 to Width-1 do begin
+ FormatDesc.Unmap(src, Pixel, srcMD);
+ case rid.BitsPerPixel of
+ 8: begin
+ dst^ := Pixel.Data.a;
+ inc(dst);
+ end;
+ 16: begin
+ PWord(dst)^ := Pixel.Data.a;
+ inc(dst, 2);
+ end;
+ 24: begin
+ PByteArray(dst)^[0] := PByteArray(@Pixel.Data.a)^[0];
+ PByteArray(dst)^[1] := PByteArray(@Pixel.Data.a)^[1];
+ PByteArray(dst)^[2] := PByteArray(@Pixel.Data.a)^[2];
+ inc(dst, 3);
+ end;
+ 32: begin
+ PCardinal(dst)^ := Pixel.Data.a;
+ inc(dst, 4);
+ end;
+ else
+ raise EglBitmapUnsupportedFormat.Create(Format);
+ end;
+ end;
finally
- RS.Free;
+ FormatDesc.FreeMappingData(srcMD);
end;
+ result := true;
end;
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function TglBitmap.AddAlphaFromResourceID(const aInstance: Cardinal; const aResourceID: Integer; const aResType: PChar;
- const aFunc: TglBitmapFunction; const aArgs: PtrInt): Boolean;
+function TglBitmap.AddAlphaFromLazIntfImage(const aImage: TLazIntfImage; const aFunc: TglBitmapFunction; const aArgs: Pointer): Boolean;
var
- RS: TResourceStream;
+ tex: TglBitmap2D;
begin
- RS := TResourceStream.CreateFromID(Instance, ResourceID, ResType);
+ tex := TglBitmap2D.Create;
try
- result := AddAlphaFromStream(RS, Func, CustomData);
+ tex.AssignFromLazIntfImage(aImage);
+ result := AddAlphaFromglBitmap(tex, aFunc, aArgs);
finally
- RS.Free;
+ tex.Free;
end;
end;
{$ENDIF}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function TglBitmap.AddAlphaFromResource(const aInstance: Cardinal; aResource: String; aResType: PChar;
+ const aFunc: TglBitmapFunction; const aArgs: Pointer): Boolean;
+var
+ rs: TResourceStream;
+begin
+ PrepareResType(aResource, aResType);
+ rs := TResourceStream.Create(aInstance, aResource, aResType);
+ try
+ result := AddAlphaFromStream(rs, aFunc, aArgs);
+ finally
+ rs.Free;
+ end;
+end;
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function TglBitmap.AddAlphaFromResourceID(const aInstance: Cardinal; const aResourceID: Integer; const aResType: PChar;
+ const aFunc: TglBitmapFunction; const aArgs: Pointer): Boolean;
+var
+ rs: TResourceStream;
+begin
+ rs := TResourceStream.CreateFromID(aInstance, aResourceID, aResType);
+ try
+ result := AddAlphaFromStream(rs, aFunc, aArgs);
+ finally
+ rs.Free;
+ end;
+end;
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function TglBitmap.AddAlphaFromFunc(const aFunc: TglBitmapFunction; const aArgs: Pointer): Boolean;
begin
- (* TODO
- if not FormatIsUncompressed(InternalFormat) then
- raise EglBitmapUnsupportedFormatFormat.Create('AddAlphaFromFunc - ' + UNSUPPORTED_FORMAT);
- *)
+ if TFormatDescriptor.Get(Format).IsCompressed then
+ raise EglBitmapUnsupportedFormat.Create(Format);
result := AddFunc(Self, aFunc, false, TFormatDescriptor.Get(Format).WithAlpha, aArgs);
end;
FormatDesc := TFormatDescriptor.Get(Format);
if Assigned(Data) then begin
if FormatDesc.IsCompressed or not FormatDesc.HasAlpha then
- raise EglBitmapUnsupportedFormat.Create('RemoveAlpha');
+ raise EglBitmapUnsupportedFormat.Create(Format);
result := ConvertTo(FormatDesc.WithoutAlpha);
end;
end;
LoadFromFunc(aSize, aFunc, aFormat, aArgs);
end;
-{$IFDEF GLB_DELPHI}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
constructor TglBitmap.Create(const aInstance: Cardinal; const aResource: String; const aResType: PChar);
begin
Create;
LoadFromResourceID(aInstance, aResourceID, aResType);
end;
-{$ENDIF}
{$IFDEF GLB_SUPPORT_PNG_READ}
{$IF DEFINED(GLB_SDL_IMAGE)}
png_info: png_infop;
TempHeight, TempWidth: Integer;
- Format: TglBitmapInternalFormat;
+ Format: TglBitmapFormat;
png_data: pByte;
png_rows: array of pByte;
try
// signature
- StreamPos := Stream.Position;
- Stream.Read(signature, 8);
- Stream.Position := StreamPos;
+ StreamPos := aStream.Position;
+ aStream.Read(signature{%H-}, 8);
+ aStream.Position := StreamPos;
if png_check_sig(@signature, 8) <> 0 then begin
// png read struct
end;
// set read callback
- png_set_read_fn(png, stream, glBitmap_libPNG_read_func);
+ png_set_read_fn(png, aStream, glBitmap_libPNG_read_func);
// read informations
png_read_info(png, png_info);
var
StreamPos: Int64;
Png: TPNGObject;
- Header: Array[0..7] of Byte;
+ Header: String[8];
Row, Col, PixSize, LineSize: Integer;
NewImage, pSource, pDest, pAlpha: pByte;
- Format: TglBitmapInternalFormat;
+ PngFormat: TglBitmapFormat;
+ FormatDesc: TFormatDescriptor;
const
- PngHeader: Array[0..7] of Byte = (#137, #80, #78, #71, #13, #10, #26, #10);
+ PngHeader: String[8] = #137#80#78#71#13#10#26#10;
begin
result := false;
- StreamPos := Stream.Position;
- Stream.Read(Header[0], SizeOf(Header));
- Stream.Position := StreamPos;
+ StreamPos := aStream.Position;
+ aStream.Read(Header[0], SizeOf(Header));
+ aStream.Position := StreamPos;
{Test if the header matches}
if Header = PngHeader then begin
Png := TPNGObject.Create;
try
- Png.LoadFromStream(Stream);
+ Png.LoadFromStream(aStream);
case Png.Header.ColorType of
COLOR_GRAYSCALE:
- Format := ifLuminance;
+ PngFormat := tfLuminance8;
COLOR_GRAYSCALEALPHA:
- Format := ifLuminanceAlpha;
+ PngFormat := tfLuminance8Alpha8;
COLOR_RGB:
- Format := ifBGR8;
+ PngFormat := tfBGR8;
COLOR_RGBALPHA:
- Format := ifBGRA8;
+ PngFormat := tfBGRA8;
else
raise EglBitmapException.Create ('LoadPng - Unsupported Colortype found.');
end;
- PixSize := Trunc(FormatGetSize(Format));
- LineSize := Integer(Png.Header.Width) * PixSize;
+ FormatDesc := TFormatDescriptor.Get(PngFormat);
+ PixSize := Round(FormatDesc.PixelSize);
+ LineSize := FormatDesc.GetSize(Png.Header.Width, 1);
GetMem(NewImage, LineSize * Integer(Png.Header.Height));
try
raise EglBitmapException.Create ('LoadPng - Unsupported Colortype found.');
end;
- SetDataPointer(NewImage, Format, Png.Header.Width, Png.Header.Height);
+ SetDataPointer(NewImage, PngFormat, Png.Header.Width, Png.Header.Height);
result := true;
except
end;
end;
end;
-{$IFEND}
+{$ENDIF}
{$ENDIF}
{$IFDEF GLB_SUPPORT_PNG_WRITE}
LineSize: Integer;
ColorType: Integer;
Row: Integer;
+ FormatDesc: TFormatDescriptor;
begin
- if not (ftPNG in FormatGetSupportedFiles (InternalFormat)) then
- raise EglBitmapUnsupportedInternalFormat.Create('SavePng - ' + UNSUPPORTED_INTERNAL_FORMAT);
+ if not (ftPNG in FormatGetSupportedFiles(Format)) then
+ raise EglBitmapUnsupportedFormat.Create(Format);
if not init_libPNG then
- raise Exception.Create('SavePNG - unable to initialize libPNG.');
+ raise Exception.Create('unable to initialize libPNG.');
try
- case FInternalFormat of
- ifAlpha, ifLuminance, ifDepth8:
+ case Format of
+ tfAlpha8, tfLuminance8:
ColorType := PNG_COLOR_TYPE_GRAY;
- ifLuminanceAlpha:
+ tfLuminance8Alpha8:
ColorType := PNG_COLOR_TYPE_GRAY_ALPHA;
- ifBGR8, ifRGB8:
+ tfBGR8, tfRGB8:
ColorType := PNG_COLOR_TYPE_RGB;
- ifBGRA8, ifRGBA8:
+ tfBGRA8, tfRGBA8:
ColorType := PNG_COLOR_TYPE_RGBA;
else
- raise EglBitmapUnsupportedInternalFormat.Create('SavePng - ' + UNSUPPORTED_INTERNAL_FORMAT);
+ raise EglBitmapUnsupportedFormat.Create(Format);
end;
- LineSize := Trunc(FormatGetSize(FInternalFormat) * Width);
+
+ FormatDesc := TFormatDescriptor.Get(Format);
+ LineSize := FormatDesc.GetSize(Width, 1);
// creating array for scanline
SetLength(png_rows, Height);
end;
// set read callback
- png_set_write_fn(png, stream, glBitmap_libPNG_write_func, nil);
+ png_set_write_fn(png, aStream, glBitmap_libPNG_write_func, nil);
// set compression
png_set_compression_level(png, 6);
- if InternalFormat in [ifBGR8, ifBGRA8] then
+ if Format in [tfBGR8, tfBGRA8] then
png_set_bgr(png);
png_set_IHDR(png, png_info, Width, Height, 8, ColorType, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
pTemp: pByte;
Temp: Byte;
begin
- if not (ftPNG in FormatGetSupportedFiles (InternalFormat)) then
- raise EglBitmapUnsupportedInternalFormat.Create('SavePng - ' + UNSUPPORTED_INTERNAL_FORMAT);
+ if not (ftPNG in FormatGetSupportedFiles (Format)) then
+ raise EglBitmapUnsupportedFormat.Create(Format);
- case FInternalFormat of
- ifAlpha, ifLuminance, ifDepth8: begin
+ case Format of
+ tfAlpha8, tfLuminance8: begin
ColorType := COLOR_GRAYSCALE;
- PixSize := 1;
- Alpha := false;
+ PixSize := 1;
+ Alpha := false;
end;
- ifLuminanceAlpha: begin
+ tfLuminance8Alpha8: begin
ColorType := COLOR_GRAYSCALEALPHA;
- PixSize := 1;
- Alpha := true;
+ PixSize := 1;
+ Alpha := true;
end;
- ifBGR8, ifRGB8: begin
+ tfBGR8, tfRGB8: begin
ColorType := COLOR_RGB;
- PixSize := 3;
- Alpha := false;
+ PixSize := 3;
+ Alpha := false;
end;
- ifBGRA8, ifRGBA8: begin
+ tfBGRA8, tfRGBA8: begin
ColorType := COLOR_RGBALPHA;
- PixSize := 3;
- Alpha := true
+ PixSize := 3;
+ Alpha := true
end;
else
- raise EglBitmapUnsupportedInternalFormat.Create('SavePng - ' + UNSUPPORTED_INTERNAL_FORMAT);
+ raise EglBitmapUnsupportedFormat.Create(Format);
end;
Png := TPNGObject.CreateBlank(ColorType, 8, Width, Height);
end;
// convert RGB line to BGR
- if InternalFormat in [ifRGB8, ifRGBA8] then begin
+ if Format in [tfRGB8, tfRGBA8] then begin
pTemp := png.ScanLine[Y];
for X := 0 to Width -1 do begin
Temp := pByteArray(pTemp)^[0];
// Save to Stream
Png.CompressionLevel := 6;
- Png.SaveToStream(Stream);
+ Png.SaveToStream(aStream);
finally
FreeAndNil(Png);
end;
end;
-{$IFEND}
+{$ENDIF}
{$ENDIF}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
DestBuffer: array [1..4096] of byte;
end;
+procedure glBitmap_libJPEG_error_exit(cinfo: j_common_ptr); cdecl;
+begin
+ //DUMMY
+end;
+
+
+procedure glBitmap_libJPEG_output_message(cinfo: j_common_ptr); cdecl;
+begin
+ //DUMMY
+end;
+
+
+procedure glBitmap_libJPEG_init_source(cinfo: j_decompress_ptr); cdecl;
+begin
+ //DUMMY
+end;
+
+procedure glBitmap_libJPEG_term_source(cinfo: j_decompress_ptr); cdecl;
+begin
+ //DUMMY
+end;
+
+
+procedure glBitmap_libJPEG_init_destination(cinfo: j_compress_ptr); cdecl;
+begin
+ //DUMMY
+end;
+
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function glBitmap_libJPEG_fill_input_buffer(cinfo: j_decompress_ptr): boolean; cdecl;
var
jpeg: jpeg_decompress_struct;
jpeg_err: jpeg_error_mgr;
- IntFormat: TglBitmapInternalFormat;
+ IntFormat: TglBitmapFormat;
pImage: pByte;
TempHeight, TempWidth: Integer;
pTemp: pByte;
Row: Integer;
+
+ FormatDesc: TFormatDescriptor;
begin
result := false;
try
// reading first two bytes to test file and set cursor back to begin
- StreamPos := Stream.Position;
- Stream.Read(Temp[0], 2);
- Stream.Position := StreamPos;
+ StreamPos := aStream.Position;
+ aStream.Read({%H-}Temp[0], 2);
+ aStream.Position := StreamPos;
// if Bitmap then read file.
if ((Temp[0] = $FF) and (Temp[1] = $D8)) then begin
- FillChar(jpeg, SizeOf(jpeg_decompress_struct), $00);
- FillChar(jpeg_err, SizeOf(jpeg_error_mgr), $00);
+ FillChar(jpeg{%H-}, SizeOf(jpeg_decompress_struct), $00);
+ FillChar(jpeg_err{%H-}, SizeOf(jpeg_error_mgr), $00);
// error managment
jpeg.err := jpeg_std_error(@jpeg_err);
- jpeg_err.error_exit := glBitmap_libJPEG_error_exit;
+ jpeg_err.error_exit := glBitmap_libJPEG_error_exit;
jpeg_err.output_message := glBitmap_libJPEG_output_message;
// decompression struct
pub.bytes_in_buffer := 0; // forces fill_input_buffer on first read
pub.next_input_byte := nil; // until buffer loaded
- SrcStream := Stream;
+ SrcStream := aStream;
end;
// set global decoding state
JCS_GRAYSCALE:
begin
jpeg.out_color_space := JCS_GRAYSCALE;
- IntFormat := ifLuminance;
+ IntFormat := tfLuminance8;
end;
else
jpeg.out_color_space := JCS_RGB;
- IntFormat := ifRGB8;
+ IntFormat := tfRGB8;
end;
// reading image
TempHeight := jpeg.output_height;
TempWidth := jpeg.output_width;
+ FormatDesc := TFormatDescriptor.Get(IntFormat);
+
// creating new image
- GetMem(pImage, FormatGetImageSize(glBitmapPosition(TempWidth, TempHeight), IntFormat));
+ GetMem(pImage, FormatDesc.GetSize(TempWidth, TempHeight));
try
pTemp := pImage;
for Row := 0 to TempHeight -1 do begin
jpeg_read_scanlines(@jpeg, @pTemp, 1);
- Inc(pTemp, Trunc(FormatGetSize(IntFormat) * TempWidth));
+ Inc(pTemp, FormatDesc.GetSize(TempWidth, 1));
end;
// finish decompression
end;
end;
end;
-{$IFEND}
+{$ENDIF}
{$ENDIF}
{$IFDEF GLB_SUPPORT_JPEG_WRITE}
-{$IF DEFEFINED(GLB_LIB_JPEG)}
+{$IF DEFINED(GLB_LIB_JPEG)}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-procedure TglBitmap.SaveJPEG(Stream: TStream);
+procedure TglBitmap.SaveJPEG(const aStream: TStream);
var
jpeg: jpeg_compress_struct;
jpeg_err: jpeg_error_mgr;
begin
if not (ftJPEG in FormatGetSupportedFiles(Format)) then
- raise EglBitmapUnsupportedInternalFormat.Create('SaveJpg - ' + UNSUPPORTED_INTERNAL_FORMAT);
+ raise EglBitmapUnsupportedFormat.Create(Format);
if not init_libJPEG then
raise Exception.Create('SaveJPG - unable to initialize libJPEG.');
try
- FillChar(jpeg, SizeOf(jpeg_compress_struct), $00);
- FillChar(jpeg_err, SizeOf(jpeg_error_mgr), $00);
+ FillChar(jpeg{%H-}, SizeOf(jpeg_compress_struct), $00);
+ FillChar(jpeg_err{%H-}, SizeOf(jpeg_error_mgr), $00);
// error managment
jpeg.err := jpeg_std_error(@jpeg_err);
- jpeg_err.error_exit := glBitmap_libJPEG_error_exit;
+ jpeg_err.error_exit := glBitmap_libJPEG_error_exit;
jpeg_err.output_message := glBitmap_libJPEG_output_message;
// compression struct
pub.next_output_byte := @DestBuffer[1];
pub.free_in_buffer := Length(DestBuffer);
- DestStream := Stream;
+ DestStream := aStream;
end;
// very important state
jpeg.global_state := CSTATE_START;
jpeg.image_width := Width;
jpeg.image_height := Height;
- case InternalFormat of
- ifAlpha, ifLuminance, ifDepth8: begin
+ case Format of
+ tfAlpha8, tfLuminance8: begin
jpeg.input_components := 1;
- jpeg.in_color_space := JCS_GRAYSCALE;
+ jpeg.in_color_space := JCS_GRAYSCALE;
end;
- ifRGB8, ifBGR8: begin
+ tfRGB8, tfBGR8: begin
jpeg.input_components := 3;
- jpeg.in_color_space := JCS_RGB;
+ jpeg.in_color_space := JCS_RGB;
end;
end;
jpeg_start_compress(@jpeg, true);
pTemp := Data;
- if InternalFormat = ifBGR8 then
+ if Format = tfBGR8 then
GetMem(pTemp2, fRowSize)
else
pTemp2 := pTemp;
try
for Row := 0 to jpeg.image_height -1 do begin
// prepare row
- if InternalFormat = ifBGR8 then
+ if Format = tfBGR8 then
CopyRow(pTemp2, pTemp)
else
pTemp2 := pTemp;
end;
finally
// free memory
- if InternalFormat = ifBGR8 then
+ if Format = tfBGR8 then
FreeMem(pTemp2);
end;
jpeg_finish_compress(@jpeg);
begin
if not (ftBMP in FormatGetSupportedFiles(Format)) then
- raise EglBitmapUnsupportedFormat.Create('SaveBMP');
+ raise EglBitmapUnsupportedFormat.Create(Format);
Converter := nil;
FormatDesc := TFormatDescriptor.Get(Format);
Info.biCompression := BMP_COMP_BITFIELDS;
end;
else
- raise EglBitmapUnsupportedFormat.Create('SaveBMP - ' + UNSUPPORTED_FORMAT);
+ raise EglBitmapUnsupportedFormat.Create(Format);
end;
Info.biXPelsPerMeter := 2835;
Info.biYPelsPerMeter := 2835;
Converter: TFormatDescriptor;
begin
if not (ftTGA in FormatGetSupportedFiles(Format)) then
- raise EglBitmapUnsupportedFormat.Create('SaveTGA');
+ raise EglBitmapUnsupportedFormat.Create(Format);
//prepare header
FillChar(Header{%H-}, SizeOf(Header), 0);
FormatDesc: TFormatDescriptor;
begin
if not (ftDDS in FormatGetSupportedFiles(Format)) then
- raise EglBitmapUnsupportedFormat.Create('SaveDDS');
+ raise EglBitmapUnsupportedFormat.Create(Format);
FormatDesc := TFormatDescriptor.Get(Format);
inherited SetDataPointer(aData, aFormat, aWidth, aHeight);
if not TFormatDescriptor.Get(aFormat).IsCompressed then begin
- (* TODO PixelFuncs
- fGetPixelFunc := GetPixel2DUnmap;
- fSetPixelFunc := SetPixel2DUnmap;
- *)
// Assigning Data
if Assigned(Data) then begin
SetLength(fLines, GetHeight);
LineWidth := Trunc(GetWidth * TFormatDescriptor.Get(Format).PixelSize);
- for Idx := 0 to GetHeight -1 do begin
+ for Idx := 0 to GetHeight-1 do begin
fLines[Idx] := Data;
Inc(fLines[Idx], Idx * LineWidth);
end;
else SetLength(fLines, 0);
end else begin
SetLength(fLines, 0);
- (*
- fSetPixelFunc := nil;
-
- case Format of
- ifDXT1:
- fGetPixelFunc := GetPixel2DDXT1;
- ifDXT3:
- fGetPixelFunc := GetPixel2DDXT3;
- ifDXT5:
- fGetPixelFunc := GetPixel2DDXT5;
- else
- fGetPixelFunc := nil;
- end;
- *)
end;
end;
begin
FormatDesc := TFormatDescriptor.Get(Format);
if FormatDesc.IsCompressed then
- raise EglBitmapUnsupportedFormat.Create('TglBitmap2D.GrabScreen');
+ raise EglBitmapUnsupportedFormat.Create(Format);
w := aRight - aLeft;
h := aBottom - aTop;
end;
begin
- (* TODO Compression
- if not FormatIsUncompressed(InternalFormat) then
- raise EglBitmapUnsupportedFormatFormat.Create('TglBitmap2D.ToNormalMap - ' + UNSUPPORTED_FORMAT);
- *)
+ if TFormatDescriptor.Get(Format).IsCompressed then
+ raise EglBitmapUnsupportedFormat.Create(Format);
if aScale > 100 then
Rec.Scale := 100
projects / LazOpenGLCore.git / blobdiff