[Bf-blender-cvs] [e74bd46ede9] master: Cleanup: trailing space for imbuf module

Campbell Barton noreply at git.blender.org
Sun Jun 17 17:07:13 CEST 2018


Commit: e74bd46ede9a957c03821e36b80ad2d2f378bf73
Author: Campbell Barton
Date:   Sun Jun 17 17:04:54 2018 +0200
Branches: master
https://developer.blender.org/rBe74bd46ede9a957c03821e36b80ad2d2f378bf73

Cleanup: trailing space for imbuf module

===================================================================

M	source/blender/imbuf/CMakeLists.txt
M	source/blender/imbuf/IMB_imbuf.h
M	source/blender/imbuf/intern/IMB_anim.h
M	source/blender/imbuf/intern/IMB_indexer.h
M	source/blender/imbuf/intern/allocimbuf.c
M	source/blender/imbuf/intern/anim_movie.c
M	source/blender/imbuf/intern/bmp.c
M	source/blender/imbuf/intern/cache.c
M	source/blender/imbuf/intern/cineon/CMakeLists.txt
M	source/blender/imbuf/intern/cineon/cineon_dpx.c
M	source/blender/imbuf/intern/cineon/logImageCore.c
M	source/blender/imbuf/intern/colormanagement.c
M	source/blender/imbuf/intern/dds/BlockDXT.cpp
M	source/blender/imbuf/intern/dds/BlockDXT.h
M	source/blender/imbuf/intern/dds/CMakeLists.txt
M	source/blender/imbuf/intern/dds/Color.h
M	source/blender/imbuf/intern/dds/ColorBlock.cpp
M	source/blender/imbuf/intern/dds/ColorBlock.h
M	source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
M	source/blender/imbuf/intern/dds/DirectDrawSurface.h
M	source/blender/imbuf/intern/dds/Image.h
M	source/blender/imbuf/intern/dds/PixelFormat.h
M	source/blender/imbuf/intern/dds/dds_api.cpp
M	source/blender/imbuf/intern/divers.c
M	source/blender/imbuf/intern/filter.c
M	source/blender/imbuf/intern/imageprocess.c
M	source/blender/imbuf/intern/imbuf.h
M	source/blender/imbuf/intern/indexer.c
M	source/blender/imbuf/intern/iris.c
M	source/blender/imbuf/intern/jp2.c
M	source/blender/imbuf/intern/jpeg.c
M	source/blender/imbuf/intern/openexr/CMakeLists.txt
M	source/blender/imbuf/intern/openexr/openexr_api.cpp
M	source/blender/imbuf/intern/openexr/openexr_api.h
M	source/blender/imbuf/intern/png.c
M	source/blender/imbuf/intern/radiance_hdr.c
M	source/blender/imbuf/intern/rectop.c
M	source/blender/imbuf/intern/rotate.c
M	source/blender/imbuf/intern/scaling.c
M	source/blender/imbuf/intern/targa.c
M	source/blender/imbuf/intern/thumbs.c
M	source/blender/imbuf/intern/thumbs_blend.c
M	source/blender/imbuf/intern/tiff.c
M	source/blender/imbuf/intern/util.c
M	source/blender/imbuf/readme.txt

===================================================================

diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index e73f227dec8..44ff53cc020 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -23,7 +23,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-set(INC 
+set(INC
 	.
 	../blenkernel
 	../blenlib
@@ -83,7 +83,7 @@ set(SRC
 	intern/IMB_filter.h
 	intern/IMB_indexer.h
 	intern/imbuf.h
-	
+
 	# orphan include
 	../../../intern/ffmpeg/ffmpeg_compat.h
 )
diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h
index 4289f98643d..75f8df99e63 100644
--- a/source/blender/imbuf/IMB_imbuf.h
+++ b/source/blender/imbuf/IMB_imbuf.h
@@ -217,7 +217,7 @@ void IMB_blend_color_byte(unsigned char dst[4], unsigned char src1[4],
 void IMB_blend_color_float(float dst[4], float src1[4], float src2[4],
 	IMB_BlendMode mode);
 
-void IMB_rectclip(struct ImBuf *dbuf, struct ImBuf *sbuf, int *destx, 
+void IMB_rectclip(struct ImBuf *dbuf, struct ImBuf *sbuf, int *destx,
 	int *desty, int *srcx, int *srcy, int *width, int *height);
 void IMB_rectcpy(struct ImBuf *drect, struct ImBuf *srect, int destx,
 	int desty, int srcx, int srcy, int width, int height);
@@ -322,7 +322,7 @@ int IMB_anim_get_preseek(struct anim *anim);
 
 struct ImBuf *IMB_anim_absolute(
 	struct anim *anim, int position,
-	IMB_Timecode_Type tc        /* = 1 = IMB_TC_RECORD_RUN */, 
+	IMB_Timecode_Type tc        /* = 1 = IMB_TC_RECORD_RUN */,
 	IMB_Proxy_Size preview_size /* = 0 = IMB_PROXY_NONE */);
 
 /**
@@ -433,7 +433,7 @@ bool IMB_isfloat(struct ImBuf *ibuf);
 void IMB_de_interlace(struct ImBuf *ibuf);
 void IMB_interlace(struct ImBuf *ibuf);
 
-/* create char buffer, color corrected if necessary, for ImBufs that lack one */ 
+/* create char buffer, color corrected if necessary, for ImBufs that lack one */
 void IMB_rect_from_float(struct ImBuf *ibuf);
 /* Create char buffer for part of the image, color corrected if necessary,
  * Changed part will be stored in buffer. This is expected to be used for texture painting updates */
diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h
index 6fa31e122cc..804095a0727 100644
--- a/source/blender/imbuf/intern/IMB_anim.h
+++ b/source/blender/imbuf/intern/IMB_anim.h
@@ -103,7 +103,7 @@ struct anim {
 	int frs_sec;
 	double frs_sec_base;
 	int x, y;
-	
+
 	/* for number */
 	char name[1024];
 	/* for sequence */
@@ -113,12 +113,12 @@ struct anim {
 	void *movie;
 	void *track;
 	void *params;
-	int orientation; 
+	int orientation;
 	size_t framesize;
 	int interlacing;
 	int preseek;
 	int streamindex;
-	
+
 	/* avi */
 	struct _AviMovie *avi;
 
@@ -153,7 +153,7 @@ struct anim {
 
 	int proxies_tried;
 	int indices_tried;
-	
+
 	struct anim *proxy_anim[IMB_PROXY_MAX_SLOT];
 	struct anim_index *curr_idx[IMB_TC_MAX_SLOT];
 
diff --git a/source/blender/imbuf/intern/IMB_indexer.h b/source/blender/imbuf/intern/IMB_indexer.h
index bac46740f0f..024801cb870 100644
--- a/source/blender/imbuf/intern/IMB_indexer.h
+++ b/source/blender/imbuf/intern/IMB_indexer.h
@@ -109,7 +109,7 @@ unsigned long long IMB_indexer_get_seek_pos_dts(
 	struct anim_index *idx, int frameno_index);
 
 int IMB_indexer_get_frame_index(struct anim_index *idx, int frameno);
-unsigned long long IMB_indexer_get_pts(struct anim_index *idx, 
+unsigned long long IMB_indexer_get_pts(struct anim_index *idx,
                                        int frame_index);
 int IMB_indexer_get_duration(struct anim_index *idx);
 
diff --git a/source/blender/imbuf/intern/allocimbuf.c b/source/blender/imbuf/intern/allocimbuf.c
index faa0b5f7b6e..589955d2ab3 100644
--- a/source/blender/imbuf/intern/allocimbuf.c
+++ b/source/blender/imbuf/intern/allocimbuf.c
@@ -106,14 +106,14 @@ void imb_freemipmapImBuf(ImBuf *ibuf)
 void imb_freerectfloatImBuf(ImBuf *ibuf)
 {
 	if (ibuf == NULL) return;
-	
+
 	if (ibuf->rect_float && (ibuf->mall & IB_rectfloat)) {
 		MEM_freeN(ibuf->rect_float);
 		ibuf->rect_float = NULL;
 	}
 
 	imb_freemipmapImBuf(ibuf);
-	
+
 	ibuf->rect_float = NULL;
 	ibuf->mall &= ~IB_rectfloat;
 }
@@ -126,7 +126,7 @@ void imb_freerectImBuf(ImBuf *ibuf)
 	if (ibuf->rect && (ibuf->mall & IB_rect))
 		MEM_freeN(ibuf->rect);
 	ibuf->rect = NULL;
-	
+
 	imb_freemipmapImBuf(ibuf);
 
 	ibuf->mall &= ~IB_rect;
@@ -266,30 +266,30 @@ ImBuf *IMB_makeSingleUser(ImBuf *ibuf)
 bool addzbufImBuf(ImBuf *ibuf)
 {
 	if (ibuf == NULL) return false;
-	
+
 	IMB_freezbufImBuf(ibuf);
-	
+
 	if ((ibuf->zbuf = imb_alloc_pixels(ibuf->x, ibuf->y, 1, sizeof(unsigned int), __func__))) {
 		ibuf->mall |= IB_zbuf;
 		ibuf->flags |= IB_zbuf;
 		return true;
 	}
-	
+
 	return false;
 }
 
 bool addzbuffloatImBuf(ImBuf *ibuf)
 {
 	if (ibuf == NULL) return false;
-	
+
 	IMB_freezbuffloatImBuf(ibuf);
-	
+
 	if ((ibuf->zbuf_float = imb_alloc_pixels(ibuf->x, ibuf->y, 1, sizeof(float), __func__))) {
 		ibuf->mall |= IB_zbuffloat;
 		ibuf->flags |= IB_zbuffloat;
 		return true;
 	}
-	
+
 	return false;
 }
 
@@ -372,17 +372,17 @@ void *imb_alloc_pixels(unsigned int x,
 bool imb_addrectfloatImBuf(ImBuf *ibuf)
 {
 	if (ibuf == NULL) return false;
-	
+
 	if (ibuf->rect_float)
 		imb_freerectfloatImBuf(ibuf);  /* frees mipmap too, hrm */
-	
+
 	ibuf->channels = 4;
 	if ((ibuf->rect_float = imb_alloc_pixels(ibuf->x, ibuf->y, 4, sizeof(float), __func__))) {
 		ibuf->mall |= IB_rectfloat;
 		ibuf->flags |= IB_rectfloat;
 		return true;
 	}
-	
+
 	return false;
 }
 
@@ -390,12 +390,12 @@ bool imb_addrectfloatImBuf(ImBuf *ibuf)
 bool imb_addrectImBuf(ImBuf *ibuf)
 {
 	if (ibuf == NULL) return false;
-	
+
 	/* don't call imb_freerectImBuf, it frees mipmaps, this call is used only too give float buffers display */
 	if (ibuf->rect && (ibuf->mall & IB_rect))
 		MEM_freeN(ibuf->rect);
 	ibuf->rect = NULL;
-	
+
 	if ((ibuf->rect = imb_alloc_pixels(ibuf->x, ibuf->y, 4, sizeof(unsigned char), __func__))) {
 		ibuf->mall |= IB_rect;
 		ibuf->flags |= IB_rect;
@@ -511,7 +511,7 @@ ImBuf *IMB_dupImBuf(const ImBuf *ibuf1)
 	ImBuf *ibuf2, tbuf;
 	int flags = 0;
 	int a, x, y;
-	
+
 	if (ibuf1 == NULL) return NULL;
 
 	if (ibuf1->rect) flags |= IB_rect;
@@ -522,13 +522,13 @@ ImBuf *IMB_dupImBuf(const ImBuf *ibuf1)
 	x = ibuf1->x;
 	y = ibuf1->y;
 	if (ibuf1->flags & IB_fields) y *= 2;
-	
+
 	ibuf2 = IMB_allocImBuf(x, y, ibuf1->planes, flags);
 	if (ibuf2 == NULL) return NULL;
 
 	if (flags & IB_rect)
 		memcpy(ibuf2->rect, ibuf1->rect, ((size_t)x) * y * sizeof(int));
-	
+
 	if (flags & IB_rectfloat)
 		memcpy(ibuf2->rect_float, ibuf1->rect_float, ((size_t)ibuf1->channels) * x * y * sizeof(float));
 
@@ -550,7 +550,7 @@ ImBuf *IMB_dupImBuf(const ImBuf *ibuf1)
 
 	/* silly trick to copy the entire contents of ibuf1 struct over to ibuf */
 	tbuf = *ibuf1;
-	
+
 	/* fix pointers */
 	tbuf.rect          = ibuf2->rect;
 	tbuf.rect_float    = ibuf2->rect_float;
@@ -560,7 +560,7 @@ ImBuf *IMB_dupImBuf(const ImBuf *ibuf1)
 	for (a = 0; a < IMB_MIPMAP_LEVELS; a++)
 		tbuf.mipmap[a] = NULL;
 	tbuf.dds_data.data = NULL;
-	
+
 	/* set malloc flag */
 	tbuf.mall               = ibuf2->mall;
 	tbuf.c_handle           = NULL;
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index f842b69418e..290226acf78 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -325,7 +325,7 @@ static int startavi(struct anim *anim)
 				if (AVIFileGetStream(anim->pfile, &anim->pavi[i], 0L, i) != AVIERR_OK) {
 					break;
 				}
-				
+
 				AVIStreamInfo(anim->pavi[i], &avis, sizeof(avis));
 				if ((avis.fccType == streamtypeVIDEO) && (firstvideo == -1)) {
 					if (streamcount > 0) {
@@ -382,7 +382,7 @@ static int startavi(struct anim *anim)
 		free_anim_avi(anim);
 		return -1;
 	}
-	
+
 	anim->duration = anim->avi->header->TotalFrames;
 	anim->params = NULL;
 
@@ -407,7 +407,7 @@ static ImBuf *avi_fetchibuf(struct anim *anim, int position)
 	ImBuf *ibuf = NULL;
 	int *tmp;
 	int y;
-	
+
 	if (anim == NULL) {
 		return NULL;
 	}
@@ -431,7 +431,7 @@ static ImBuf *avi_fetchibuf(struct anim *anim, int position)
 
 		tmp = AVI_read_frame(anim->avi, AVI_FORMAT_RGB32, position,
 		                     AVI_get_stream(anim->avi, AVIST_VIDEO, 0));
-		
+
 		if (tmp == NULL) {
 			printf("Error reading frame from AVI: '%s'\n", anim->name);
 			IMB_freeImBuf(ibuf);
@@ -442,10 +442,10 @@ static ImBuf *avi_fetchibuf(struct anim *anim, int position)
 			memcpy(&(ibuf->rect)[((anim->y - y) - 1) * anim->x],  &tmp[y * anim->x],
 			       anim->x * 4);
 		}
-		
+
 		MEM_freeN(tmp);
 	}
-	
+
 	ibuf->rect_colorspace = colormanage_colorspace_get_named(anim->colorspace);
 
 	return ibuf;
@@ -619,7 +619,7 @@ static int startffmpeg(struct anim *anim)
 		                               anim->pCodecCtx->width,
 		                               anim->pCodecCtx->height),
 		                           "ffmpeg deinterlace"),
-		               anim->pCodecCtx->pix_fmt, 
+		               anim->pCodecCtx->pix_fmt,
 		               anim->pCodecCtx->width,
 		               anim->pCodecCtx->height);
 	}
@@ -630,7 +630,7 @@ static int startffmpeg(struct anim *anim)
 	else {
 		anim->preseek = 0;
 	}
-	
+
 	anim->img_convert_ctx = sws_getContext(
 	        anim->x,
 	        anim->y,
@@ -640,7 +640,7 @@ static int startffmpeg(struct anim *anim)
 	        AV_PIX_FMT_RGBA,
 	        SWS_FAST_BILINEAR | SWS_PRINT_INFO | SWS_FULL_CHR_H_INT,
 	        NULL, NULL, NULL);
-		
+
 	if (!anim->img_convert_ctx) {
 		fprintf(stderr,
 		        "Can't transform color space??? Bailing out...\n");
@@ -671,7 +671,7 @@ static int startffmpeg(struct anim *anim)
 		fprintf(stderr, "Warning: Could not set libswscale colorspace details.\n");
 	}
 #endif
-		
+
 	return (0);
 }
 
@@ -691,7 +691,7 @@ static void ffmpeg_postprocess(struct anim *anim)
 		return;
 	}
 
-	/* This means the data wasnt read properly, 
+	/* This means the data wasnt read properly,
 	 * this check stops crashing */
 	if (input->data[0] == 0 && input->data[1] == 0 &&
 	    input->data[2] == 0 && input->data[3] == 0)
@@ -701,7 +701,7 @@ static void ffmpeg_postprocess(struct anim *anim)
 		return;
 	}
 
-	av_log(anim->pFormatCtx, AV_LOG_DEBUG, 
+	av_log(anim->pFormatCtx, AV_LOG_DEBUG,
 	       "  POSTPROC: anim

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list