diff options
| -rw-r--r-- | intern/utfconv/utfconv.c | 14 | ||||
| -rw-r--r-- | intern/utfconv/utfconv.h | 12 | ||||
| -rw-r--r-- | source/blender/avi/intern/avi.c | 7 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/path_util.c | 1 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/winstuff.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 | ||||
| -rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 4 | ||||
| -rw-r--r-- | source/gameengine/Converter/KX_ConvertProperties.cpp | 4 |
8 files changed, 24 insertions, 24 deletions
diff --git a/intern/utfconv/utfconv.c b/intern/utfconv/utfconv.c index 9aeca36e55a..4686b702626 100644 --- a/intern/utfconv/utfconv.c +++ b/intern/utfconv/utfconv.c @@ -25,7 +25,7 @@ #include "utfconv.h" -size_t count_utf_8_from_16(wchar_t * string16) +size_t count_utf_8_from_16(const wchar_t * string16) { int i; size_t count = 0; @@ -50,7 +50,7 @@ size_t count_utf_8_from_16(wchar_t * string16) } -size_t count_utf_16_from_8(char * string8) +size_t count_utf_16_from_8(const char * string8) { size_t count = 0; char u; @@ -88,7 +88,7 @@ size_t count_utf_16_from_8(char * string8) -int conv_utf_16_to_8(wchar_t * in16, char * out8, size_t size8) +int conv_utf_16_to_8(const wchar_t * in16, char * out8, size_t size8) { char * out8end = out8+size8; wchar_t u = 0; @@ -139,7 +139,7 @@ int conv_utf_16_to_8(wchar_t * in16, char * out8, size_t size8) } -int conv_utf_8_to_16(char * in8, wchar_t * out16, size_t size16) +int conv_utf_8_to_16(const char * in8, wchar_t * out16, size_t size16) { char u; char type = 0; @@ -186,7 +186,7 @@ int conv_utf_8_to_16(char * in8, wchar_t * out16, size_t size16) return err; } -int is_ascii(char * in8) +int is_ascii(const char * in8) { for(in8; *in8; in8++) if(0x80 & *in8) return 0; @@ -210,7 +210,7 @@ void utf_8_cut_end(char * inout8, size_t maxcutpoint) -char * alloc_utf_8_from_16(wchar_t * in16, size_t add) +char * alloc_utf_8_from_16(const wchar_t * in16, size_t add) { size_t bsize = count_utf_8_from_16(in16); char * out8 = NULL; @@ -220,7 +220,7 @@ char * alloc_utf_8_from_16(wchar_t * in16, size_t add) return out8; } -wchar_t * alloc_utf16_from_8(char * in8, size_t add) +wchar_t * alloc_utf16_from_8(const char * in8, size_t add) { size_t bsize = count_utf_16_from_8(in8); wchar_t * out16 = NULL; diff --git a/intern/utfconv/utfconv.h b/intern/utfconv/utfconv.h index 9c1693e3896..30c0c8a9069 100644 --- a/intern/utfconv/utfconv.h +++ b/intern/utfconv/utfconv.h @@ -38,14 +38,14 @@ extern "C" { * @param string-16 pointer to working utf-16 string * @return How many bytes must be allocated includeng NULL. */ -size_t count_utf_8_from_16(wchar_t * string16); +size_t count_utf_8_from_16(const wchar_t * string16); /** * Counts how many wchar_t (two byte) is requered for for future utf-16 string using utf-8 * @param string-8 pointer to working utf-8 string * @return How many bytes must be allocated includeng NULL. */ -size_t count_utf_16_from_8(char * string8); +size_t count_utf_16_from_8(const char * string8); /** * conv_utf_*** errors @@ -62,7 +62,7 @@ size_t count_utf_16_from_8(char * string8); * @params size8 the allocated size in bytes of out8 * @return Returns any errors occured during conversion. See the block above, */ -int conv_utf_16_to_8(wchar_t * in16, char * out8, size_t size8); +int conv_utf_16_to_8(const wchar_t * in16, char * out8, size_t size8); /** * Converts utf-8 string to allocated utf-16 string @@ -71,7 +71,7 @@ int conv_utf_16_to_8(wchar_t * in16, char * out8, size_t size8); * @params size16 the allocated size in wchar_t (two byte) of out16 * @return Returns any errors occured during conversion. See the block above, */ -int conv_utf_8_to_16(char * in8, wchar_t * out16, size_t size16); +int conv_utf_8_to_16(const char * in8, wchar_t * out16, size_t size16); /** @@ -80,7 +80,7 @@ int conv_utf_8_to_16(char * in8, wchar_t * out16, size_t size16); * @params add any additional size which will be allocated for new utf-8 string in bytes * @return New allocated and converted utf-8 string or NULL if in16 is 0. */ -char * alloc_utf_8_from_16(wchar_t * in16, size_t add); +char * alloc_utf_8_from_16(const wchar_t * in16, size_t add); /** * Allocates and converts the utf-16 string from utf-8 @@ -88,7 +88,7 @@ char * alloc_utf_8_from_16(wchar_t * in16, size_t add); * @params add any additional size which will be allocated for new utf-16 string in wchar_t (two bytes) * @return New allocated and converted utf-16 string or NULL if in8 is 0. */ -wchar_t * alloc_utf16_from_8(char * in8, size_t add); +wchar_t * alloc_utf16_from_8(const char * in8, size_t add); /* Easy allocation and conversion of new utf-16 string. New string has _16 suffix. Must be deallocated with UTF16_UN_ENCODE in right order*/ #define UTF16_ENCODE(in8str) if(1){\ diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c index dff22867d81..0658317a0bd 100644 --- a/source/blender/avi/intern/avi.c +++ b/source/blender/avi/intern/avi.c @@ -741,6 +741,7 @@ AviError AVI_open_compress (char *name, AviMovie *movie, int streams, ...) int i; int64_t header_pos1, header_pos2; int64_t stream_pos1, stream_pos2; + int64_t junk_pos; movie->type = AVI_MOVIE_WRITE; movie->fp = fopen (name, "wb"); @@ -899,9 +900,11 @@ AviError AVI_open_compress (char *name, AviMovie *movie, int streams, ...) fseek (movie->fp, stream_pos2, SEEK_SET); } - if (ftell(movie->fp) < 2024 - 8) { + junk_pos= ftell(movie->fp); + + if (junk_pos < 2024 - 8) { chunk.fcc = FCC("JUNK"); - chunk.size = 2024-8-ftell(movie->fp); + chunk.size = 2024 - 8 - (int)junk_pos; awrite (movie, &chunk, 1, sizeof(AviChunk), movie->fp, AVI_CHUNK); diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index df711150b97..3c59ca8d52b 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -831,7 +831,6 @@ const char *BLI_getDefaultDocumentFolder(void) return getenv("HOME"); #else /* Windows */ - const char * ret; static char documentfolder[MAXPATHLEN]; HRESULT hResult; diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c index d2c98b7aaf3..3dd2cc4c95d 100644 --- a/source/blender/blenlib/intern/winstuff.c +++ b/source/blender/blenlib/intern/winstuff.c @@ -217,8 +217,6 @@ static wchar_t * BLI_alloc_utf16_from_8(char * in8, size_t add) struct dirent *readdir(DIR *dp) { - char * FileName; - size_t size; if (dp->direntry.d_name) { MEM_freeN(dp->direntry.d_name); dp->direntry.d_name= NULL; diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 737a182bbe0..540dc092297 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5706,8 +5706,8 @@ static void view3d_split_250(View3D *v3d, ListBase *regions) RegionView3D *rv3d; rv3d= ar->regiondata= MEM_callocN(sizeof(RegionView3D), "region v3d patch"); - rv3d->persp= v3d->persp; - rv3d->view= v3d->view; + rv3d->persp= (char)v3d->persp; + rv3d->view= (char)v3d->view; rv3d->dist= v3d->dist; copy_v3_v3(rv3d->ofs, v3d->ofs); copy_qt_qt(rv3d->viewquat, v3d->viewquat); diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 1b7bb61fe79..a49a84a327d 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -2363,8 +2363,8 @@ void BL_ConvertBlenderObjects(struct Main* maggie, frame_type = RAS_FrameSettings::e_frame_scale; } - aspect_width = blenderscene->r.xsch*blenderscene->r.xasp; - aspect_height = blenderscene->r.ysch*blenderscene->r.yasp; + aspect_width = (int)(blenderscene->r.xsch * blenderscene->r.xasp); + aspect_height = (int)(blenderscene->r.ysch * blenderscene->r.yasp); } RAS_FrameSettings frame_settings( diff --git a/source/gameengine/Converter/KX_ConvertProperties.cpp b/source/gameengine/Converter/KX_ConvertProperties.cpp index 81a5f13b8f0..faa7780bac0 100644 --- a/source/gameengine/Converter/KX_ConvertProperties.cpp +++ b/source/gameengine/Converter/KX_ConvertProperties.cpp @@ -201,7 +201,7 @@ void BL_ConvertTextProperty(Object* object, KX_FontObject* fontobj,SCA_TimeEvent } case GPROP_FLOAT: { - float floatprop = atof(str); + float floatprop = (float)atof(str); propval = new CFloatValue(floatprop); tprop->SetValue(propval); break; @@ -214,7 +214,7 @@ void BL_ConvertTextProperty(Object* object, KX_FontObject* fontobj,SCA_TimeEvent } case GPROP_TIME: { - float floatprop = atof(str); + float floatprop = (float)atof(str); CValue* timeval = new CFloatValue(floatprop); // set a subproperty called 'timer' so that |