diff options
Diffstat (limited to 'source/blender/imbuf/intern')
-rw-r--r-- | source/blender/imbuf/intern/dds/BlockDXT.cpp | 18 | ||||
-rw-r--r-- | source/blender/imbuf/intern/dds/DirectDrawSurface.cpp | 6 | ||||
-rw-r--r-- | source/blender/imbuf/intern/indexer.c | 8 | ||||
-rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/thumbs.c | 2 |
5 files changed, 19 insertions, 17 deletions
diff --git a/source/blender/imbuf/intern/dds/BlockDXT.cpp b/source/blender/imbuf/intern/dds/BlockDXT.cpp index 9211f6a7ba6..f960faee1ab 100644 --- a/source/blender/imbuf/intern/dds/BlockDXT.cpp +++ b/source/blender/imbuf/intern/dds/BlockDXT.cpp @@ -53,9 +53,9 @@ #include <ColorBlock.h> #include <BlockDXT.h> -/*---------------------------------------------------------------------------- - BlockDXT1 -----------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------- + * BlockDXT1 + * --------------------------------------------------------------------------*/ uint BlockDXT1::evaluatePalette(Color32 color_array[4]) const { @@ -262,9 +262,9 @@ inline void BlockDXT1::flip2() swap(row[0], row[1]); } -/*---------------------------------------------------------------------------- - BlockDXT3 -----------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------- + * BlockDXT3 + * ---------------------------------------------------------------------------*/ void BlockDXT3::decodeBlock(ColorBlock *block) const { @@ -328,9 +328,9 @@ void BlockDXT3::flip2() color.flip2(); } -/*---------------------------------------------------------------------------- - BlockDXT5 -----------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------- + * BlockDXT5 + * ---------------------------------------------------------------------------*/ void AlphaBlockDXT5::evaluatePalette(uint8 alpha[8]) const { diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp index 3db9b65c461..89fe3bf5f25 100644 --- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp +++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp @@ -721,9 +721,11 @@ 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); - /*if (this->pf.fourcc) { +#if 0 + if (this->pf.fourcc) { this->pf.flags |= DDPF_FOURCC; - }*/ + } +#endif if (!(bitcount > 0 && bitcount <= 32)) { printf("DDS: bad bit count, pixel format not set\n"); diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index 106c04f39f6..ccab0164df7 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -305,8 +305,8 @@ void IMB_indexer_close(struct anim_index *idx) int IMB_proxy_size_to_array_index(IMB_Proxy_Size pr_size) { switch (pr_size) { - case IMB_PROXY_NONE: /* if we got here, something is broken anyways, - * so sane defaults... */ + case IMB_PROXY_NONE: + /* if we got here, something is broken anyways, so sane defaults... */ return 0; case IMB_PROXY_25: return 0; @@ -981,8 +981,8 @@ static AviMovie *alloc_proxy_output_avi( AviFormat format; double framerate; AviMovie *avi; - short frs_sec = 25; /* it doesn't really matter for proxies, - * but sane defaults help anyways...*/ + /* it doesn't really matter for proxies, but sane defaults help anyways...*/ + short frs_sec = 25; float frs_sec_base = 1.0; IMB_anim_get_fps(anim, &frs_sec, &frs_sec_base, false); diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index d0f550feb0d..4e801c8e3aa 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -1094,7 +1094,7 @@ void IMB_exrtile_write_channels( for (echan = (ExrChannel *)data->channels.first; echan; echan = echan->next) { /* eventually we can make the parts' channels to include - only the current view TODO */ + * only the current view TODO */ if (strcmp(viewname, echan->m->view.c_str()) != 0) continue; diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c index fc5bfe42d60..6341192c40c 100644 --- a/source/blender/imbuf/intern/thumbs.c +++ b/source/blender/imbuf/intern/thumbs.c @@ -60,7 +60,7 @@ # define _WIN32_IE 0x0400 # endif /* For SHGetSpecialFolderPath, has to be done before BLI_winstuff - * because 'near' is disabled through BLI_windstuff */ + * because 'near' is disabled through BLI_windstuff */ # include <shlobj.h> # include <direct.h> /* chdir */ # include "BLI_winstuff.h" |