diff options
Diffstat (limited to 'source')
29 files changed, 177 insertions, 177 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 4bd966cffc6..7ff34acca7a 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -2877,7 +2877,7 @@ int BKE_imbuf_write(ImBuf *ibuf, const char *name, const ImageFormatData *imf) perror(name); } - return (ok); + return ok; } /* same as BKE_imbuf_write() but crappy workaround not to permanently modify @@ -3005,7 +3005,7 @@ struct anim *openanim(const char *name, int flags, int streamindex, char colorsp } IMB_freeImBuf(ibuf); - return (anim); + return anim; } /* ************************* New Image API *************** */ diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 918cb8893ac..6793f5e1169 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -80,7 +80,7 @@ int BKE_packedfile_seek(PackedFile *pf, int offset, int whence) pf->seek = seek; } - return (oldseek); + return oldseek; } void BKE_packedfile_rewind(PackedFile *pf) @@ -108,7 +108,7 @@ int BKE_packedfile_read(PackedFile *pf, void *data, int size) size = -1; } - return (size); + return size; } int BKE_packedfile_count_all(Main *bmain) @@ -234,7 +234,7 @@ PackedFile *BKE_packedfile_new(ReportList *reports, const char *filename, const // XXX waitcursor(0); - return (pf); + return pf; } /* no libraries for now */ @@ -365,7 +365,7 @@ int BKE_packedfile_write_to_file(ReportList *reports, if (guimode) { } // XXX waitcursor(0); - return (ret_value); + return ret_value; } /** @@ -426,7 +426,7 @@ enum ePF_FileCompare BKE_packedfile_compare_to_file(const char *ref_file_name, } } - return (ret_val); + return ret_val; } /** @@ -579,7 +579,7 @@ int BKE_packedfile_unpack_vfont(Main *bmain, } } - return (ret_value); + return ret_value; } int BKE_packedfile_unpack_sound(Main *bmain, @@ -609,7 +609,7 @@ int BKE_packedfile_unpack_sound(Main *bmain, } } - return (ret_value); + return ret_value; } int BKE_packedfile_unpack_image(Main *bmain, @@ -662,7 +662,7 @@ int BKE_packedfile_unpack_image(Main *bmain, BKE_image_signal(bmain, ima, NULL, IMA_SIGNAL_RELOAD); } - return (ret_value); + return ret_value; } int BKE_packedfile_unpack_volume(Main *bmain, @@ -692,7 +692,7 @@ int BKE_packedfile_unpack_volume(Main *bmain, } } - return (ret_value); + return ret_value; } int BKE_packedfile_unpack_all_libraries(Main *bmain, ReportList *reports) @@ -723,7 +723,7 @@ int BKE_packedfile_unpack_all_libraries(Main *bmain, ReportList *reports) } } - return (ret_value); + return ret_value; } void BKE_packedfile_pack_all_libraries(Main *bmain, ReportList *reports) diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 1d56db3779a..d38b70a33c8 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -230,7 +230,7 @@ static float _final_goal(Object *ob, BodyPoint *bp) /*jow_go_for2_5 */ } f = sb->mingoal + bp->goal * fabsf(sb->maxgoal - sb->mingoal); f = pow(f, 4.0f); - return (f); + return f; } } CLOG_ERROR(&LOG, "sb or bp == NULL"); @@ -1619,7 +1619,7 @@ static int choose_winner( case 3: copy_v3_v3(w, cc); } - return (winner); + return winner; } static int sb_detect_vertex_collisionCached(float opco[3], @@ -1833,7 +1833,7 @@ static int sb_deflect_face(Object *ob, deflected = sb_detect_vertex_collisionCachedEx( s_actpos, facenormal, cf, force, ob, time, vel, intrusion); #endif - return (deflected); + return deflected; } /* hiding this for now .. but the jacobian may pop up on other tasks .. so i'd like to keep it */ @@ -1991,13 +1991,13 @@ static int _softbody_calc_forces_slice_in_a_thread(Scene *scene, } else { CLOG_ERROR(&LOG, "expected a SB here"); - return (999); + return 999; } /* debugerin */ if (sb->totpoint < ifirst) { printf("Aye 998"); - return (998); + return 998; } /* debugerin */ diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index fbd9e562b6a..db062ff50fd 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -371,13 +371,13 @@ int BLI_exists(const char *name) free(tmp_16); if (res == -1) { - return (0); + return 0; } #else struct stat st; BLI_assert(!BLI_path_is_rel(name)); if (stat(name, &st)) { - return (0); + return 0; } #endif return (st.st_mode); diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c index 8eeaaa2453a..755637ac274 100644 --- a/source/blender/blenlib/intern/string.c +++ b/source/blender/blenlib/intern/string.c @@ -514,7 +514,7 @@ char *BLI_strcasestr(const char *s, const char *find) do { do { if ((sc = *s++) == 0) { - return (NULL); + return NULL; } sc = tolower(sc); } while (sc != c); diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index f85e8d51778..3e814816cdb 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -1186,7 +1186,7 @@ static int fd_read_data_from_file(FileData *filedata, filedata->file_offset += readsize; } - return (readsize); + return readsize; } static off64_t fd_seek_data_from_file(FileData *filedata, off64_t offset, int whence) @@ -1211,7 +1211,7 @@ static int fd_read_gzip_from_file(FileData *filedata, filedata->file_offset += readsize; } - return (readsize); + return readsize; } /* Memory reading. */ @@ -1227,7 +1227,7 @@ static int fd_read_from_memory(FileData *filedata, memcpy(buffer, filedata->buffer + filedata->file_offset, readsize); filedata->file_offset += readsize; - return (readsize); + return readsize; } /* MemFile reading. */ @@ -1491,7 +1491,7 @@ static int fd_read_gzip_from_memory(FileData *filedata, filedata->file_offset += size; - return (size); + return size; } static int fd_read_gzip_from_memory_init(FileData *fd) diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 4529209b297..4147bb190e2 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -474,7 +474,7 @@ static int kill_selection(Object *obedit, int ins) /* 1 == new character */ ef->selstart = ef->selend = 0; } - return (direction); + return direction; } /** \} */ diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 3ce80c11160..67ea22a7ef5 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -2212,7 +2212,7 @@ static bool file_is_blend_backup(const char *str) } } - return (retval); + return retval; } /* TODO: Maybe we should move this to BLI? diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 6eaed649c6c..4f50a18fc85 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -1288,7 +1288,7 @@ static int need_add_seq_dup(Sequence *seq) } p = p->next; } - return (1); + return 1; } static void outliner_add_seq_dup(SpaceOutliner *space_outliner, diff --git a/source/blender/freestyle/intern/geometry/FitCurve.cpp b/source/blender/freestyle/intern/geometry/FitCurve.cpp index b60de93c4a1..aeb4902e5b0 100644 --- a/source/blender/freestyle/intern/geometry/FitCurve.cpp +++ b/source/blender/freestyle/intern/geometry/FitCurve.cpp @@ -202,7 +202,7 @@ static BezierCurve GenerateBezier( bezCurve[3] = d[last]; V2Add(&bezCurve[0], V2Scale(&tHat1, alpha_l), &bezCurve[1]); V2Add(&bezCurve[3], V2Scale(&tHat2, alpha_r), &bezCurve[2]); - return (bezCurve); + return bezCurve; } /* @@ -223,7 +223,7 @@ static double *Reparameterize(Vector2 *d, int first, int last, double *u, Bezier for (i = first; i <= last; i++) { uPrime[i - first] = NewtonRaphsonRootFind(bezCurve, d[i], u[i - first]); } - return (uPrime); + return uPrime; } /* diff --git a/source/blender/freestyle/intern/geometry/GeomUtils.cpp b/source/blender/freestyle/intern/geometry/GeomUtils.cpp index dbd792852ad..89a89d095ea 100644 --- a/source/blender/freestyle/intern/geometry/GeomUtils.cpp +++ b/source/blender/freestyle/intern/geometry/GeomUtils.cpp @@ -77,7 +77,7 @@ intersection_test intersect2dSeg2dSeg( // Check signs of r3 and r4. If both point 3 and point 4 lie on same side of line 1, // the line segments do not intersect. if (r3 != 0 && r4 != 0 && r3 * r4 > 0.0) { - return (DONT_INTERSECT); + return DONT_INTERSECT; } // Compute a2, b2, c2 @@ -92,13 +92,13 @@ intersection_test intersect2dSeg2dSeg( // Check signs of r1 and r2. If both point 1 and point 2 lie on same side of second line // segment, the line segments do not intersect. if (r1 != 0 && r2 != 0 && r1 * r2 > 0.0) { - return (DONT_INTERSECT); + return DONT_INTERSECT; } // Line segments intersect: compute intersection point. denom = a1 * b2 - a2 * b1; if (fabs(denom) < M_EPSILON) { - return (COLINEAR); + return COLINEAR; } num = b1 * c2 - b2 * c1; @@ -107,7 +107,7 @@ intersection_test intersect2dSeg2dSeg( num = a2 * c1 - a1 * c2; res[1] = num / denom; - return (DO_INTERSECT); + return DO_INTERSECT; } intersection_test intersect2dLine2dLine( @@ -129,7 +129,7 @@ intersection_test intersect2dLine2dLine( // Line segments intersect: compute intersection point. denom = a1 * b2 - a2 * b1; if (fabs(denom) < M_EPSILON) { - return (COLINEAR); + return COLINEAR; } num = b1 * c2 - b2 * c1; @@ -138,7 +138,7 @@ intersection_test intersect2dLine2dLine( num = a2 * c1 - a1 * c2; res[1] = num / denom; - return (DO_INTERSECT); + return DO_INTERSECT; } intersection_test intersect2dSeg2dSegParametric(const Vec2r &p1, @@ -165,7 +165,7 @@ intersection_test intersect2dSeg2dSegParametric(const Vec2r &p1, // Check signs of r3 and r4. If both point 3 and point 4 lie on same side of line 1, // the line segments do not intersect. if (r3 != 0 && r4 != 0 && r3 * r4 > 0.0) { - return (DONT_INTERSECT); + return DONT_INTERSECT; } // Compute a2, b2, c2 @@ -180,13 +180,13 @@ intersection_test intersect2dSeg2dSegParametric(const Vec2r &p1, // Check signs of r1 and r2. If both point 1 and point 2 lie on same side of second line // segment, the line segments do not intersect. if (r1 != 0 && r2 != 0 && r1 * r2 > 0.0) { - return (DONT_INTERSECT); + return DONT_INTERSECT; } // Line segments intersect: compute intersection point. denom = a1 * b2 - a2 * b1; if (fabs(denom) < epsilon) { - return (COLINEAR); + return COLINEAR; } real d1, e1; @@ -200,7 +200,7 @@ intersection_test intersect2dSeg2dSegParametric(const Vec2r &p1, num = -b1 * d1 - a1 * e1; u = num / denom; - return (DO_INTERSECT); + return DO_INTERSECT; } // AABB-triangle overlap test code by Tomas Akenine-Möller diff --git a/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h index 25d8439173b..5cb52b6a0f3 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h +++ b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h @@ -498,7 +498,7 @@ class edge_iterator_base : public IteratorBase<Traits, BidirectionalIteratorTag_ // dereferencing virtual reference operator*() const { - return (_ViewEdge); + return _ViewEdge; } virtual pointer operator->() const @@ -626,7 +626,7 @@ class fedge_iterator_base : public IteratorBase<Traits, BidirectionalIteratorTag // dereferencing virtual reference operator*() const { - return (_FEdge); + return _FEdge; } virtual pointer operator->() const @@ -774,7 +774,7 @@ class vertex_iterator_base : public IteratorBase<Traits, BidirectionalIteratorTa // dereferencing virtual reference operator*() const { - return (_SVertex); + return _SVertex; } virtual pointer operator->() const diff --git a/source/blender/imbuf/intern/allocimbuf.c b/source/blender/imbuf/intern/allocimbuf.c index 4205a6ecc39..8dfb3ada7d6 100644 --- a/source/blender/imbuf/intern/allocimbuf.c +++ b/source/blender/imbuf/intern/allocimbuf.c @@ -488,7 +488,7 @@ ImBuf *IMB_allocImBuf(unsigned int x, unsigned int y, uchar planes, unsigned int } } - return (ibuf); + return ibuf; } bool IMB_initImBuf( @@ -623,7 +623,7 @@ ImBuf *IMB_dupImBuf(const ImBuf *ibuf1) *ibuf2 = tbuf; - return (ibuf2); + return ibuf2; } size_t IMB_get_size_in_memory(ImBuf *ibuf) diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 01372d5ed68..f5ae602946e 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -301,7 +301,7 @@ struct anim *IMB_open_anim(const char *name, anim->ib_flags = ib_flags; anim->streamindex = streamindex; } - return (anim); + return anim; } bool IMB_anim_can_produce_frames(const struct anim *anim) @@ -743,7 +743,7 @@ static int startffmpeg(struct anim *anim) } # endif - return (0); + return 0; } /* postprocess the image in anim->pFrame and do color conversion @@ -1060,7 +1060,7 @@ static ImBuf *ffmpeg_fetchibuf(struct anim *anim, int position, IMB_Timecode_Typ int old_frame_index = 0; /* To quiet gcc barking... */ if (anim == NULL) { - return (0); + return 0; } av_log(anim->pFormatCtx, AV_LOG_DEBUG, "FETCH: pos=%d\n", position); @@ -1291,7 +1291,7 @@ static ImBuf *anim_getnew(struct anim *anim) struct ImBuf *ibuf = NULL; if (anim == NULL) { - return (NULL); + return NULL; } free_anim_movie(anim); @@ -1305,7 +1305,7 @@ static ImBuf *anim_getnew(struct anim *anim) #endif if (anim->curtype != 0) { - return (NULL); + return NULL; } anim->curtype = imb_get_anim_type(anim->name); @@ -1319,7 +1319,7 @@ static ImBuf *anim_getnew(struct anim *anim) break; case ANIM_MOVIE: if (startmovie(anim)) { - return (NULL); + return NULL; } ibuf = IMB_allocImBuf(anim->x, anim->y, 24, 0); /* fake */ break; @@ -1327,7 +1327,7 @@ static ImBuf *anim_getnew(struct anim *anim) case ANIM_AVI: if (startavi(anim)) { printf("couldn't start avi\n"); - return (NULL); + return NULL; } ibuf = IMB_allocImBuf(anim->x, anim->y, 24, 0); break; @@ -1335,13 +1335,13 @@ static ImBuf *anim_getnew(struct anim *anim) #ifdef WITH_FFMPEG case ANIM_FFMPEG: if (startffmpeg(anim)) { - return (0); + return 0; } ibuf = IMB_allocImBuf(anim->x, anim->y, 24, 0); break; #endif } - return (ibuf); + return ibuf; } struct ImBuf *IMB_anim_previewframe(struct anim *anim) @@ -1369,7 +1369,7 @@ struct ImBuf *IMB_anim_absolute(struct anim *anim, int pic; int filter_y; if (anim == NULL) { - return (NULL); + return NULL; } filter_y = (anim->ib_flags & IB_animdeinterlace); @@ -1378,7 +1378,7 @@ struct ImBuf *IMB_anim_absolute(struct anim *anim, if (anim->curtype == 0) { ibuf = anim_getnew(anim); if (ibuf == NULL) { - return (NULL); + return NULL; } IMB_freeImBuf(ibuf); /* ???? */ @@ -1386,10 +1386,10 @@ struct ImBuf *IMB_anim_absolute(struct anim *anim, } if (position < 0) { - return (NULL); + return NULL; } if (position >= anim->duration_in_frames) { - return (NULL); + return NULL; } } else { @@ -1444,7 +1444,7 @@ struct ImBuf *IMB_anim_absolute(struct anim *anim, } BLI_snprintf(ibuf->name, sizeof(ibuf->name), "%s.%04d", anim->name, anim->curposition + 1); } - return (ibuf); + return ibuf; } /***/ diff --git a/source/blender/imbuf/intern/bmp.c b/source/blender/imbuf/intern/bmp.c index 3cac0be7935..31f8b651eff 100644 --- a/source/blender/imbuf/intern/bmp.c +++ b/source/blender/imbuf/intern/bmp.c @@ -101,7 +101,7 @@ static int checkbmp(const uchar *mem) } } - return (ret_val); + return ret_val; } int imb_is_a_bmp(const uchar *buf) @@ -123,7 +123,7 @@ ImBuf *imb_bmp_decode(const uchar *mem, size_t size, int flags, char colorspace[ (void)size; /* unused */ if (checkbmp(mem) == 0) { - return (NULL); + return NULL; } colorspace_set_default_role(colorspace, IM_MAX_SPACE, COLOR_ROLE_DEFAULT_BYTE); @@ -272,7 +272,7 @@ ImBuf *imb_bmp_decode(const uchar *mem, size_t size, int flags, char colorspace[ ibuf->ftype = IMB_FTYPE_BMP; } - return (ibuf); + return ibuf; } #undef CHECK_HEADER_FIELD_BMP diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp index 92dd475813a..7ec059607c5 100644 --- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp +++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp @@ -1353,7 +1353,7 @@ uint DirectDrawSurface::mipmapSize(uint mipmap) const } printf("DDS: mipmap format not supported\n"); - return (0); + return 0; } uint DirectDrawSurface::faceSize() const diff --git a/source/blender/imbuf/intern/dds/Stream.cpp b/source/blender/imbuf/intern/dds/Stream.cpp index 271717f165c..e1c5eb1d505 100644 --- a/source/blender/imbuf/intern/dds/Stream.cpp +++ b/source/blender/imbuf/intern/dds/Stream.cpp @@ -42,55 +42,55 @@ unsigned int mem_read(Stream &mem, unsigned long long &i) { if (mem.pos + 8 > mem.size) { mem.set_failed(msg_error_seek); - return (0); + return 0; } memcpy(&i, mem.mem + mem.pos, 8); // @@ todo: make sure little endian mem.pos += 8; - return (8); + return 8; } unsigned int mem_read(Stream &mem, unsigned int &i) { if (mem.pos + 4 > mem.size) { mem.set_failed(msg_error_read); - return (0); + return 0; } memcpy(&i, mem.mem + mem.pos, 4); // @@ todo: make sure little endian mem.pos += 4; - return (4); + return 4; } unsigned int mem_read(Stream &mem, unsigned short &i) { if (mem.pos + 2 > mem.size) { mem.set_failed(msg_error_read); - return (0); + return 0; } memcpy(&i, mem.mem + mem.pos, 2); // @@ todo: make sure little endian mem.pos += 2; - return (2); + return 2; } unsigned int mem_read(Stream &mem, unsigned char &i) { if (mem.pos + 1 > mem.size) { mem.set_failed(msg_error_read); - return (0); + return 0; } i = (mem.mem + mem.pos)[0]; mem.pos += 1; - return (1); + return 1; } unsigned int mem_read(Stream &mem, unsigned char *i, unsigned int cnt) { if (mem.pos + cnt > mem.size) { mem.set_failed(msg_error_read); - return (0); + return 0; } memcpy(i, mem.mem + mem.pos, cnt); mem.pos += cnt; - return (cnt); + return cnt; } void Stream::set_failed(const char *msg) diff --git a/source/blender/imbuf/intern/dds/dds_api.cpp b/source/blender/imbuf/intern/dds/dds_api.cpp index 83d304203a0..309b5d6410f 100644 --- a/source/blender/imbuf/intern/dds/dds_api.cpp +++ b/source/blender/imbuf/intern/dds/dds_api.cpp @@ -44,14 +44,14 @@ extern "C" { int imb_save_dds(struct ImBuf *ibuf, const char *name, int /*flags*/) { - return (0); /* todo: finish this function */ + return 0; /* todo: finish this function */ /* check image buffer */ if (ibuf == 0) { - return (0); + return 0; } if (ibuf->rect == 0) { - return (0); + return 0; } /* open file for writing */ @@ -69,7 +69,7 @@ int imb_save_dds(struct ImBuf *ibuf, const char *name, int /*flags*/) fildes << "DDS "; fildes.close(); - return (1); + return 1; } int imb_is_a_dds(const unsigned char *mem) // note: use at most first 32 bytes @@ -77,13 +77,13 @@ int imb_is_a_dds(const unsigned char *mem) // note: use at most first 32 bytes /* heuristic check to see if mem contains a DDS file */ /* header.fourcc == FOURCC_DDS */ if ((mem[0] != 'D') || (mem[1] != 'D') || (mem[2] != 'S') || (mem[3] != ' ')) { - return (0); + return 0; } /* header.size == 124 */ if ((mem[4] != 124) || mem[5] || mem[6] || mem[7]) { - return (0); + return 0; } - return (1); + return 1; } struct ImBuf *imb_load_dds(const unsigned char *mem, @@ -109,27 +109,27 @@ struct ImBuf *imb_load_dds(const unsigned char *mem, colorspace_set_default_role(colorspace, IM_MAX_SPACE, COLOR_ROLE_DEFAULT_BYTE); if (!imb_is_a_dds(mem)) { - return (0); + return 0; } /* check if DDS is valid and supported */ if (!dds.isValid()) { /* no need to print error here, just testing if it is a DDS */ if (flags & IB_test) { - return (0); + return 0; } printf("DDS: not valid; header follows\n"); dds.printInfo(); - return (0); + return 0; } if (!dds.isSupported()) { printf("DDS: format not supported\n"); - return (0); + return 0; } if ((dds.width() > 65535) || (dds.height() > 65535)) { printf("DDS: dimensions too large\n"); - return (0); + return 0; } /* convert DDS into ImBuf */ @@ -149,7 +149,7 @@ struct ImBuf *imb_load_dds(const unsigned char *mem, } ibuf = IMB_allocImBuf(dds.width(), dds.height(), bits_per_pixel, 0); if (ibuf == 0) { - return (0); /* memory allocation failed */ + return 0; /* memory allocation failed */ } ibuf->ftype = IMB_FTYPE_DDS; @@ -158,10 +158,10 @@ struct ImBuf *imb_load_dds(const unsigned char *mem, if ((flags & IB_test) == 0) { if (!imb_addrectImBuf(ibuf)) { - return (ibuf); + return ibuf; } if (ibuf->rect == 0) { - return (ibuf); + return ibuf; } rect = ibuf->rect; @@ -196,7 +196,7 @@ struct ImBuf *imb_load_dds(const unsigned char *mem, IMB_flipy(ibuf); } - return (ibuf); + return ibuf; } } // extern "C" diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c index 5f698543aa9..2d8f1510d7b 100644 --- a/source/blender/imbuf/intern/iris.c +++ b/source/blender/imbuf/intern/iris.c @@ -281,18 +281,18 @@ struct ImBuf *imb_loadiris(const uchar *mem, size_t size, int flags, char colors readheader(inf, &image); if (image.imagic != IMAGIC) { fprintf(stderr, "longimagedata: bad magic number in image file\n"); - return (NULL); + return NULL; } rle = ISRLE(image.type); bpp = BPP(image.type); if (bpp != 1 && bpp != 2) { fprintf(stderr, "longimagedata: image must have 1 or 2 byte per pix chan\n"); - return (NULL); + return NULL; } if ((uint)image.zsize > 8) { fprintf(stderr, "longimagedata: channels over 8 not supported\n"); - return (NULL); + return NULL; } const int xsize = image.xsize; @@ -304,7 +304,7 @@ struct ImBuf *imb_loadiris(const uchar *mem, size_t size, int flags, char colors if (ibuf) { ibuf->ftype = IMB_FTYPE_IMAGIC; } - return (ibuf); + return ibuf; } if (rle) { @@ -598,7 +598,7 @@ struct ImBuf *imb_loadiris(const uchar *mem, size_t size, int flags, char colors IMB_convert_rgba_to_abgr(ibuf); } - return (ibuf); + return ibuf; } /* static utility functions for longimagedata */ @@ -988,5 +988,5 @@ int imb_saveiris(struct ImBuf *ibuf, const char *name, int flags) IMB_convert_rgba_to_abgr(ibuf); test_endian_zbuf(ibuf); - return (ret); + return ret; } diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c index fe74d9bc23f..89026c2f728 100644 --- a/source/blender/imbuf/intern/jpeg.c +++ b/source/blender/imbuf/intern/jpeg.c @@ -417,7 +417,7 @@ static ImBuf *ibJpegImageFromCinfo(struct jpeg_decompress_struct *cinfo, int fla } } - return (ibuf); + return ibuf; } ImBuf *imb_load_jpeg(const unsigned char *buffer, @@ -452,7 +452,7 @@ ImBuf *imb_load_jpeg(const unsigned char *buffer, ibuf = ibJpegImageFromCinfo(cinfo, flags); - return (ibuf); + return ibuf; } static void write_jpeg(struct jpeg_compress_struct *cinfo, struct ImBuf *ibuf) @@ -605,7 +605,7 @@ static int init_jpeg(FILE *outfile, struct jpeg_compress_struct *cinfo, struct I cinfo->dct_method = JDCT_FLOAT; jpeg_set_quality(cinfo, quality, true); - return (0); + return 0; } static int save_stdjpeg(const char *name, struct ImBuf *ibuf) diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp b/source/blender/imbuf/intern/oiio/openimageio_api.cpp index df51aada5f0..86bb5934db6 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp +++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp @@ -182,10 +182,10 @@ int imb_save_photoshop(struct ImBuf *ibuf, const char * /*name*/, int flags) << " currently not supported" << std::endl; imb_addencodedbufferImBuf(ibuf); ibuf->encodedsize = 0; - return (0); + return 0; } - return (0); + return 0; } struct ImBuf *imb_load_photoshop(const char *filename, int flags, char colorspace[IM_MAX_SPACE]) @@ -199,7 +199,7 @@ struct ImBuf *imb_load_photoshop(const char *filename, int flags, char colorspac /* load image from file through OIIO */ if (imb_is_a_photoshop(filename) == 0) { - return (NULL); + return NULL; } colorspace_set_default_role(colorspace, IM_MAX_SPACE, COLOR_ROLE_DEFAULT_BYTE); diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 05592a7d408..77d60d37449 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -1900,7 +1900,7 @@ struct ImBuf *imb_load_openexr(const unsigned char *mem, MultiPartInputFile *file = NULL; if (imb_is_a_openexr(mem) == 0) { - return (NULL); + return NULL; } colorspace_set_default_role(colorspace, IM_MAX_SPACE, COLOR_ROLE_DEFAULT_FLOAT); @@ -2073,7 +2073,7 @@ struct ImBuf *imb_load_openexr(const unsigned char *mem, ibuf->flags |= IB_alphamode_premul; } } - return (ibuf); + return ibuf; } catch (const std::exception &exc) { std::cerr << exc.what() << std::endl; @@ -2083,7 +2083,7 @@ struct ImBuf *imb_load_openexr(const unsigned char *mem, delete file; delete membuf; - return (0); + return 0; } } diff --git a/source/blender/imbuf/intern/png.c b/source/blender/imbuf/intern/png.c index 9e600f363c5..2eb1b216572 100644 --- a/source/blender/imbuf/intern/png.c +++ b/source/blender/imbuf/intern/png.c @@ -71,7 +71,7 @@ int imb_is_a_png(const unsigned char *mem) ret_val = !png_sig_cmp(mem, 0, 8); #endif } - return (ret_val); + return ret_val; } static void Flush(png_structp png_ptr) @@ -161,7 +161,7 @@ int imb_savepng(struct ImBuf *ibuf, const char *name, int flags) bytesperpixel = (ibuf->planes + 7) >> 3; if ((bytesperpixel > 4) || (bytesperpixel == 2)) { printf("imb_savepng: Unsupported bytes per pixel: %d for file: '%s'\n", bytesperpixel, name); - return (0); + return 0; } png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); @@ -511,7 +511,7 @@ int imb_savepng(struct ImBuf *ibuf, const char *name, int flags) fclose(fp); } - return (1); + return 1; } static void imb_png_warning(png_structp UNUSED(png_ptr), png_const_charp message) @@ -549,7 +549,7 @@ ImBuf *imb_loadpng(const unsigned char *mem, size_t size, int flags, char colors unsigned int channels; if (imb_is_a_png(mem) == 0) { - return (NULL); + return NULL; } /* both 8 and 16 bit PNGs are default to standard byte colorspace */ @@ -819,5 +819,5 @@ ImBuf *imb_loadpng(const unsigned char *mem, size_t size, int flags, char colors } png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); - return (ibuf); + return ibuf; } diff --git a/source/blender/imbuf/intern/scaling.c b/source/blender/imbuf/intern/scaling.c index 95f720a9d16..cecb683b0bd 100644 --- a/source/blender/imbuf/intern/scaling.c +++ b/source/blender/imbuf/intern/scaling.c @@ -99,10 +99,10 @@ struct ImBuf *IMB_half_x(struct ImBuf *ibuf1) struct ImBuf *ibuf2; if (ibuf1 == NULL) { - return (NULL); + return NULL; } if (ibuf1->rect == NULL && ibuf1->rect_float == NULL) { - return (NULL); + return NULL; } if (ibuf1->x <= 1) { @@ -111,12 +111,12 @@ struct ImBuf *IMB_half_x(struct ImBuf *ibuf1) ibuf2 = IMB_allocImBuf((ibuf1->x) / 2, ibuf1->y, ibuf1->planes, ibuf1->flags); if (ibuf2 == NULL) { - return (NULL); + return NULL; } imb_half_x_no_alloc(ibuf2, ibuf1); - return (ibuf2); + return ibuf2; } struct ImBuf *IMB_double_fast_x(struct ImBuf *ibuf1) @@ -126,10 +126,10 @@ struct ImBuf *IMB_double_fast_x(struct ImBuf *ibuf1) float *p1f, *destf; if (ibuf1 == NULL) { - return (NULL); + return NULL; } if (ibuf1->rect == NULL && ibuf1->rect_float == NULL) { - return (NULL); + return NULL; } do_rect = (ibuf1->rect != NULL); @@ -137,7 +137,7 @@ struct ImBuf *IMB_double_fast_x(struct ImBuf *ibuf1) ibuf2 = IMB_allocImBuf(2 * ibuf1->x, ibuf1->y, ibuf1->planes, ibuf1->flags); if (ibuf2 == NULL) { - return (NULL); + return NULL; } p1 = (int *)ibuf1->rect; @@ -161,7 +161,7 @@ struct ImBuf *IMB_double_fast_x(struct ImBuf *ibuf1) } } - return (ibuf2); + return ibuf2; } struct ImBuf *IMB_double_x(struct ImBuf *ibuf1) @@ -169,16 +169,16 @@ struct ImBuf *IMB_double_x(struct ImBuf *ibuf1) struct ImBuf *ibuf2; if (ibuf1 == NULL) { - return (NULL); + return NULL; } if (ibuf1->rect == NULL && ibuf1->rect_float == NULL) { - return (NULL); + return NULL; } ibuf2 = IMB_double_fast_x(ibuf1); imb_filterx(ibuf2); - return (ibuf2); + return ibuf2; } static void imb_half_y_no_alloc(struct ImBuf *ibuf2, struct ImBuf *ibuf1) @@ -253,10 +253,10 @@ struct ImBuf *IMB_half_y(struct ImBuf *ibuf1) struct ImBuf *ibuf2; if (ibuf1 == NULL) { - return (NULL); + return NULL; } if (ibuf1->rect == NULL && ibuf1->rect_float == NULL) { - return (NULL); + return NULL; } if (ibuf1->y <= 1) { @@ -265,12 +265,12 @@ struct ImBuf *IMB_half_y(struct ImBuf *ibuf1) ibuf2 = IMB_allocImBuf(ibuf1->x, (ibuf1->y) / 2, ibuf1->planes, ibuf1->flags); if (ibuf2 == NULL) { - return (NULL); + return NULL; } imb_half_y_no_alloc(ibuf2, ibuf1); - return (ibuf2); + return ibuf2; } struct ImBuf *IMB_double_fast_y(struct ImBuf *ibuf1) @@ -282,10 +282,10 @@ struct ImBuf *IMB_double_fast_y(struct ImBuf *ibuf1) int do_rect, do_float; if (ibuf1 == NULL) { - return (NULL); + return NULL; } if (ibuf1->rect == NULL && ibuf1->rect_float == NULL) { - return (NULL); + return NULL; } do_rect = (ibuf1->rect != NULL); @@ -293,7 +293,7 @@ struct ImBuf *IMB_double_fast_y(struct ImBuf *ibuf1) ibuf2 = IMB_allocImBuf(ibuf1->x, 2 * ibuf1->y, ibuf1->planes, ibuf1->flags); if (ibuf2 == NULL) { - return (NULL); + return NULL; } p1 = (int *)ibuf1->rect; @@ -318,7 +318,7 @@ struct ImBuf *IMB_double_fast_y(struct ImBuf *ibuf1) } } - return (ibuf2); + return ibuf2; } struct ImBuf *IMB_double_y(struct ImBuf *ibuf1) @@ -326,16 +326,16 @@ struct ImBuf *IMB_double_y(struct ImBuf *ibuf1) struct ImBuf *ibuf2; if (ibuf1 == NULL) { - return (NULL); + return NULL; } if (ibuf1->rect == NULL) { - return (NULL); + return NULL; } ibuf2 = IMB_double_fast_y(ibuf1); IMB_filtery(ibuf2); - return (ibuf2); + return ibuf2; } /* pretty much specific functions which converts uchar <-> ushort but assumes @@ -453,10 +453,10 @@ ImBuf *IMB_onehalf(struct ImBuf *ibuf1) struct ImBuf *ibuf2; if (ibuf1 == NULL) { - return (NULL); + return NULL; } if (ibuf1->rect == NULL && ibuf1->rect_float == NULL) { - return (NULL); + return NULL; } if (ibuf1->x <= 1) { @@ -468,12 +468,12 @@ ImBuf *IMB_onehalf(struct ImBuf *ibuf1) ibuf2 = IMB_allocImBuf((ibuf1->x) / 2, (ibuf1->y) / 2, ibuf1->planes, ibuf1->flags); if (ibuf2 == NULL) { - return (NULL); + return NULL; } imb_onehalf_no_alloc(ibuf2, ibuf1); - return (ibuf2); + return ibuf2; } /* q_scale_linear_interpolation helper functions */ @@ -923,13 +923,13 @@ static ImBuf *scaledownx(struct ImBuf *ibuf, int newx) nvalf[0] = nvalf[1] = nvalf[2] = nvalf[3] = 0.0f; if (!do_rect && !do_float) { - return (ibuf); + return ibuf; } if (do_rect) { _newrect = MEM_mallocN(newx * ibuf->y * sizeof(uchar) * 4, "scaledownx"); if (_newrect == NULL) { - return (ibuf); + return ibuf; } } if (do_float) { @@ -938,7 +938,7 @@ static ImBuf *scaledownx(struct ImBuf *ibuf, int newx) if (_newrect) { MEM_freeN(_newrect); } - return (ibuf); + return ibuf; } } @@ -1044,7 +1044,7 @@ static ImBuf *scaledownx(struct ImBuf *ibuf, int newx) (void)rect_size; /* UNUSED in release builds */ ibuf->x = newx; - return (ibuf); + return ibuf; } static ImBuf *scaledowny(struct ImBuf *ibuf, int newy) @@ -1064,13 +1064,13 @@ static ImBuf *scaledowny(struct ImBuf *ibuf, int newy) nvalf[0] = nvalf[1] = nvalf[2] = nvalf[3] = 0.0f; if (!do_rect && !do_float) { - return (ibuf); + return ibuf; } if (do_rect) { _newrect = MEM_mallocN(newy * ibuf->x * sizeof(uchar) * 4, "scaledowny"); if (_newrect == NULL) { - return (ibuf); + return ibuf; } } if (do_float) { @@ -1079,7 +1079,7 @@ static ImBuf *scaledowny(struct ImBuf *ibuf, int newy) if (_newrect) { MEM_freeN(_newrect); } - return (ibuf); + return ibuf; } } @@ -1186,7 +1186,7 @@ static ImBuf *scaledowny(struct ImBuf *ibuf, int newy) (void)rect_size; /* UNUSED in release builds */ ibuf->y = newy; - return (ibuf); + return ibuf; } static ImBuf *scaleupx(struct ImBuf *ibuf, int newx) @@ -1210,17 +1210,17 @@ static ImBuf *scaleupx(struct ImBuf *ibuf, int newx) val_af = nval_af = diff_af = val_bf = nval_bf = diff_bf = 0; val_gf = nval_gf = diff_gf = val_rf = nval_rf = diff_rf = 0; if (ibuf == NULL) { - return (NULL); + return NULL; } if (ibuf->rect == NULL && ibuf->rect_float == NULL) { - return (ibuf); + return ibuf; } if (ibuf->rect) { do_rect = true; _newrect = MEM_mallocN(newx * ibuf->y * sizeof(int), "scaleupx"); if (_newrect == NULL) { - return (ibuf); + return ibuf; } } if (ibuf->rect_float) { @@ -1230,7 +1230,7 @@ static ImBuf *scaleupx(struct ImBuf *ibuf, int newx) if (_newrect) { MEM_freeN(_newrect); } - return (ibuf); + return ibuf; } } @@ -1362,7 +1362,7 @@ static ImBuf *scaleupx(struct ImBuf *ibuf, int newx) } ibuf->x = newx; - return (ibuf); + return ibuf; } static ImBuf *scaleupy(struct ImBuf *ibuf, int newy) @@ -1386,17 +1386,17 @@ static ImBuf *scaleupy(struct ImBuf *ibuf, int newy) val_af = nval_af = diff_af = val_bf = nval_bf = diff_bf = 0; val_gf = nval_gf = diff_gf = val_rf = nval_rf = diff_rf = 0; if (ibuf == NULL) { - return (NULL); + return NULL; } if (ibuf->rect == NULL && ibuf->rect_float == NULL) { - return (ibuf); + return ibuf; } if (ibuf->rect) { do_rect = true; _newrect = MEM_mallocN(ibuf->x * newy * sizeof(int), "scaleupy"); if (_newrect == NULL) { - return (ibuf); + return ibuf; } } if (ibuf->rect_float) { @@ -1406,7 +1406,7 @@ static ImBuf *scaleupy(struct ImBuf *ibuf, int newy) if (_newrect) { MEM_freeN(_newrect); } - return (ibuf); + return ibuf; } } @@ -1545,7 +1545,7 @@ static ImBuf *scaleupy(struct ImBuf *ibuf, int newy) } ibuf->y = newy; - return (ibuf); + return ibuf; } static void scalefast_Z_ImBuf(ImBuf *ibuf, int newx, int newy) diff --git a/source/blender/imbuf/intern/tiff.c b/source/blender/imbuf/intern/tiff.c index 5d72066675b..c95476fa628 100644 --- a/source/blender/imbuf/intern/tiff.c +++ b/source/blender/imbuf/intern/tiff.c @@ -104,7 +104,7 @@ static int imb_tiff_DummyMapProc( (void)pbase; (void)psize; - return (0); + return 0; } /** @@ -145,7 +145,7 @@ static tsize_t imb_tiff_ReadProc(thandle_t handle, tdata_t data, tsize_t n) /* on EOF, return immediately and read (copy) nothing */ if (nCopy <= 0) { - return (0); + return 0; } /* all set -> do the read (copy) */ @@ -238,7 +238,7 @@ static int imb_tiff_CloseProc(thandle_t handle) mfile = IMB_TIFF_GET_MEMFILE(handle); if (!mfile || !mfile->mem) { fprintf(stderr, "imb_tiff_CloseProc: !mfile || !mfile->mem!\n"); - return (0); + return 0; } /* virtually close the file */ @@ -246,7 +246,7 @@ static int imb_tiff_CloseProc(thandle_t handle) mfile->offset = 0; mfile->size = 0; - return (0); + return 0; } /** @@ -262,7 +262,7 @@ static toff_t imb_tiff_SizeProc(thandle_t handle) mfile = IMB_TIFF_GET_MEMFILE(handle); if (!mfile || !mfile->mem) { fprintf(stderr, "imb_tiff_SizeProc: !mfile || !mfile->mem!\n"); - return (0); + return 0; } /* return the size */ @@ -764,7 +764,7 @@ int imb_savetiff(ImBuf *ibuf, const char *name, int flags) "imb_savetiff: unsupported number of bytes per " "pixel: %d\n", samplesperpixel); - return (0); + return 0; } if ((ibuf->foptions.flag & TIF_16BIT) && ibuf->rect_float) { @@ -790,7 +790,7 @@ int imb_savetiff(ImBuf *ibuf, const char *name, int flags) fprintf(stderr, "imb_savetiff: creation of in-memory TIFF files is " "not yet supported.\n"); - return (0); + return 0; } /* create image as a file */ @@ -804,7 +804,7 @@ int imb_savetiff(ImBuf *ibuf, const char *name, int flags) if (image == NULL) { fprintf(stderr, "imb_savetiff: could not open TIFF for writing.\n"); - return (0); + return 0; } /* allocate array for pixel data */ @@ -819,7 +819,7 @@ int imb_savetiff(ImBuf *ibuf, const char *name, int flags) if (pixels == NULL && pixels16 == NULL) { fprintf(stderr, "imb_savetiff: could not allocate pixels array.\n"); TIFFClose(image); - return (0); + return 0; } /* setup pointers */ @@ -945,7 +945,7 @@ int imb_savetiff(ImBuf *ibuf, const char *name, int flags) if (pixels16) { _TIFFfree(pixels16); } - return (1); + return 1; } /* close the TIFF file */ @@ -956,5 +956,5 @@ int imb_savetiff(ImBuf *ibuf, const char *name, int flags) if (pixels16) { _TIFFfree(pixels16); } - return (1); + return 1; } diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 3c420f3f297..64b03f332a8 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -339,42 +339,42 @@ int imb_get_anim_type(const char *name) # ifdef WITH_FFMPEG /* stat test below fails on large files > 4GB */ if (isffmpeg(name)) { - return (ANIM_FFMPEG); + return ANIM_FFMPEG; } # endif if (BLI_stat(name, &st) == -1) { - return (0); + return 0; } if (((st.st_mode) & S_IFMT) != S_IFREG) { - return (0); + return 0; } if (isavi(name)) { - return (ANIM_AVI); + return ANIM_AVI; } if (ismovie(name)) { - return (ANIM_MOVIE); + return ANIM_MOVIE; } #else if (BLI_stat(name, &st) == -1) { - return (0); + return 0; } if (((st.st_mode) & S_IFMT) != S_IFREG) { - return (0); + return 0; } if (ismovie(name)) { - return (ANIM_MOVIE); + return ANIM_MOVIE; } # ifdef WITH_FFMPEG if (isffmpeg(name)) { - return (ANIM_FFMPEG); + return ANIM_FFMPEG; } # endif if (isavi(name)) { - return (ANIM_AVI); + return ANIM_AVI; } #endif type = IMB_ispic(name); diff --git a/source/blender/imbuf/intern/writeimage.c b/source/blender/imbuf/intern/writeimage.c index 9cb0436cb98..1d77233a7e2 100644 --- a/source/blender/imbuf/intern/writeimage.c +++ b/source/blender/imbuf/intern/writeimage.c @@ -50,7 +50,7 @@ short IMB_saveiff(struct ImBuf *ibuf, const char *name, int flags) BLI_assert(!BLI_path_is_rel(name)); if (ibuf == NULL) { - return (false); + return false; } ibuf->flags = flags; diff --git a/source/blender/io/collada/BCAnimationSampler.cpp b/source/blender/io/collada/BCAnimationSampler.cpp index f44e3e8385d..6f363aa76c2 100644 --- a/source/blender/io/collada/BCAnimationSampler.cpp +++ b/source/blender/io/collada/BCAnimationSampler.cpp @@ -558,7 +558,7 @@ const bool BCSampleFrame::has_sample_for(Object *ob) const const bool BCSampleFrame::has_sample_for(Object *ob, Bone *bone) const { const BCMatrix *bc_bone = get_sample_matrix(ob, bone); - return (bc_bone); + return bc_bone; } /* ==================================================================== */ diff --git a/source/blender/io/collada/collada_utils.h b/source/blender/io/collada/collada_utils.h index 657a82f70d2..38050556b47 100644 --- a/source/blender/io/collada/collada_utils.h +++ b/source/blender/io/collada/collada_utils.h @@ -154,7 +154,7 @@ inline std::string bc_string_after(const std::string &s, const std::string probe if (i != std::string::npos) { return (s.substr(i + probe.length(), s.length() - i)); } - return (s); + return s; } inline std::string bc_string_before(const std::string &s, const std::string probe) @@ -163,7 +163,7 @@ inline std::string bc_string_before(const std::string &s, const std::string prob if (i != std::string::npos) { return s.substr(0, i); } - return (s); + return s; } inline bool bc_startswith(std::string const &value, std::string const &starting) |