@@ -6753,7 +6753,7 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
6753
6753
if (((mng_info -> magn_methx > 0 ) && (mng_info -> magn_methx <= 5 )) &&
6754
6754
((mng_info -> magn_methy > 0 ) && (mng_info -> magn_methy <= 5 )))
6755
6755
{
6756
- png_uint_32
6756
+ size_t
6757
6757
magnified_height ,
6758
6758
magnified_width ;
6759
6759
@@ -6767,19 +6767,19 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
6767
6767
mng_info -> magn_methy = 1 ;
6768
6768
if (mng_info -> magn_methx == 1 )
6769
6769
{
6770
- magnified_width = mng_info -> magn_ml ;
6770
+ magnified_width = ( size_t ) mng_info -> magn_ml ;
6771
6771
6772
6772
if (image -> columns > 1 )
6773
6773
magnified_width += mng_info -> magn_mr ;
6774
6774
6775
6775
if (image -> columns > 2 )
6776
- magnified_width += (png_uint_32 )
6776
+ magnified_width += (size_t )
6777
6777
((image -> columns - 2 )* (mng_info -> magn_mx ));
6778
6778
}
6779
6779
6780
6780
else
6781
6781
{
6782
- magnified_width = (png_uint_32 ) image -> columns ;
6782
+ magnified_width = (size_t ) image -> columns ;
6783
6783
6784
6784
if (image -> columns > 1 )
6785
6785
magnified_width += mng_info -> magn_ml - 1 ;
@@ -6788,25 +6788,25 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
6788
6788
magnified_width += mng_info -> magn_mr - 1 ;
6789
6789
6790
6790
if (image -> columns > 3 )
6791
- magnified_width += (png_uint_32 )
6791
+ magnified_width += (size_t )
6792
6792
((image -> columns - 3 )* (mng_info -> magn_mx - 1 ));
6793
6793
}
6794
6794
6795
6795
if (mng_info -> magn_methy == 1 )
6796
6796
{
6797
- magnified_height = mng_info -> magn_mt ;
6797
+ magnified_height = ( size_t ) mng_info -> magn_mt ;
6798
6798
6799
6799
if (image -> rows > 1 )
6800
6800
magnified_height += mng_info -> magn_mb ;
6801
6801
6802
6802
if (image -> rows > 2 )
6803
- magnified_height += (png_uint_32 )
6803
+ magnified_height += (size_t )
6804
6804
((image -> rows - 2 )* (mng_info -> magn_my ));
6805
6805
}
6806
6806
6807
6807
else
6808
6808
{
6809
- magnified_height = (png_uint_32 ) image -> rows ;
6809
+ magnified_height = (size_t ) image -> rows ;
6810
6810
6811
6811
if (image -> rows > 1 )
6812
6812
magnified_height += mng_info -> magn_mt - 1 ;
@@ -6815,7 +6815,7 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
6815
6815
magnified_height += mng_info -> magn_mb - 1 ;
6816
6816
6817
6817
if (image -> rows > 3 )
6818
- magnified_height += (png_uint_32 )
6818
+ magnified_height += (size_t )
6819
6819
((image -> rows - 3 )* (mng_info -> magn_my - 1 ));
6820
6820
}
6821
6821
0 commit comments