From: cristy Date: Wed, 14 Nov 2012 18:43:01 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4718 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a949b820c7193318199f4fb5dacff3f2f1a11113;p=imagemagick --- diff --git a/MagickCore/quantum-export.c b/MagickCore/quantum-export.c index 6a3750cc4..404992c07 100644 --- a/MagickCore/quantum-export.c +++ b/MagickCore/quantum-export.c @@ -121,7 +121,7 @@ static inline unsigned char *PopDoublePixel(QuantumInfo *quantum_info, p=(double *) quantum; *p=(double) (pixel*quantum_info->state.inverse_scale+quantum_info->minimum); - if (quantum_info->endian != LSBEndian) + if (quantum_info->endian == MSBEndian) { *pixels++=quantum[7]; *pixels++=quantum[6]; @@ -156,7 +156,7 @@ static inline unsigned char *PopFloatPixel(QuantumInfo *quantum_info, p=(float *) quantum; *p=(float) ((double) pixel*quantum_info->state.inverse_scale+ quantum_info->minimum); - if (quantum_info->endian != LSBEndian) + if (quantum_info->endian == MSBEndian) { *pixels++=quantum[3]; *pixels++=quantum[2]; diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c index 7d2afc7b9..0cfe8f33e 100644 --- a/MagickCore/quantum-import.c +++ b/MagickCore/quantum-import.c @@ -129,7 +129,7 @@ static inline const unsigned char *PushDoublePixel(QuantumInfo *quantum_info, unsigned char quantum[8]; - if (quantum_info->endian != LSBEndian) + if (quantum_info->endian == MSBEndian) { quantum[7]=(*pixels++); quantum[6]=(*pixels++); @@ -169,7 +169,7 @@ static inline const unsigned char *PushFloatPixel(QuantumInfo *quantum_info, unsigned char quantum[4]; - if (quantum_info->endian != LSBEndian) + if (quantum_info->endian == MSBEndian) { quantum[3]=(*pixels++); quantum[2]=(*pixels++); @@ -1685,7 +1685,7 @@ static void ImportGrayQuantum(const Image *image,QuantumInfo *quantum_info, range=GetQuantumRange(quantum_info->depth); if (quantum_info->pack == MagickFalse) { - if (image->endian != LSBEndian) + if (image->endian == MSBEndian) { for (x=0; x < (ssize_t) (number_pixels-2); x+=3) { diff --git a/MagickCore/quantum-private.h b/MagickCore/quantum-private.h index 259161013..69490a1af 100644 --- a/MagickCore/quantum-private.h +++ b/MagickCore/quantum-private.h @@ -186,7 +186,7 @@ static inline unsigned char *PopLongPixel(const EndianType endian, quantum; quantum=(unsigned int) pixel; - if (endian != LSBEndian) + if (endian == MSBEndian) { *pixels++=(unsigned char) (quantum >> 24); *pixels++=(unsigned char) (quantum >> 16); @@ -208,7 +208,7 @@ static inline unsigned char *PopShortPixel(const EndianType endian, quantum; quantum=pixel; - if (endian != LSBEndian) + if (endian == MSBEndian) { *pixels++=(unsigned char) (quantum >> 8); *pixels++=(unsigned char) (quantum); @@ -232,7 +232,7 @@ static inline const unsigned char *PushLongPixel(const EndianType endian, register unsigned int quantum; - if (endian != LSBEndian) + if (endian == MSBEndian) { quantum=(unsigned int) (*pixels++ << 24); quantum|=(unsigned int) (*pixels++ << 16); @@ -256,7 +256,7 @@ static inline const unsigned char *PushShortPixel(const EndianType endian, register unsigned int quantum; - if (endian != LSBEndian) + if (endian == MSBEndian) { quantum=(unsigned int) (*pixels++ << 8); quantum|=(unsigned int) *pixels++;