Renamed SetMagickInfo to AcquireMagickInfo and made the module and description mandatory.
Changed RegisterMagickInfo to return a boolean instead of the supplied pointer.
diff --git a/coders/dng.c b/coders/dng.c
index 2ef1e55..8e8c41c 100644
--- a/coders/dng.c
+++ b/coders/dng.c
@@ -240,189 +240,144 @@
MagickInfo
*entry;
- entry=SetMagickInfo("3FR");
+ entry=AcquireMagickInfo("DNG","3FR","Hasselblad CFV/H3D39II");
entry->decoder=(DecodeImageHandler *) ReadDNGImage;
entry->flags^=CoderBlobSupportFlag;
entry->flags|=CoderSeekableStreamFlag;
entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Hasselblad CFV/H3D39II");
+ (void) RegisterMagickInfo(entry);
+ entry=AcquireMagickInfo("DNG","ARW","Sony Alpha Raw Image Format");
+ entry->decoder=(DecodeImageHandler *) ReadDNGImage;
+ entry->flags^=CoderBlobSupportFlag;
+ entry->flags|=CoderSeekableStreamFlag;
+ entry->format_type=ExplicitFormatType;
+ (void) RegisterMagickInfo(entry);
+ entry=AcquireMagickInfo("DNG","DNG","Digital Negative");
+ entry->decoder=(DecodeImageHandler *) ReadDNGImage;
+ entry->flags^=CoderBlobSupportFlag;
+ entry->flags|=CoderSeekableStreamFlag;
+ entry->format_type=ExplicitFormatType;
+ (void) RegisterMagickInfo(entry);
+ entry=AcquireMagickInfo("DNG","CR2","Canon Digital Camera Raw Image Format");
+ entry->decoder=(DecodeImageHandler *) ReadDNGImage;
+ entry->flags^=CoderBlobSupportFlag;
+ entry->flags|=CoderSeekableStreamFlag;
+ entry->format_type=ExplicitFormatType;
+ (void) RegisterMagickInfo(entry);
+ entry=AcquireMagickInfo("DNG","CRW","Canon Digital Camera Raw Image Format");
+ entry->decoder=(DecodeImageHandler *) ReadDNGImage;
+ entry->flags^=CoderBlobSupportFlag;
+ entry->flags|=CoderSeekableStreamFlag;
+ entry->format_type=ExplicitFormatType;
+ (void) RegisterMagickInfo(entry);
+ entry=AcquireMagickInfo("DNG","DCR","Kodak Digital Camera Raw Image File");
+ entry->decoder=(DecodeImageHandler *) ReadDNGImage;
+ entry->flags^=CoderBlobSupportFlag;
+ entry->flags|=CoderSeekableStreamFlag;
+ entry->format_type=ExplicitFormatType;
+ (void) RegisterMagickInfo(entry);
+ entry=AcquireMagickInfo("DNG","ERF","Epson RAW Format");
+ entry->decoder=(DecodeImageHandler *) ReadDNGImage;
+ entry->flags^=CoderBlobSupportFlag;
+ entry->flags|=CoderSeekableStreamFlag;
+ entry->format_type=ExplicitFormatType;
+ (void) RegisterMagickInfo(entry);
+ entry=AcquireMagickInfo("DNG","IIQ","Phase One Raw Image Format");
+ entry->decoder=(DecodeImageHandler *) ReadDNGImage;
+ entry->flags^=CoderBlobSupportFlag;
+ entry->flags|=CoderSeekableStreamFlag;
+ entry->format_type=ExplicitFormatType;
entry->module=ConstantString("DNG");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("ARW");
+ entry=AcquireMagickInfo("DNG","KDC","Kodak Digital Camera Raw Image Format");
entry->decoder=(DecodeImageHandler *) ReadDNGImage;
entry->flags^=CoderBlobSupportFlag;
entry->flags|=CoderSeekableStreamFlag;
entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Sony Alpha Raw Image Format");
- entry->module=ConstantString("DNG");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("DNG");
+ entry=AcquireMagickInfo("DNG","K25","Kodak Digital Camera Raw Image Format");
entry->decoder=(DecodeImageHandler *) ReadDNGImage;
entry->flags^=CoderBlobSupportFlag;
entry->flags|=CoderSeekableStreamFlag;
entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Digital Negative");
- entry->module=ConstantString("DNG");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("CR2");
+ entry=AcquireMagickInfo("DNG","MEF","Mamiya Raw Image File");
entry->decoder=(DecodeImageHandler *) ReadDNGImage;
entry->flags^=CoderBlobSupportFlag;
entry->flags|=CoderSeekableStreamFlag;
entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Canon Digital Camera Raw Image Format");
- entry->module=ConstantString("DNG");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("CRW");
+ entry=AcquireMagickInfo("DNG","MRW","Sony (Minolta) Raw Image File");
entry->decoder=(DecodeImageHandler *) ReadDNGImage;
entry->flags^=CoderBlobSupportFlag;
entry->flags|=CoderSeekableStreamFlag;
entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Canon Digital Camera Raw Image Format");
- entry->module=ConstantString("DNG");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("DCR");
+ entry=AcquireMagickInfo("DNG","NEF","Nikon Digital SLR Camera Raw Image File");
entry->decoder=(DecodeImageHandler *) ReadDNGImage;
entry->flags^=CoderBlobSupportFlag;
entry->flags|=CoderSeekableStreamFlag;
entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Kodak Digital Camera Raw Image File");
- entry->module=ConstantString("DNG");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("ERF");
+ entry=AcquireMagickInfo("DNG","NRW","Nikon Digital SLR Camera Raw Image File");
entry->decoder=(DecodeImageHandler *) ReadDNGImage;
entry->flags^=CoderBlobSupportFlag;
entry->flags|=CoderSeekableStreamFlag;
entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Epson RAW Format");
- entry->module=ConstantString("DNG");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("IIQ");
+ entry=AcquireMagickInfo("DNG","ORF","Olympus Digital Camera Raw Image File");
entry->decoder=(DecodeImageHandler *) ReadDNGImage;
entry->flags^=CoderBlobSupportFlag;
entry->flags|=CoderSeekableStreamFlag;
entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Phase One Raw Image Format");
- entry->module=ConstantString("DNG");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("KDC");
+ entry=AcquireMagickInfo("DNG","PEF","Pentax Electronic File");
entry->decoder=(DecodeImageHandler *) ReadDNGImage;
entry->flags^=CoderBlobSupportFlag;
entry->flags|=CoderSeekableStreamFlag;
entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Kodak Digital Camera Raw Image Format");
- entry->module=ConstantString("DNG");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("K25");
+ entry=AcquireMagickInfo("DNG","RAF","Fuji CCD-RAW Graphic File");
entry->decoder=(DecodeImageHandler *) ReadDNGImage;
entry->flags^=CoderBlobSupportFlag;
entry->flags|=CoderSeekableStreamFlag;
entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Kodak Digital Camera Raw Image Format");
- entry->module=ConstantString("DNG");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("MEF");
+ entry=AcquireMagickInfo("DNG","RAW","Raw");
entry->decoder=(DecodeImageHandler *) ReadDNGImage;
entry->flags^=CoderBlobSupportFlag;
entry->flags|=CoderSeekableStreamFlag;
entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Mamiya Raw Image File");
- entry->module=ConstantString("DNG");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("MRW");
+ entry=AcquireMagickInfo("DNG","RMF","Raw Media Format");
entry->decoder=(DecodeImageHandler *) ReadDNGImage;
entry->flags^=CoderBlobSupportFlag;
entry->flags|=CoderSeekableStreamFlag;
entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Sony (Minolta) Raw Image File");
- entry->module=ConstantString("DNG");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("NEF");
+ entry=AcquireMagickInfo("DNG","RW2","Panasonic Lumix Raw Image");
entry->decoder=(DecodeImageHandler *) ReadDNGImage;
entry->flags^=CoderBlobSupportFlag;
entry->flags|=CoderSeekableStreamFlag;
entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Nikon Digital SLR Camera Raw Image File");
- entry->module=ConstantString("DNG");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("NRW");
+ entry=AcquireMagickInfo("DNG","SRF","Sony Raw Format");
entry->decoder=(DecodeImageHandler *) ReadDNGImage;
entry->flags^=CoderBlobSupportFlag;
entry->flags|=CoderSeekableStreamFlag;
entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Nikon Digital SLR Camera Raw Image File");
- entry->module=ConstantString("DNG");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("ORF");
+ entry=AcquireMagickInfo("DNG","SR2","Sony Raw Format 2");
entry->decoder=(DecodeImageHandler *) ReadDNGImage;
entry->flags^=CoderBlobSupportFlag;
entry->flags|=CoderSeekableStreamFlag;
entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Olympus Digital Camera Raw Image File");
- entry->module=ConstantString("DNG");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("PEF");
+ entry=AcquireMagickInfo("DNG","X3F","Sigma Camera RAW Picture File");
entry->decoder=(DecodeImageHandler *) ReadDNGImage;
entry->flags^=CoderBlobSupportFlag;
entry->flags|=CoderSeekableStreamFlag;
entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Pentax Electronic File");
- entry->module=ConstantString("DNG");
- (void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("RAF");
- entry->decoder=(DecodeImageHandler *) ReadDNGImage;
- entry->flags^=CoderBlobSupportFlag;
- entry->flags|=CoderSeekableStreamFlag;
- entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Fuji CCD-RAW Graphic File");
- entry->module=ConstantString("DNG");
- (void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("RAW");
- entry->decoder=(DecodeImageHandler *) ReadDNGImage;
- entry->flags^=CoderBlobSupportFlag;
- entry->flags|=CoderSeekableStreamFlag;
- entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Raw");
- entry->module=ConstantString("DNG");
- (void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("RMF");
- entry->decoder=(DecodeImageHandler *) ReadDNGImage;
- entry->flags^=CoderBlobSupportFlag;
- entry->flags|=CoderSeekableStreamFlag;
- entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Raw Media Format");
- entry->module=ConstantString("DNG");
- (void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("RW2");
- entry->decoder=(DecodeImageHandler *) ReadDNGImage;
- entry->flags^=CoderBlobSupportFlag;
- entry->flags|=CoderSeekableStreamFlag;
- entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Panasonic Lumix Raw Image");
- entry->module=ConstantString("DNG");
- (void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("SRF");
- entry->decoder=(DecodeImageHandler *) ReadDNGImage;
- entry->flags^=CoderBlobSupportFlag;
- entry->flags|=CoderSeekableStreamFlag;
- entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Sony Raw Format");
- entry->module=ConstantString("DNG");
- (void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("SR2");
- entry->decoder=(DecodeImageHandler *) ReadDNGImage;
- entry->flags^=CoderBlobSupportFlag;
- entry->flags|=CoderSeekableStreamFlag;
- entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Sony Raw Format 2");
- entry->module=ConstantString("DNG");
- (void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("X3F");
- entry->decoder=(DecodeImageHandler *) ReadDNGImage;
- entry->flags^=CoderBlobSupportFlag;
- entry->flags|=CoderSeekableStreamFlag;
- entry->format_type=ExplicitFormatType;
- entry->description=ConstantString("Sigma Camera RAW Picture File");
- entry->module=ConstantString("DNG");
(void) RegisterMagickInfo(entry);
return(MagickImageCoderSignature);
}