[Bf-blender-cvs] [a24b4e60900] master: Cleanup: trailing space for remaining source/
Campbell Barton
noreply at git.blender.org
Sun Jun 17 17:07:21 CEST 2018
Commit: a24b4e6090057479796e914bc603119b12f6ca06
Author: Campbell Barton
Date: Sun Jun 17 17:06:28 2018 +0200
Branches: master
https://developer.blender.org/rBa24b4e6090057479796e914bc603119b12f6ca06
Cleanup: trailing space for remaining source/
===================================================================
M source/blender/alembic/intern/abc_exporter.cc
M source/blender/alembic/intern/abc_mesh.h
M source/blender/avi/AVI_avi.h
M source/blender/avi/CMakeLists.txt
M source/blender/avi/intern/avi.c
M source/blender/avi/intern/avi_mjpeg.c
M source/blender/avi/intern/avi_options.c
M source/blender/avi/intern/avi_rgb.c
M source/blender/avi/intern/avi_rgb32.c
M source/blenderplayer/CMakeLists.txt
M source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
M source/creator/CMakeLists.txt
M source/creator/creator.c
M source/tools
===================================================================
diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc
index 7e8f4e3cd15..6c1eeb9854f 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -396,7 +396,7 @@ void AbcExporter::exploreTransform(EvaluationContext *eval_ctx, Object *ob, Obje
DupliObject *link = static_cast<DupliObject *>(lb->first);
Object *dupli_ob = NULL;
Object *dupli_parent = NULL;
-
+
for (; link; link = link->next) {
/* This skips things like custom bone shapes. */
if (m_settings.renderable_only && link->no_draw) {
@@ -505,7 +505,7 @@ void AbcExporter::exploreObject(EvaluationContext *eval_ctx, Object *ob, Object
}
createShapeWriter(ob, dupliObParent);
-
+
ListBase *lb = object_duplilist(m_bmain, eval_ctx, m_scene, ob);
if (lb) {
@@ -563,7 +563,7 @@ void AbcExporter::createShapeWriter(Object *ob, Object *dupliObParent)
else {
name = get_object_dag_path_name(ob, dupliObParent);
}
-
+
AbcTransformWriter *xform = getXForm(name);
if (!xform) {
diff --git a/source/blender/alembic/intern/abc_mesh.h b/source/blender/alembic/intern/abc_mesh.h
index 77c352d7cd3..70d92f894d2 100644
--- a/source/blender/alembic/intern/abc_mesh.h
+++ b/source/blender/alembic/intern/abc_mesh.h
@@ -81,7 +81,7 @@ private:
void writeArbGeoParams(DerivedMesh *dm);
void getGeoGroups(DerivedMesh *dm, std::map<std::string, std::vector<int32_t> > &geoGroups);
-
+
/* fluid surfaces support */
void getVelocities(DerivedMesh *dm, std::vector<Imath::V3f> &vels);
diff --git a/source/blender/avi/AVI_avi.h b/source/blender/avi/AVI_avi.h
index 5e9fe378c38..210195234be 100644
--- a/source/blender/avi/AVI_avi.h
+++ b/source/blender/avi/AVI_avi.h
@@ -68,7 +68,7 @@ typedef struct _AviList {
typedef struct _AviMainHeader {
int fcc;
- int size;
+ int size;
int MicroSecPerFrame; /* MicroSecPerFrame - timing between frames */
int MaxBytesPerSec; /* MaxBytesPerSec - approx bps system must handle */
int PaddingGranularity;
@@ -79,7 +79,7 @@ typedef struct _AviMainHeader {
#define AVIF_TRUSTCKTYPE 0x00000800
#define AVIF_WASCAPTUREFILE 0x00010000 /* specially allocated used for capturing real time video */
#define AVIF_COPYRIGHTED 0x00020000 /* contains copyrighted data */
-
+
int TotalFrames;
int InitialFrames; /* InitialFrames - initial frame before interleaving */
int Streams;
@@ -91,18 +91,18 @@ typedef struct _AviMainHeader {
typedef struct _AviStreamHeader {
int fcc;
- int size;
+ int size;
int Type;
#define AVIST_VIDEO FCC("vids")
#define AVIST_AUDIO FCC("auds")
#define AVIST_MIDI FCC("mids")
#define AVIST_TEXT FCC("txts")
-
+
int Handler;
int Flags;
#define AVISF_DISABLED 0x00000001
#define AVISF_VIDEO_PALCHANGES 0x00010000
-
+
short Priority;
short Language;
int InitialFrames;
@@ -121,7 +121,7 @@ typedef struct _AviStreamHeader {
typedef struct _AviBitmapInfoHeader {
int fcc;
- int size;
+ int size;
int Size;
int Width;
int Height;
@@ -149,7 +149,7 @@ typedef struct _AviIndexEntry {
int ChunkId;
int Flags;
#define AVIIF_LIST 0x00000001
-#define AVIIF_KEYFRAME 0x00000010
+#define AVIIF_KEYFRAME 0x00000010
#define AVIIF_NO_TIME 0x00000100
#define AVIIF_COMPRESSOR 0x0FFF0000
int Offset;
@@ -178,22 +178,22 @@ typedef struct _AviStreamRec {
typedef struct _AviMovie {
FILE *fp;
-
+
int type;
#define AVI_MOVIE_READ 0
#define AVI_MOVIE_WRITE 1
-
+
int64_t size;
AviMainHeader *header;
AviStreamRec *streams;
AviIndexEntry *entries;
int index_entries;
-
+
int64_t movi_offset;
int64_t read_offset;
int64_t *offset_table;
-
+
/* Local data goes here */
int interlace;
int odd_fields;
@@ -214,7 +214,7 @@ typedef enum {
/* belongs to the option-setting function. */
typedef enum {
AVI_OPTION_WIDTH = 0,
- AVI_OPTION_HEIGHT,
+ AVI_OPTION_HEIGHT,
AVI_OPTION_QUALITY,
AVI_OPTION_FRAMERATE
} AviOption;
diff --git a/source/blender/avi/CMakeLists.txt b/source/blender/avi/CMakeLists.txt
index 5009bd2a30b..d019863faa5 100644
--- a/source/blender/avi/CMakeLists.txt
+++ b/source/blender/avi/CMakeLists.txt
@@ -23,7 +23,7 @@
#
# ***** END GPL LICENSE BLOCK *****
-set(INC
+set(INC
.
../blenlib
../imbuf
diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c
index 6695998fd35..2d8a0b0038f 100644
--- a/source/blender/avi/intern/avi.c
+++ b/source/blender/avi/intern/avi.c
@@ -210,7 +210,7 @@ bool AVI_is_avi(char *name)
{
FILE *fp;
int ret;
-
+
fp = BLI_fopen(name, "rb");
if (fp == NULL)
return 0;
@@ -237,7 +237,7 @@ bool AVI_is_avi(const char *name)
AviMainHeader header;
AviBitmapInfoHeader bheader;
int movie_tracks = 0;
-
+
DEBUG_PRINT("opening movie\n");
movie.type = AVI_MOVIE_READ;
@@ -267,7 +267,7 @@ bool AVI_is_avi(const char *name)
fclose(movie.fp);
return 0;
}
-
+
movie.header->MicroSecPerFrame = GET_FCC(movie.fp);
movie.header->MaxBytesPerSec = GET_FCC(movie.fp);
movie.header->PaddingGranularity = GET_FCC(movie.fp);
@@ -292,7 +292,7 @@ bool AVI_is_avi(const char *name)
fclose(movie.fp);
return 0;
}
-
+
movie.streams = (AviStreamRec *) MEM_calloc_arrayN(movie.header->Streams, sizeof(AviStreamRec), "moviestreams");
for (temp = 0; temp < movie.header->Streams; temp++) {
@@ -304,7 +304,7 @@ bool AVI_is_avi(const char *name)
!(movie.streams[temp].sh.size = GET_FCC(movie.fp)))
{
DEBUG_PRINT("bad stream header information\n");
-
+
MEM_freeN(movie.streams);
fclose(movie.fp);
return 0;
@@ -314,7 +314,7 @@ bool AVI_is_avi(const char *name)
movie.streams[temp].sh.Handler = GET_FCC(movie.fp);
fcca = movie.streams[temp].sh.Handler;
-
+
if (movie.streams[temp].sh.Type == FCC("vids")) {
if (fcca == FCC("DIB ") ||
fcca == FCC("RGB ") ||
@@ -334,7 +334,7 @@ bool AVI_is_avi(const char *name)
}
movie_tracks++;
}
-
+
movie.streams[temp].sh.Flags = GET_FCC(movie.fp);
movie.streams[temp].sh.Priority = GET_TCC(movie.fp);
movie.streams[temp].sh.Language = GET_TCC(movie.fp);
@@ -365,10 +365,10 @@ bool AVI_is_avi(const char *name)
j = movie.streams[temp].sf_size - (sizeof(AviBitmapInfoHeader) - 8);
if (j >= 0) {
AviBitmapInfoHeader *bi;
-
+
movie.streams[temp].sf = &bheader;
bi = (AviBitmapInfoHeader *) movie.streams[temp].sf;
-
+
bi->fcc = FCC("strf");
bi->size = movie.streams[temp].sf_size;
bi->Size = GET_FCC(movie.fp);
@@ -382,7 +382,7 @@ bool AVI_is_avi(const char *name)
bi->YPelsPerMeter = GET_FCC(movie.fp);
bi->ClrUsed = GET_FCC(movie.fp);
bi->ClrImportant = GET_FCC(movie.fp);
-
+
fcca = bi->Compression;
if (movie.streams[temp].format == AVI_FORMAT_AVI_RGB) {
@@ -418,7 +418,7 @@ bool AVI_is_avi(const char *name)
temp = GET_FCC(movie.fp);
if (temp < 0 || ftell(movie.fp) > movie.size) {
DEBUG_PRINT("incorrect size in header or error in AVI\n");
-
+
MEM_freeN(movie.streams);
fclose(movie.fp);
return 0;
@@ -428,19 +428,19 @@ bool AVI_is_avi(const char *name)
fseek(movie.fp, -4L, SEEK_CUR);
}
-
+
MEM_freeN(movie.streams);
fclose(movie.fp);
/* at least one video track is needed */
- return (movie_tracks != 0);
+ return (movie_tracks != 0);
}
AviError AVI_open_movie(const char *name, AviMovie *movie)
{
int temp, fcca, size, j;
-
+
DEBUG_PRINT("opening movie\n");
memset(movie, 0, sizeof(AviMovie));
@@ -470,7 +470,7 @@ AviError AVI_open_movie(const char *name, AviMovie *movie)
DEBUG_PRINT("bad initial header info\n");
return AVI_ERROR_FORMAT;
}
-
+
movie->header->MicroSecPerFrame = GET_FCC(movie->fp);
movie->header->MaxBytesPerSec = GET_FCC(movie->fp);
movie->header->PaddingGranularity = GET_FCC(movie->fp);
@@ -494,7 +494,7 @@ AviError AVI_open_movie(const char *name, AviMovie *movie)
DEBUG_PRINT("Number of streams should be in range 1-65536\n");
return AVI_ERROR_FORMAT;
}
-
+
movie->streams = (AviStreamRec *) MEM_calloc_arrayN(movie->header->Streams, sizeof(AviStreamRec), "moviestreams");
for (temp = 0; temp < movie->header->Streams; temp++) {
@@ -513,7 +513,7 @@ AviError AVI_open_movie(const char *name, AviMovie *movie)
movie->streams[temp].sh.Handler = GET_FCC(movie->fp);
fcca = movie->streams[temp].sh.Handler;
-
+
if (movie->streams[temp].sh.Type == FCC("vids")) {
if (fcca == FCC("DIB ") ||
fcca == FCC("RGB ") ||
@@ -530,7 +530,7 @@ AviError AVI_open_movie(const char *name, AviMovie *movie)
return AVI_ERROR_COMPRESSION;
}
}
-
+
movie->streams[temp].sh.Flags = GET_FCC(movie->fp);
movie->streams[temp].sh.Priority = GET_TCC(movie->fp);
movie->streams[temp].sh.Language = GET_TCC(movie->fp);
@@ -559,11 +559,11 @@ AviError AVI_open_movie(const char *name, AviMovie *movie)
j = movie->streams[temp].sf_size - (sizeof(AviBitmapInfoHeader) - 8);
if (j >= 0) {
AviBitmapInfoHeader *bi;
-
+
movie->streams[temp].sf = MEM_mallocN(sizeof(AviBitmapInfoHeader), "streamformat");
-
+
bi = (AviBitmapInfoHeader *) movie->streams[temp].sf;
-
+
bi->fcc = FCC("strf");
bi->size = movie->streams[temp].sf_size;
bi->Size = GET_FCC(movie->fp);
@@ -577,7 +577,7 @@ AviError AVI_open_movie(const char *name, AviMovie *movie)
bi->YPelsPerMeter = GET_FCC(movie->fp);
bi->ClrUsed = GET_FCC(movie->fp);
bi->ClrImportant = GET_FCC(movie->fp);
-
+
fcca = bi->Compression;
if (movie->streams[temp].format ==
@@ -617,7 +617,7 @@ AviError AVI_open_movie(const char *name, AviMovie *movie)
}
fseek(movie->fp, temp, SEEK_CUR);
}
-
+
fseek(movie->fp, -4L, SEEK_CUR);
}
@@ -645,7 +645,7 @@ AviError AVI_open_movie(const char *name, AviMovie *movie)
movie->movi_offset = ftell(movie->fp);
movie->read_offset = movie->movi_offset;
-
+
/* Read in the index if the file has one, otherwise create one */
if (movie->header->Flags & AVIF_HASINDEX) {
fseek(movie->fp, size - 4, SEEK_CUR);
@@ -668,7 +668,7 @@ AviError AVI_open_movie(const char *name, AviMovie *movie)
movie->entries[temp].Flags = G
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list