From fe4305ef825f5652191d937d1d7ff22f302ddbd0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 16 Apr 2013 13:01:46 +0000 Subject: skip calling BKE_editmesh_tessface_calc() from BKE_bmbvh_new(), also quiet float/double warnings. --- source/blender/imbuf/intern/openexr/openexr_api.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/imbuf') diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index defbfcd3e99..3315ffe4b98 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -304,8 +304,8 @@ static void openexr_header_metadata(Header *header, struct ImBuf *ibuf) for (info = ibuf->metadata; info; info = info->next) header->insert(info->key, StringAttribute(info->value)); - if (ibuf->ppm[0] > 0.0f) - addXDensity(*header, ibuf->ppm[0] / 39.3700787f); /* 1 meter = 39.3700787 inches */ + if (ibuf->ppm[0] > 0.0) + addXDensity(*header, ibuf->ppm[0] / 39.3700787); /* 1 meter = 39.3700787 inches */ } static int imb_save_openexr_half(struct ImBuf *ibuf, const char *name, int flags) @@ -1169,7 +1169,7 @@ struct ImBuf *imb_load_openexr(unsigned char *mem, size_t size, int flags, char if (hasXDensity(file->header())) { ibuf->ppm[0] = xDensity(file->header()) * 39.3700787f; - ibuf->ppm[1] = ibuf->ppm[0] * file->header().pixelAspectRatio(); + ibuf->ppm[1] = ibuf->ppm[0] * (double)file->header().pixelAspectRatio(); } ibuf->ftype = OPENEXR; -- cgit v1.2.3