diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-12-26 17:19:25 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-12-26 17:19:25 +0300 |
| commit | e4b20f0180858aaeec9f057e8cc473a01e1e5280 (patch) | |
| tree | fe9e3629ff21435df7027634a91405397c4a9695 /source/blender/yafray | |
| parent | 63f84cf26d574284a30f2d28c57a6c32823f4425 (diff) | |
2.5: various warning fixes. There was one actual bug in a few different
places, using sprintf with strings like ID names as the format string
(note that this name can contain a % character).
Diffstat (limited to 'source/blender/yafray')
| -rw-r--r-- | source/blender/yafray/intern/export_File.cpp | 2 | ||||
| -rw-r--r-- | source/blender/yafray/intern/export_Plugin.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/yafray/intern/export_File.cpp b/source/blender/yafray/intern/export_File.cpp index ea700965826..7ea83f9fda4 100644 --- a/source/blender/yafray/intern/export_File.cpp +++ b/source/blender/yafray/intern/export_File.cpp @@ -332,7 +332,7 @@ void yafrayFileRender_t::displayImage() char a = (byte_per_pix==4) ? fgetc(fp) : 255; int bx = x-xs, by = y-ys; if ((bx >= 0) && (bx < (int)re->rectx) && (by >= 0) && (by < re->recty)) { - float* bpt = (float*)rres.rectf + (bx + (((re->recty-1) - by)*re->rectx) << 2); + float* bpt = (float*)rres.rectf + ((bx + (((re->recty-1) - by)*re->rectx)) << 2); bpt[2] = (float)r * btf; bpt[1] = (float)g * btf; bpt[0] = (float)b * btf; diff --git a/source/blender/yafray/intern/export_Plugin.cpp b/source/blender/yafray/intern/export_Plugin.cpp index db9fb7ccc72..39514ce259a 100644 --- a/source/blender/yafray/intern/export_Plugin.cpp +++ b/source/blender/yafray/intern/export_Plugin.cpp @@ -188,7 +188,7 @@ bool yafrayPluginRender_t::initExport() } } yafray::yafrayConstructor *constructor; - constructor = (yafray::yafrayConstructor *)PIL_dynlib_find_symbol(handle, YAFRAY_SYMBOL); + constructor = (yafray::yafrayConstructor *)PIL_dynlib_find_symbol(handle, (char*)YAFRAY_SYMBOL); if (constructor==NULL) { cerr << "Error loading yafray plugin: " << PIL_dynlib_get_error_as_string(handle) << endl; |