From: cristy Date: Mon, 11 Jul 2011 01:18:17 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7317 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=343718fd8f43192d4d302884ab7aa9e5ee2985a3;p=imagemagick --- diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h index f04822370..038f76a9a 100644 --- a/MagickCore/pixel-accessor.h +++ b/MagickCore/pixel-accessor.h @@ -62,21 +62,15 @@ static inline Quantum GetPixelCb(const Image *image,const Quantum *pixel) return(pixel[image->component_map[image->map][CbPixelComponent].component]); } -static inline Quantum GetPixelComponent(const Image *image, - const PixelComponent component,const Quantum *pixel) -{ - return(pixel[image->component_map[image->map][component].component]); -} - -static inline PixelTrait GetPixelComponentTraits(const Image *image, - const PixelComponent component) +static inline PixelTrait GetPixelCbTraits(const Image *image) { - return(image->component_map[image->map][component].traits); + return(image->component_map[image->map][CbPixelComponent].traits); } -static inline PixelTrait GetPixelCbTraits(const Image *image) +static inline Quantum GetPixelComponent(const Image *image, + const PixelComponent component,const Quantum *pixel) { - return(image->component_map[image->map][CbPixelComponent].traits); + return(pixel[image->component_map[image->map][component].component]); } static inline Quantum GetPixelComponentMapComponent(const Image *image, @@ -96,6 +90,12 @@ static inline size_t GetPixelComponents(const Image *image) return(image->pixel_components); } +static inline PixelTrait GetPixelComponentTraits(const Image *image, + const PixelComponent component) +{ + return(image->component_map[image->map][component].traits); +} + static inline Quantum GetPixelCr(const Image *image,const Quantum *pixel) { return(pixel[image->component_map[image->map][CrPixelComponent].component]);