diff --git a/coders/dpx.c b/coders/dpx.c
index 2bf2dca..a4155c0 100644
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -39,29 +39,30 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.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/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.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/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
/*
Typedef declaration.
@@ -1077,7 +1078,7 @@
MagickBooleanType
sync;
- register PixelPacket
+ register Quantum
*q;
size_t
@@ -1111,7 +1112,7 @@
if (count != (ssize_t) extent)
status=MagickFalse;
q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -1300,7 +1301,7 @@
QuantumType
quantum_type;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -1468,7 +1469,7 @@
dpx.image.image_element[i].descriptor=RGBAComponentType;
if ((image_info->type != TrueColorType) &&
(image->matte == MagickFalse) &&
- (IsGrayImage(image,&image->exception) != MagickFalse))
+ (IsImageGray(image,&image->exception) != MagickFalse))
dpx.image.image_element[i].descriptor=LumaComponentType;
break;
}
@@ -1800,7 +1801,7 @@
image->depth,MagickTrue);
if ((image_info->type != UndefinedType) &&
(image_info->type != TrueColorType) && (image->matte == MagickFalse) &&
- (IsGrayImage(image,&image->exception) != MagickFalse))
+ (IsImageGray(image,&image->exception) != MagickFalse))
{
quantum_type=GrayQuantum;
extent=GetBytesPerRow(image->columns,1UL,image->depth,MagickTrue);
@@ -1809,9 +1810,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;
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,quantum_info,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
quantum_type,pixels,&image->exception);
count=WriteBlob(image,extent,pixels);
if (count != (ssize_t) extent)
