diff --git a/coders/dpx.c b/coders/dpx.c
index 2ff7fcd..3109ec8 100644
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -372,8 +372,9 @@
%
*/
-static size_t GetBytesPerRow(size_t columns,size_t samples_per_pixel,
- size_t bits_per_pixel,MagickBooleanType pad)
+static size_t GetBytesPerRow(const size_t columns,
+ const size_t samples_per_pixel,const size_t bits_per_pixel,
+ const MagickBooleanType pad)
{
size_t
bytes_per_row;
@@ -382,23 +383,23 @@
{
case 1:
{
- bytes_per_row=4*(((size_t) samples_per_pixel*columns*
- bits_per_pixel+31)/32);
+ bytes_per_row=4*(((size_t) samples_per_pixel*columns*bits_per_pixel+31)/
+ 32);
break;
}
case 8:
default:
{
- bytes_per_row=4*(((size_t) samples_per_pixel*columns*
- bits_per_pixel+31)/32);
+ bytes_per_row=4*(((size_t) samples_per_pixel*columns*bits_per_pixel+31)/
+ 32);
break;
}
case 10:
{
if (pad == MagickFalse)
{
- bytes_per_row=4*(((size_t) samples_per_pixel*columns*
- bits_per_pixel+31)/32);
+ bytes_per_row=4*(((size_t) samples_per_pixel*columns*bits_per_pixel+
+ 31)/32);
break;
}
bytes_per_row=4*(((size_t) (32*((samples_per_pixel*columns+2)/3))+31)/32);
@@ -408,8 +409,8 @@
{
if (pad == MagickFalse)
{
- bytes_per_row=4*(((size_t) samples_per_pixel*columns*
- bits_per_pixel+31)/32);
+ bytes_per_row=4*(((size_t) samples_per_pixel*columns*bits_per_pixel+
+ 31)/32);
break;
}
bytes_per_row=2*(((size_t) (16*samples_per_pixel*columns)+15)/16);
@@ -417,20 +418,20 @@
}
case 16:
{
- bytes_per_row=2*(((size_t) samples_per_pixel*columns*
- bits_per_pixel+8)/16);
+ bytes_per_row=2*(((size_t) samples_per_pixel*columns*bits_per_pixel+8)/
+ 16);
break;
}
case 32:
{
- bytes_per_row=4*(((size_t) samples_per_pixel*columns*
- bits_per_pixel+31)/32);
+ bytes_per_row=4*(((size_t) samples_per_pixel*columns*bits_per_pixel+31)/
+ 32);
break;
}
case 64:
{
- bytes_per_row=8*(((size_t) samples_per_pixel*columns*
- bits_per_pixel+63)/64);
+ bytes_per_row=8*(((size_t) samples_per_pixel*columns*bits_per_pixel+63)/
+ 64);
break;
}
}
