Merge branch 'master' of ssh://staflik/projects/git/cataract

Conflicts:

	jpeg-utils.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/jpeg-utils.cpp b/jpeg-utils.cpp
index 5c50914..cb8238a 100644
--- a/jpeg-utils.cpp
+++ b/jpeg-utils.cpp
@@ -375,12 +375,12 @@ calculate_sizes (const unsigned long max_width, const unsigned long max_height,
 
   if ((*width > *height) && (max_ratio <= real_ratio))
     {
-      *height = max_width / real_ratio;
+      *height = (unsigned long) (max_width / real_ratio);
       *width = max_width;
     }
   else
     {
-      *width = max_height * real_ratio;
+      *width = (unsigned long) (max_height * real_ratio);
       *height = max_height;
     }
 }