From: krzyc Date: Sat, 25 Jun 2016 07:43:41 +0000 (+0200) Subject: Use namespace for isnan() in PSD module X-Git-Tag: 2.1.0_Beta1~64^2^2 X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=7dbb28ecf971535963e955b5e3056688ff6f699a Use namespace for isnan() in PSD module --- diff --git a/modules/psd/layer.cpp b/modules/psd/layer.cpp index b74350210..d62cf5119 100644 --- a/modules/psd/layer.cpp +++ b/modules/psd/layer.cpp @@ -454,7 +454,7 @@ public: auto shear_factor = (yx*c + yy*s) / (yy*c - yx * s); auto scale_y = 1.0; - if (abs(shear_factor) < 0.0001 || isnan(shear_factor)) { + if (abs(shear_factor) < 0.0001 || std::isnan(shear_factor)) { shear_factor = 0; scale_y = (abs(c) > 0.1) ? yy / c : yx / -s; } @@ -644,11 +644,11 @@ bool layer::is_visible() { return (impl_->flags_ & 2) == 0; } //the (PSD file-fo bool layer::is_position_protected() { return (impl_->protection_flags_& 4) == 4; } const layer::mask_info& layer::mask() const { return impl_->mask_; } - -const psd::point& layer::text_pos() const { return impl_->text_pos_; } -const psd::point& layer::scale() const { return impl_->scale_; } -const double layer::angle() const { return impl_->angle_; } -const double layer::shear() const { return impl_->shear_; } + +const psd::point& layer::text_pos() const { return impl_->text_pos_; } +const psd::point& layer::scale() const { return impl_->scale_; } +const double layer::angle() const { return impl_->angle_; } +const double layer::shear() const { return impl_->shear_; } bool layer::is_text() const { return !impl_->text_layer_info_.empty(); } const boost::property_tree::wptree& layer::text_data() const { return impl_->text_layer_info_; }