From 909665a0d4ed23620afc537c583a6e84cdee50b9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 1 May 2019 11:09:22 +1000 Subject: ClangFormat: run with ReflowComments on source/ Prepare for enabling ReflowComments. --- source/blender/imbuf/intern/anim_movie.c | 4 ++-- .../blender/imbuf/intern/dds/DirectDrawSurface.cpp | 28 +++++++++++----------- source/blender/imbuf/intern/dds/PixelFormat.h | 8 +++---- .../blender/imbuf/intern/openexr/openexr_api.cpp | 2 +- source/blender/imbuf/intern/radiance_hdr.c | 6 ++--- 5 files changed, 24 insertions(+), 24 deletions(-) (limited to 'source/blender/imbuf') diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 4ef4e15d1c9..483ccc9ea9d 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -87,7 +87,7 @@ # include # include "ffmpeg_compat.h" -#endif //WITH_FFMPEG +#endif // WITH_FFMPEG int ismovie(const char *UNUSED(filepath)) { @@ -453,7 +453,7 @@ static ImBuf *avi_fetchibuf(struct anim *anim, int position) if (lpbi) { ibuf = IMB_ibImageFromMemory( (const unsigned char *)lpbi, 100, IB_rect, anim->colorspace, ""); - //Oh brother... + // Oh brother... } } } diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp index abe8a0c1883..3f222a096ac 100644 --- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp +++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp @@ -76,7 +76,7 @@ static const uint FOURCC_RXGB = DDS_MAKEFOURCC('R', 'X', 'G', 'B'); static const uint FOURCC_ATI1 = DDS_MAKEFOURCC('A', 'T', 'I', '1'); static const uint FOURCC_ATI2 = DDS_MAKEFOURCC('A', 'T', 'I', '2'); -//static const uint FOURCC_A2XY = DDS_MAKEFOURCC('A', '2', 'X', 'Y'); +// static const uint FOURCC_A2XY = DDS_MAKEFOURCC('A', '2', 'X', 'Y'); static const uint FOURCC_DX10 = DDS_MAKEFOURCC('D', 'X', '1', '0'); @@ -100,25 +100,25 @@ static const uint D3DFMT_X8B8G8R8 = 33; static const uint D3DFMT_G16R16 = 34; static const uint D3DFMT_A2R10G10B10 = 35; -//static const uint D3DFMT_A16B16G16R16 = 36; +// static const uint D3DFMT_A16B16G16R16 = 36; // Palette formats. -//static const uint D3DFMT_A8P8 = 40; -//static const uint D3DFMT_P8 = 41; +// static const uint D3DFMT_A8P8 = 40; +// static const uint D3DFMT_P8 = 41; // Luminance formats. static const uint D3DFMT_L8 = 50; -//static const uint D3DFMT_A8L8 = 51; -//static const uint D3DFMT_A4L4 = 52; +// static const uint D3DFMT_A8L8 = 51; +// static const uint D3DFMT_A4L4 = 52; static const uint D3DFMT_L16 = 81; // Floating point formats -//static const uint D3DFMT_R16F = 111; -//static const uint D3DFMT_G16R16F = 112; -//static const uint D3DFMT_A16B16G16R16F = 113; -//static const uint D3DFMT_R32F = 114; -//static const uint D3DFMT_G32R32F = 115; -//static const uint D3DFMT_A32B32G32R32F = 116; +// static const uint D3DFMT_R16F = 111; +// static const uint D3DFMT_G16R16F = 112; +// static const uint D3DFMT_A16B16G16R16F = 113; +// static const uint D3DFMT_R32F = 114; +// static const uint D3DFMT_G32R32F = 115; +// static const uint D3DFMT_A32B32G32R32F = 116; static const uint DDSD_CAPS = 0x00000001U; static const uint DDSD_PIXELFORMAT = 0x00001000U; @@ -722,7 +722,7 @@ void DDSHeader::setPixelFormat(uint bitcount, uint rmask, uint gmask, uint bmask } // D3DX functions do not like this: - this->pf.fourcc = 0; //findD3D9Format(bitcount, rmask, gmask, bmask, amask); + this->pf.fourcc = 0; // findD3D9Format(bitcount, rmask, gmask, bmask, amask); #if 0 if (this->pf.fourcc) { this->pf.flags |= DDPF_FOURCC; @@ -742,7 +742,7 @@ void DDSHeader::setPixelFormat(uint bitcount, uint rmask, uint gmask, uint bmask void DDSHeader::setDX10Format(uint format) { - //this->pf.flags = 0; + // this->pf.flags = 0; this->pf.fourcc = FOURCC_DX10; this->header10.dxgiFormat = format; } diff --git a/source/blender/imbuf/intern/dds/PixelFormat.h b/source/blender/imbuf/intern/dds/PixelFormat.h index e63b17c89e5..47585147dfb 100644 --- a/source/blender/imbuf/intern/dds/PixelFormat.h +++ b/source/blender/imbuf/intern/dds/PixelFormat.h @@ -95,10 +95,10 @@ inline void maskShiftAndSize(uint mask, uint *shift, uint *size) inline float quantizeCeil(float f, int inbits, int outbits) { - //uint i = f * (float(1 << inbits) - 1); - //i = convert(i, inbits, outbits); - //float result = float(i) / (float(1 << outbits) - 1); - //nvCheck(result >= f); + // uint i = f * (float(1 << inbits) - 1); + // i = convert(i, inbits, outbits); + // float result = float(i) / (float(1 << outbits) - 1); + // nvCheck(result >= f); float result; int offset = 0; do { diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 31649330e11..a98ec2b0f15 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -1913,7 +1913,7 @@ struct ImBuf *imb_load_openexr(const unsigned char *mem, const int width = dw.max.x - dw.min.x + 1; const int height = dw.max.y - dw.min.y + 1; - //printf("OpenEXR-load: image data window %d %d %d %d\n", + // printf("OpenEXR-load: image data window %d %d %d %d\n", // dw.min.x, dw.min.y, dw.max.x, dw.max.y); if (0) { // debug diff --git a/source/blender/imbuf/intern/radiance_hdr.c b/source/blender/imbuf/intern/radiance_hdr.c index d44ce1ac269..58ac966ac30 100644 --- a/source/blender/imbuf/intern/radiance_hdr.c +++ b/source/blender/imbuf/intern/radiance_hdr.c @@ -202,7 +202,7 @@ int imb_is_a_hdr(const unsigned char *buf) /* For recognition, Blender only loads first 32 bytes, so use #?RADIANCE id instead */ /* update: actually, the 'RADIANCE' part is just an optional program name, * the magic word is really only the '#?' part */ - //if (strstr((char *)buf, "#?RADIANCE")) return 1; + // if (strstr((char *)buf, "#?RADIANCE")) return 1; if (strstr((char *)buf, "#?")) { return 1; } @@ -300,9 +300,9 @@ struct ImBuf *imb_loadhdr(const unsigned char *mem, return ibuf; } - //else printf("Data not found!\n"); + // else printf("Data not found!\n"); } - //else printf("Not a valid radiance HDR file!\n"); + // else printf("Not a valid radiance HDR file!\n"); return NULL; } -- cgit v1.2.3