Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-06-26 14:35:18 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-06-26 14:50:48 +0300
commitf1e49038543cf75766f4a220f62cdc6cdbc0e27d (patch)
tree0cec2c64739a6a4ca246fe26bed6fe629ea315cb /source/blender/imbuf
parentfae5a907d4d1380f087f1226ebbd65d9d0718cc6 (diff)
Cleanup: full sentences in comments, improve comment formatting
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r--source/blender/imbuf/intern/dds/ColorBlock.cpp2
-rw-r--r--source/blender/imbuf/intern/dds/DirectDrawSurface.h2
-rw-r--r--source/blender/imbuf/intern/indexer.c2
-rw-r--r--source/blender/imbuf/intern/jp2.c30
-rw-r--r--source/blender/imbuf/intern/targa.c18
-rw-r--r--source/blender/imbuf/intern/thumbs.c2
6 files changed, 28 insertions, 28 deletions
diff --git a/source/blender/imbuf/intern/dds/ColorBlock.cpp b/source/blender/imbuf/intern/dds/ColorBlock.cpp
index 1a67975b5f0..6974e0bf99d 100644
--- a/source/blender/imbuf/intern/dds/ColorBlock.cpp
+++ b/source/blender/imbuf/intern/dds/ColorBlock.cpp
@@ -154,7 +154,7 @@ void ColorBlock::swizzle(uint x, uint y, uint z, uint w)
}
/** Returns true if the block has a single color. */
-bool ColorBlock::isSingleColor(Color32 mask /*= Color32(0xFF, 0xFF, 0xFF, 0x00)*/) const
+bool ColorBlock::isSingleColor(Color32 mask /*= Color32(0xFF, 0xFF, 0xFF, 0x00) */) const
{
uint u = m_color[0].u & mask.u;
diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.h b/source/blender/imbuf/intern/dds/DirectDrawSurface.h
index b63d705dadf..381fa51f75c 100644
--- a/source/blender/imbuf/intern/dds/DirectDrawSurface.h
+++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.h
@@ -120,7 +120,7 @@ struct DDSHeader {
void setHasAlphaFlag(bool b);
void setUserVersion(int version);
- /*void swapBytes();*/
+ // void swapBytes();
bool hasDX10Header() const;
uint signature() const;
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
index a530acb15b0..71137a408d2 100644
--- a/source/blender/imbuf/intern/indexer.c
+++ b/source/blender/imbuf/intern/indexer.c
@@ -1118,7 +1118,7 @@ static AviMovie *alloc_proxy_output_avi(
AviFormat format;
double framerate;
AviMovie *avi;
- /* 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;
diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c
index cf27557d043..117e0d97b2e 100644
--- a/source/blender/imbuf/intern/jp2.c
+++ b/source/blender/imbuf/intern/jp2.c
@@ -41,15 +41,15 @@ static const char J2K_HEAD[] = {0xFF, 0x4F, 0xFF, 0x51, 0x00};
/* We only need this because of how the presets are set */
/* this typedef is copied from 'openjpeg-1.5.0/applications/codec/image_to_j2k.c' */
typedef struct img_folder {
- /** The directory path of the folder containing input images*/
+ /** The directory path of the folder containing input images. */
char *imgdirpath;
- /** Output format*/
+ /** Output format. */
char *out_format;
- /** Enable option*/
+ /** Enable option. */
char set_imgdir;
- /** Enable Cod Format for output*/
+ /** Enable Cod Format for output. */
char set_out_format;
- /** User specified rate stored in case of cinema option*/
+ /** User specified rate stored in case of cinema option. */
float *rates;
} img_fol_t;
@@ -647,10 +647,10 @@ BLI_INLINE int DOWNSAMPLE_FLOAT_TO_16BIT(const float _val)
/* ****************************** COPIED FROM image_to_j2k.c */
/* ----------------------------------------------------------------------- */
-#define CINEMA_24_CS 1302083 /*Codestream length for 24fps*/
-#define CINEMA_48_CS 651041 /*Codestream length for 48fps*/
-#define COMP_24_CS 1041666 /*Maximum size per color component for 2K & 4K @ 24fps*/
-#define COMP_48_CS 520833 /*Maximum size per color component for 2K @ 48fps*/
+#define CINEMA_24_CS 1302083 /* Codestream length for 24fps. */
+#define CINEMA_48_CS 651041 /* Codestream length for 48fps. */
+#define COMP_24_CS 1041666 /* Maximum size per color component for 2K & 4K @ 24fps. */
+#define COMP_48_CS 520833 /* Maximum size per color component for 2K @ 48fps. */
static int init_4K_poc(opj_poc_t *POC, int numres)
{
@@ -677,22 +677,22 @@ static void cinema_parameters(opj_cparameters_t *parameters)
parameters->cp_tdx = 1;
parameters->cp_tdy = 1;
- /*Tile part*/
+ /* Tile part. */
parameters->tp_flag = 'C';
parameters->tp_on = 1;
- /*Tile and Image shall be at (0, 0)*/
+ /* Tile and Image shall be at (0, 0). */
parameters->cp_tx0 = 0;
parameters->cp_ty0 = 0;
parameters->image_offset_x0 = 0;
parameters->image_offset_y0 = 0;
- /*Codeblock size = 32 * 32*/
+ /* Codeblock size = 32 * 32. */
parameters->cblockw_init = 32;
parameters->cblockh_init = 32;
parameters->csty |= 0x01;
- /*The progression order shall be CPRL*/
+ /* The progression order shall be CPRL. */
parameters->prog_order = OPJ_CPRL;
/* No ROI */
@@ -1118,7 +1118,7 @@ static opj_image_t *ibuftoimage(ImBuf *ibuf, opj_cparameters_t *parameters)
}
}
else {
- /* just use rect*/
+ /* Just use rect. */
switch (prec) {
case 8:
if (numcomps == 4) {
@@ -1223,7 +1223,7 @@ bool imb_save_jp2_stream(struct ImBuf *ibuf, opj_stream_t *stream, int UNUSED(fl
/* compression ratio */
/* invert range, from 10-100, 100-1
- * where jpeg see's 1 and highest quality (lossless) and 100 is very low quality*/
+ * Where jpeg see's 1 and highest quality (lossless) and 100 is very low quality. */
parameters.tcp_rates[0] = ((100 - quality) / 90.0f * 99.0f) + 1;
parameters.tcp_numlayers = 1; /* only one resolution */
diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c
index 1fde173b4cf..2a7a189dd2b 100644
--- a/source/blender/imbuf/intern/targa.c
+++ b/source/blender/imbuf/intern/targa.c
@@ -465,7 +465,7 @@ static void decodetarga(struct ImBuf *ibuf, const unsigned char *mem, size_t mem
}
if (count >= 128) {
- /*if (count == 128) printf("TARGA: 128 in file !\n");*/
+ // if (count == 128) printf("TARGA: 128 in file !\n");
count -= 127;
if (psize & 2) {
@@ -475,14 +475,14 @@ static void decodetarga(struct ImBuf *ibuf, const unsigned char *mem, size_t mem
cp[1] = mem[0];
cp[2] = mem[1];
cp[3] = mem[2];
- /*col = (mem[3] << 24) + (mem[0] << 16) + (mem[1] << 8) + mem[2];*/
+ // col = (mem[3] << 24) + (mem[0] << 16) + (mem[1] << 8) + mem[2];
mem += 4;
}
else {
cp[1] = mem[0];
cp[2] = mem[1];
cp[3] = mem[2];
- /*col = 0xff000000 + (mem[0] << 16) + (mem[1] << 8) + mem[2];*/
+ // col = 0xff000000 + (mem[0] << 16) + (mem[1] << 8) + mem[2];
mem += 3;
}
}
@@ -517,14 +517,14 @@ static void decodetarga(struct ImBuf *ibuf, const unsigned char *mem, size_t mem
cp[1] = mem[0];
cp[2] = mem[1];
cp[3] = mem[2];
- /*col = (mem[3] << 24) + (mem[0] << 16) + (mem[1] << 8) + mem[2];*/
+ // col = (mem[3] << 24) + (mem[0] << 16) + (mem[1] << 8) + mem[2];
mem += 4;
}
else {
cp[1] = mem[0];
cp[2] = mem[1];
cp[3] = mem[2];
- /*col = 0xff000000 + (mem[0] << 16) + (mem[1] << 8) + mem[2];*/
+ // col = 0xff000000 + (mem[0] << 16) + (mem[1] << 8) + mem[2];
mem += 3;
}
}
@@ -594,7 +594,7 @@ static void ldtarga(struct ImBuf *ibuf, const unsigned char *mem, size_t mem_siz
cp[1] = mem[0];
cp[2] = mem[1];
cp[3] = mem[2];
- /*col = (mem[3] << 24) + (mem[0] << 16) + (mem[1] << 8) + mem[2];*/
+ // col = (mem[3] << 24) + (mem[0] << 16) + (mem[1] << 8) + mem[2];
mem += 4;
}
else {
@@ -602,7 +602,7 @@ static void ldtarga(struct ImBuf *ibuf, const unsigned char *mem, size_t mem_siz
cp[1] = mem[0];
cp[2] = mem[1];
cp[3] = mem[2];
- /*col = 0xff000000 + (mem[0] << 16) + (mem[1] << 8) + mem[2];*/
+ // col = 0xff000000 + (mem[0] << 16) + (mem[1] << 8) + mem[2];
mem += 3;
}
}
@@ -663,8 +663,8 @@ ImBuf *imb_loadtarga(const unsigned char *mem,
cp[1] = cp[2] = 0;
if (tga.mapsize) {
- /* load color map */
- /*mincol = tga.maporig;*/ /*UNUSED*/
+ /* Load color map. */
+ // mincol = tga.maporig; /* UNUSED */
cmap_max = tga.mapsize;
cmap = MEM_callocN(sizeof(unsigned int) * cmap_max, "targa cmap");
diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c
index d38c300a4c4..db80d168e53 100644
--- a/source/blender/imbuf/intern/thumbs.c
+++ b/source/blender/imbuf/intern/thumbs.c
@@ -88,7 +88,7 @@ static bool get_thumb_dir(char *dir, ThumbSize size)
const char *subdir;
#ifdef WIN32
wchar_t dir_16[MAX_PATH];
- /* yes, applications shouldn't store data there, but so does GIMP :)*/
+ /* Yes, applications shouldn't store data there, but so does GIMP :). */
SHGetSpecialFolderPathW(0, dir_16, CSIDL_PROFILE, 0);
conv_utf_16_to_8(dir_16, dir, FILE_MAX);
s += strlen(dir);