diff --git a/coders/fpx.c b/coders/fpx.c
index b0e8969..b2482a5 100644
--- a/coders/fpx.c
+++ b/coders/fpx.c
@@ -39,30 +39,30 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/pixel.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
#if defined(MAGICKCORE_FPX_DELEGATE)
#if !defined(vms) && !defined(macintosh) && !defined(MAGICKCORE_WINDOWS_SUPPORT)
#include <fpxlib.h>
@@ -166,20 +166,17 @@
Image
*image;
- IndexPacket
- index;
-
MagickBooleanType
status;
- register IndexPacket
- *indexes;
+ Quantum
+ index;
register ssize_t
i,
x;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
@@ -424,9 +421,8 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
if ((y % tile_height) == 0)
{
/*
@@ -459,22 +455,22 @@
{
if (fpx_info.numberOfComponents > 2)
{
- SetPixelRed(q,ScaleCharToQuantum(*r));
- SetPixelGreen(q,ScaleCharToQuantum(*g));
- SetPixelBlue(q,ScaleCharToQuantum(*b));
+ SetPixelRed(image,ScaleCharToQuantum(*r),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*g),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*b),q);
}
else
{
index=ScaleCharToQuantum(*r);
- SetPixelIndex(indexes+x,index);
- SetPixelRed(q,index);
- SetPixelGreen(q,index);
- SetPixelBlue(q,index);
+ SetPixelBlack(image,index,q);
+ SetPixelRed(image,index,q);
+ SetPixelGreen(image,index,q);
+ SetPixelBlue(image,index,q);
}
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
- SetPixelAlpha(q,ScaleCharToQuantum(*a));
- q++;
+ SetPixelAlpha(image,ScaleCharToQuantum(*a),q);
+ q+=GetPixelChannels(image);
r+=red_component->columnStride;
g+=green_component->columnStride;
b+=blue_component->columnStride;
@@ -814,7 +810,7 @@
QuantumType
quantum_type;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -863,7 +859,7 @@
if (image->matte != MagickFalse)
colorspace.numberOfComponents=4;
if ((image_info->type != TrueColorType) &&
- IsGrayImage(image,&image->exception))
+ IsImageGray(image,&image->exception))
{
colorspace.numberOfComponents=1;
colorspace.theComponents[0].myColor=MONOCHROME;
@@ -990,9 +986,9 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,quantum_info,
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
quantum_type,pixels,&image->exception);
fpx_status=FPX_WriteImageLine(flashpix,&fpx_info);
if (fpx_status != FPX_OK)