From e142ae77cadf04103fbc643f21cf60891862f6a8 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Mon, 13 Jul 2015 13:58:17 +0200 Subject: Imbuf types refactor. ImBuf types were getting stored as bitflags in a 32bit integer which had already run out of space. Solved the problem by separating file type to an ftype enum, and file specific options to foptions. Reviewed by Campbell, thanks a lot! --- source/blender/freestyle/intern/stroke/Canvas.cpp | 2 +- source/blender/freestyle/intern/view_map/SteerableViewMap.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/freestyle') diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp index 69d37f61df9..63cb58b4042 100644 --- a/source/blender/freestyle/intern/stroke/Canvas.cpp +++ b/source/blender/freestyle/intern/stroke/Canvas.cpp @@ -425,7 +425,7 @@ void Canvas::loadMap(const char *iFileName, const char *iMapName, unsigned int i stringstream filename; filename << base; filename << i << ".bmp"; - qtmp->ftype = BMP; + qtmp->ftype = IMB_FTYPE_BMP; IMB_saveiff(qtmp, const_cast(filename.str().c_str()), 0); } diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp index fe6f3f1892d..4f5b4cba779 100644 --- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp +++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp @@ -268,7 +268,7 @@ void SteerableViewMap::saveSteerableViewMap() const //soc qtmp.save(base+QString::number(i)+"-"+QString::number(j)+".png", "PNG"); filename << base; filename << i << "-" << j << ".png"; - ibuf->ftype = PNG; + ibuf->ftype = IMB_FTYPE_PNG; IMB_saveiff(ibuf, const_cast(filename.str().c_str()), 0); } #if 0 -- cgit v1.2.3