Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-11-27 15:44:00 +08:00
Code Issues Projects Releases Wiki Activity

(TgaFormat.Reader): fixed stride calculation.

Browse Source
This commit is contained in:
morkt 2015-08-05 11:52:03 +04:00
parent 8e2fefb51c
commit 9a27fe31a1
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
GameRes/ImageTGA.cs
View File

@ -2,7 +2,7 @@
//! \date Fri Jul 04 07:24:38 2014 //! \date Fri Jul 04 07:24:38 2014
//! \brief Targa image implementation. //! \brief Targa image implementation.
// //
// Copyright (C) 2014 by morkt // Copyright (C) 2014-2015 by morkt
// //
// Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
@ -58,11 +58,7 @@ namespace GameRes
throw new System.ArgumentException ("TgaFormat.Read should be supplied with TgaMetaData", "metadata"); throw new System.ArgumentException ("TgaFormat.Read should be supplied with TgaMetaData", "metadata");
var reader = new Reader (stream, meta); var reader = new Reader (stream, meta);
var pixels = reader.Unpack(); var pixels = reader.Unpack();
var bitmap = BitmapSource.Create ((int)meta.Width, (int)meta.Height, return ImageData.Create (meta, reader.Format, reader.Palette, pixels, reader.Stride);
ImageData.DefaultDpiX, ImageData.DefaultDpiY,
reader.Format, reader.Palette, pixels, reader.Stride);
bitmap.Freeze();
return new ImageData (bitmap, meta);
} }
public override void Write (Stream stream, ImageData image) public override void Write (Stream stream, ImageData image)
@ -210,7 +206,7 @@ namespace GameRes
int colormap_size = meta.ColormapLength * meta.ColormapDepth / 8; int colormap_size = meta.ColormapLength * meta.ColormapDepth / 8;
m_width = (int)meta.Width; m_width = (int)meta.Width;
m_height = (int)meta.Height; m_height = (int)meta.Height;
m_stride = m_width * ((meta.BPP+7) / 8); m_stride = m_width * ((Format.BitsPerPixel+7) / 8);
m_image_offset = meta.ColormapOffset; m_image_offset = meta.ColormapOffset;
if (1 == meta.ColormapType) if (1 == meta.ColormapType)
{ {