diff --git a/urlApp/src/URLDriver.cpp b/urlApp/src/URLDriver.cpp index 1d0efa4..4d844da 100644 --- a/urlApp/src/URLDriver.cpp +++ b/urlApp/src/URLDriver.cpp @@ -120,7 +120,14 @@ asynStatus URLDriver::readImage() break; case 32: dataType = NDUInt32; +// MagickLibVersion has 3 hex digits in ImageMagick and 6 hex digits in GraphicsMagick +#if (MagickLibVersion < 0x1000 && MagickLibVersion >= 0x700) +// ImageMagick >= 7 no longer has IntegerPixel and fixes LongPixel to 32 bits + storageType = LongPixel; +#else +// ImageMagick <= 6 and GraphicsMagick have 32 bits IntegerPixel and 32 or 64 bits LongPixel storageType = IntegerPixel; +#endif break; default: asynPrint(pasynUserSelf, ASYN_TRACE_ERROR,