Skip to content

Add ARGB support #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add ARGB support #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 68 additions & 20 deletions src/OpenJpegDotNet/Image.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,11 @@ public byte[] IccProfile
/// <summary>
/// Converts this <see cref="Image"/> to a GDI+ <see cref="Bitmap"/>.
/// </summary>
/// <param name="alpha">Export alpha channel</param>
/// <returns>A <see cref="Bitmap"/> that represents the converted <see cref="Image"/>.</returns>
/// <exception cref="ObjectDisposedException">This object is disposed.</exception>
/// <exception cref="NotSupportedException">This object is not supported.</exception>
public Bitmap ToBitmap()
public Bitmap ToBitmap(bool alpha = true)
{
this.ThrowIfDisposed();

Expand All @@ -206,14 +207,6 @@ public Bitmap ToBitmap()
throw new NotSupportedException("This object is not supported.");
}

if (channel != 3 && channel != 1)
{
if (planes != IntPtr.Zero)
NativeMethods.stdlib_free(planes);

throw new NotSupportedException("This object is not supported.");
}

Bitmap bitmap = null;
BitmapData bitmapData = null;

Expand Down Expand Up @@ -271,11 +264,45 @@ public Bitmap ToBitmap()
}
}
break;
case 4:
{
bitmap = new Bitmap((int)width, (int)height, PixelFormat.Format32bppArgb);
var rect = new Rectangle(0, 0, (int)width, (int)height);
bitmapData = bitmap.LockBits(rect, ImageLockMode.WriteOnly, bitmap.PixelFormat);
var scan0 = bitmapData.Scan0;
var stride = bitmapData.Stride;

unsafe
{
var pSrc = (byte*)planes;
var pDest = (byte*)scan0;
var gap = stride - width * channel;
var size = width * height;
for (var y = 0; y < height; y++)
{
for (var x = 0; x < width; x++)
{
pDest[3] = alpha ? pSrc[0 + size * 3] : (byte)255;
pDest[2] = pSrc[0];
pDest[1] = pSrc[0 + size];
pDest[0] = pSrc[0 + size * 2];

pSrc += 1;
pDest += channel;
}

pDest += gap;
}
}
}
break;
default:
throw new NotSupportedException($"Unsupported number of channels: ${channel}.");
}

break;
default:
throw new NotSupportedException("This object is not supported.");
throw new NotSupportedException($"Unsupported pixel depth: ${pixel}.");
}
}
catch
Expand All @@ -301,6 +328,7 @@ public Bitmap ToBitmap()
/// <summary>
/// Converts this <see cref="Image"/> to a <see cref="RawBitmap"/>.
/// </summary>
/// <param name="alpha">Export alpha channel</param>
/// <returns>A <see cref="RawBitmap"/> that represents the converted <see cref="Image"/>.</returns>
/// <exception cref="NotSupportedException">This object is not supported.</exception>
public RawBitmap ToRawBitmap()
Expand All @@ -322,14 +350,6 @@ public RawBitmap ToRawBitmap()
throw new NotSupportedException("This object is not supported.");
}

if (channel != 3 && channel != 1)
{
if (planes != IntPtr.Zero)
NativeMethods.stdlib_free(planes);

throw new NotSupportedException("This object is not supported.");
}

var raw = new byte[width * height * channel];

try
Expand Down Expand Up @@ -382,11 +402,39 @@ public RawBitmap ToRawBitmap()
}
}
break;
case 4:
{
unsafe
{
fixed (byte* dst = &raw[0])
{
var pSrc = (byte*)planes;
var pDest = dst;
var size = width * height;
for (var y = 0; y < height; y++)
{
for (var x = 0; x < width; x++)
{
pDest[3] = alpha ? pSrc[0 + size * 3] : (byte)255;
pDest[2] = pSrc[0];
pDest[1] = pSrc[0 + size];
pDest[0] = pSrc[0 + size * 2];

pSrc += 1;
pDest += channel;
}
}
}
}
}
break;
default:
throw new NotSupportedException($"Unsupported number of channels: ${channel}.");
}

break;
default:
throw new NotSupportedException("This object is not supported.");
throw new NotSupportedException($"Unsupported pixel depth: ${pixel}.");
}
}
finally
Expand Down Expand Up @@ -419,4 +467,4 @@ protected override void DisposeUnmanaged()

}

}
}