From dde6b96ebefeccd597ba85d8d7b35377991d40e0 Mon Sep 17 00:00:00 2001 From: reuk Date: Thu, 26 Mar 2020 11:17:09 +0000 Subject: [PATCH] MSVC: Fix some potential divide-by-zero errors --- modules/juce_gui_basics/layout/juce_ComponentAnimator.cpp | 4 ++-- modules/juce_gui_basics/native/juce_win32_Windowing.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/juce_gui_basics/layout/juce_ComponentAnimator.cpp b/modules/juce_gui_basics/layout/juce_ComponentAnimator.cpp index 9306a1c88e..bdfc4f5fa6 100644 --- a/modules/juce_gui_basics/layout/juce_ComponentAnimator.cpp +++ b/modules/juce_gui_basics/layout/juce_ComponentAnimator.cpp @@ -176,8 +176,8 @@ public: void paint (Graphics& g) override { g.setOpacity (1.0f); - g.drawImageTransformed (image, AffineTransform::scale (getWidth() / (float) image.getWidth(), - getHeight() / (float) image.getHeight()), false); + g.drawImageTransformed (image, AffineTransform::scale (getWidth() / (float) jmax (1, image.getWidth()), + getHeight() / (float) jmax (1, image.getHeight())), false); } private: diff --git a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp index 1a7ea4bee3..173074fd56 100644 --- a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp +++ b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp @@ -4641,8 +4641,8 @@ void* CustomMouseCursorInfo::create() const { im = im.rescaled (maxW, maxH); - hotspotX = (hotspotX * maxW) / image.getWidth(); - hotspotY = (hotspotY * maxH) / image.getHeight(); + hotspotX = (hotspotX * maxW) / juce::jmax (1, image.getWidth()); + hotspotY = (hotspotY * maxH) / juce::jmax (1, image.getHeight()); } return IconConverters::createHICONFromImage (im, FALSE, hotspotX, hotspotY);