Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions urlApp/src/URLDriver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down