summaryrefslogtreecommitdiff
path: root/MagickCore/matrix.c
diff options
context:
space:
mode:
Diffstat (limited to 'MagickCore/matrix.c')
-rw-r--r--MagickCore/matrix.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/MagickCore/matrix.c b/MagickCore/matrix.c
index 977081e75..c06d8bd0f 100644
--- a/MagickCore/matrix.c
+++ b/MagickCore/matrix.c
@@ -17,7 +17,7 @@
% August 2007 %
% %
% %
-% Copyright 1999-2020 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2021 ImageMagick Studio LLC, a non-profit organization %
% dedicated to making software imaging solutions freely available. %
% %
% You may not use this file except in compliance with the License. You may %
@@ -133,7 +133,7 @@ static inline MagickOffsetType WriteMatrixElements(
const MatrixInfo *magick_restrict matrix_info,const MagickOffsetType offset,
const MagickSizeType length,const unsigned char *magick_restrict buffer)
{
- register MagickOffsetType
+ MagickOffsetType
i;
ssize_t
@@ -152,10 +152,10 @@ static inline MagickOffsetType WriteMatrixElements(
{
#if !defined(MAGICKCORE_HAVE_PWRITE)
count=write(matrix_info->file,buffer+i,(size_t) MagickMin(length-i,
- (MagickSizeType) SSIZE_MAX));
+ (MagickSizeType) LONG_MAX));
#else
count=pwrite(matrix_info->file,buffer+i,(size_t) MagickMin(length-i,
- (MagickSizeType) SSIZE_MAX),(off_t) (offset+i));
+ (MagickSizeType) LONG_MAX),(off_t) (offset+i));
#endif
if (count <= 0)
{
@@ -320,7 +320,7 @@ MagickExport double **AcquireMagickMatrix(const size_t number_rows,
double
**matrix;
- register ssize_t
+ ssize_t
i,
j;
@@ -494,7 +494,7 @@ MagickPrivate MagickBooleanType GaussJordanElimination(double **matrix,
max,
scale;
- register ssize_t
+ ssize_t
i,
j,
k;
@@ -665,7 +665,7 @@ static inline MagickOffsetType ReadMatrixElements(
const MatrixInfo *magick_restrict matrix_info,const MagickOffsetType offset,
const MagickSizeType length,unsigned char *magick_restrict buffer)
{
- register MagickOffsetType
+ MagickOffsetType
i;
ssize_t
@@ -684,10 +684,10 @@ static inline MagickOffsetType ReadMatrixElements(
{
#if !defined(MAGICKCORE_HAVE_PREAD)
count=read(matrix_info->file,buffer+i,(size_t) MagickMin(length-i,
- (MagickSizeType) SSIZE_MAX));
+ (MagickSizeType) LONG_MAX));
#else
count=pread(matrix_info->file,buffer+i,(size_t) MagickMin(length-i,
- (MagickSizeType) SSIZE_MAX),(off_t) (offset+i));
+ (MagickSizeType) LONG_MAX),(off_t) (offset+i));
#endif
if (count <= 0)
{
@@ -830,7 +830,7 @@ MagickPrivate void LeastSquaresAddTerms(double **matrix,double **vectors,
const double *terms,const double *results,const size_t rank,
const size_t number_vectors)
{
- register ssize_t
+ ssize_t
i,
j;
@@ -902,7 +902,7 @@ MagickExport Image *MatrixToImage(const MatrixInfo *matrix_info,
max_value=min_value;
for (y=0; y < (ssize_t) matrix_info->rows; y++)
{
- register ssize_t
+ ssize_t
x;
for (x=0; x < (ssize_t) matrix_info->columns; x++)
@@ -947,10 +947,10 @@ MagickExport Image *MatrixToImage(const MatrixInfo *matrix_info,
double
value;
- register Quantum
+ Quantum
*q;
- register ssize_t
+ ssize_t
x;
if (status == MagickFalse)
@@ -1002,7 +1002,7 @@ MagickExport Image *MatrixToImage(const MatrixInfo *matrix_info,
*/
MagickExport MagickBooleanType NullMatrix(MatrixInfo *matrix_info)
{
- register ssize_t
+ ssize_t
x;
ssize_t
@@ -1066,7 +1066,7 @@ MagickExport MagickBooleanType NullMatrix(MatrixInfo *matrix_info)
MagickExport double **RelinquishMagickMatrix(double **matrix,
const size_t number_rows)
{
- register ssize_t
+ ssize_t
i;
if (matrix == (double **) NULL )