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>2011-11-11 17:09:14 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-11-11 17:09:14 +0400
commite84c0980a3afb89301f8512acee64e525db3a49d (patch)
tree8700c1b43e1887ad8916c623b1f5066bc6b6f17f /source/blender/quicktime
parent094c9799f9926ae37515a1fe0380403ce3298a77 (diff)
correct indentation and some whitespace edits (no functional changes)
Diffstat (limited to 'source/blender/quicktime')
-rw-r--r--source/blender/quicktime/apple/qtkit_import.m10
-rw-r--r--source/blender/quicktime/apple/quicktime_export.c9
-rw-r--r--source/blender/quicktime/apple/quicktime_import.c49
3 files changed, 36 insertions, 32 deletions
diff --git a/source/blender/quicktime/apple/qtkit_import.m b/source/blender/quicktime/apple/qtkit_import.m
index 279192e9692..4307529002c 100644
--- a/source/blender/quicktime/apple/qtkit_import.m
+++ b/source/blender/quicktime/apple/qtkit_import.m
@@ -311,11 +311,11 @@ int startquicktime (struct anim *anim)
[QTMovie enterQTKitOnThread];
attributes = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSString stringWithCString:anim->name
- encoding:[NSString defaultCStringEncoding]], QTMovieFileNameAttribute,
- [NSNumber numberWithBool:NO], QTMovieEditableAttribute,
- nil];
-
+ [NSString stringWithCString:anim->name
+ encoding:[NSString defaultCStringEncoding]], QTMovieFileNameAttribute,
+ [NSNumber numberWithBool:NO], QTMovieEditableAttribute,
+ nil];
+
anim->qtime->movie = [QTMovie movieWithAttributes:attributes error:NULL];
if (!anim->qtime->movie) {
diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c
index 77cc45664a4..5c0460d4e74 100644
--- a/source/blender/quicktime/apple/quicktime_export.c
+++ b/source/blender/quicktime/apple/quicktime_export.c
@@ -657,9 +657,12 @@ static void check_renderbutton_framerate(RenderData *rd, ReportList *reports)
CheckError(err, "SCGetInfo fr error", reports);
if( (rd->frs_sec == 24 || rd->frs_sec == 30 || rd->frs_sec == 60) &&
- (qtdata->gTemporalSettings.frameRate == 1571553 ||
- qtdata->gTemporalSettings.frameRate == 1964113 ||
- qtdata->gTemporalSettings.frameRate == 3928227)) {;}
+ (qtdata->gTemporalSettings.frameRate == 1571553 ||
+ qtdata->gTemporalSettings.frameRate == 1964113 ||
+ qtdata->gTemporalSettings.frameRate == 3928227))
+ {
+ /* do nothing */
+ }
else {
if (rd->frs_sec_base > 0)
qtdata->gTemporalSettings.frameRate =
diff --git a/source/blender/quicktime/apple/quicktime_import.c b/source/blender/quicktime/apple/quicktime_import.c
index f88cba51ac3..d7ef371873a 100644
--- a/source/blender/quicktime/apple/quicktime_import.c
+++ b/source/blender/quicktime/apple/quicktime_import.c
@@ -381,8 +381,9 @@ ImBuf * qtime_fetchibuf (struct anim *anim, int position)
//add alpha to ibuf
boxsize = anim->x * anim->y * 4;
crect = (unsigned char *) rect;
- for( index = 0; index < boxsize; index+=4, crect+=4 )
- crect[3] = 0xFF;
+ for( index = 0; index < boxsize; index+=4, crect+=4 ) {
+ crect[3] = 0xFF;
+ }
}
#endif
@@ -522,8 +523,8 @@ int startquicktime (struct anim *anim)
anim->qtime->have_gw = TRUE;
SetMovieGWorld(anim->qtime->movie,
- anim->qtime->offscreenGWorld,
- GetGWorldDevice(anim->qtime->offscreenGWorld));
+ anim->qtime->offscreenGWorld,
+ GetGWorldDevice(anim->qtime->offscreenGWorld));
SetMoviePlayHints(anim->qtime->movie, hintsHighQuality, hintsHighQuality);
// sets Media and Track!
@@ -780,7 +781,7 @@ bail:
if( depth < 32 && (**desc).cType != kGIFCodecType) {
for(i = 0; i < box; i++, arect+=4)
- arect[3] = 0xFF;
+ arect[3] = 0xFF;
}
#endif
@@ -799,25 +800,25 @@ bail:
#if 0
struct ImageDescription {
- long idSize;
- CodecType cType;
- long resvd1;
- short resvd2;
- short dataRefIndex;
- short version;
- short revisionLevel;
- long vendor;
- CodecQ temporalQuality;
- CodecQ spatialQuality;
- short width;
- short height;
- Fixed hRes;
- Fixed vRes;
- long dataSize;
- short frameCount;
- Str31 name;
- short depth;
- short clutID;
+ long idSize;
+ CodecType cType;
+ long resvd1;
+ short resvd2;
+ short dataRefIndex;
+ short version;
+ short revisionLevel;
+ long vendor;
+ CodecQ temporalQuality;
+ CodecQ spatialQuality;
+ short width;
+ short height;
+ Fixed hRes;
+ Fixed vRes;
+ long dataSize;
+ short frameCount;
+ Str31 name;
+ short depth;
+ short clutID;
};
#endif // 0