summaryrefslogtreecommitdiffstats
path: root/TextureLoader/src
diff options
context:
space:
mode:
authorAssiduous <61806567+TheMostDiligent@users.noreply.github.com>2021-03-18 05:06:50 +0000
committerGitHub <noreply@github.com>2021-03-18 05:06:50 +0000
commit1de4b5caf9a2f779b2a160c210b425e1c63bb1a9 (patch)
treefcac53b85a8f10b5a6a698cdc7c3ccd21f700625 /TextureLoader/src
parentUpdated readme (diff)
parentFix misc. typos (diff)
downloadDiligentTools-1de4b5caf9a2f779b2a160c210b425e1c63bb1a9.tar.gz
DiligentTools-1de4b5caf9a2f779b2a160c210b425e1c63bb1a9.zip
Merge pull request #21 from luzpaz/typos
Fix misc. typos
Diffstat (limited to 'TextureLoader/src')
-rw-r--r--TextureLoader/src/DDSLoader.cpp4
-rw-r--r--TextureLoader/src/PNGCodec.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/TextureLoader/src/DDSLoader.cpp b/TextureLoader/src/DDSLoader.cpp
index d6a4335..3f61369 100644
--- a/TextureLoader/src/DDSLoader.cpp
+++ b/TextureLoader/src/DDSLoader.cpp
@@ -485,7 +485,7 @@ static TEXTURE_FORMAT DXGIFormatToTexFormat( DXGI_FORMAT TexFormat )
case DXGI_FORMAT_BC7_UNORM: return TEX_FORMAT_BC7_UNORM;
case DXGI_FORMAT_BC7_UNORM_SRGB: return TEX_FORMAT_BC7_UNORM_SRGB;
- default: UNEXPECTED( "Unsupported DXGI formate" ); return TEX_FORMAT_UNKNOWN;
+ default: UNEXPECTED( "Unsupported DXGI format" ); return TEX_FORMAT_UNKNOWN;
}
}
@@ -619,7 +619,7 @@ static DXGI_FORMAT GetDXGIFormat(const DDS_PIXELFORMAT& ddpf)
// No DXGI format maps to ISBITMASK(0x000000ff, 0x0000ff00, 0x00ff0000, 0x00000000) aka D3DFMT_X8B8G8R8
// Note that many common DDS reader/writers (including D3DX) swap the
- // the RED/BLUE masks for 10:10:10:2 formats. We assumme
+ // the RED/BLUE masks for 10:10:10:2 formats. We assume
// below that the 'backwards' header mask is being used since it is most
// likely written by D3DX. The more robust solution is to use the 'DX10'
// header extension and specify the DXGI_FORMAT_R10G10B10A2_UNORM format directly
diff --git a/TextureLoader/src/PNGCodec.c b/TextureLoader/src/PNGCodec.c
index 9ccb920..d02cb9e 100644
--- a/TextureLoader/src/PNGCodec.c
+++ b/TextureLoader/src/PNGCodec.c
@@ -159,7 +159,7 @@ DECODE_PNG_RESULT Diligent_DecodePng(IDataBlob* pSrcPngBits,
//Array of row pointers. One for every row.
rowPtrs = malloc(sizeof(png_bytep) * pDstImgDesc->Height);
- //Alocate a buffer with enough space.
+ //Allocate a buffer with enough space.
pDstImgDesc->RowStride = pDstImgDesc->Width * (Uint32)bit_depth * pDstImgDesc->NumComponents / 8u;
// Align stride to 4 bytes
pDstImgDesc->RowStride = (pDstImgDesc->RowStride + 3u) & ~3u;
@@ -169,7 +169,7 @@ DECODE_PNG_RESULT Diligent_DecodePng(IDataBlob* pSrcPngBits,
for (size_t i = 0; i < pDstImgDesc->Height; i++)
rowPtrs[i] = pRow0 + i * pDstImgDesc->RowStride;
- //Read the imagedata and write it to the adresses pointed to
+ //Read the imagedata and write it to the addresses pointed to
//by rowptrs (in other words: our image databuffer)
png_read_image(png, rowPtrs);